Imported Upstream version 1.40.0 79/94079/1
authorDongHun Kwak <dh0128.kwak@samsung.com>
Thu, 27 Oct 2016 05:14:03 +0000 (14:14 +0900)
committerDongHun Kwak <dh0128.kwak@samsung.com>
Thu, 27 Oct 2016 05:14:13 +0000 (14:14 +0900)
Change-Id: I6e6c80ad2941eec9e65ae63cd727bc0ce60078c6
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
1760 files changed:
Makefile-gir.am
Makefile-giscanner.am
Makefile.in
build/gi-introspection-msvc.mak
build/win32/vs10/gi-install.props
build/win32/vs9/gi-install.vsprops
common.mk
config.h.win32
configure
configure.ac
docs/reference/html/index.html
docs/reference/version.xml
gir/gio-2.0.c
gir/glib-2.0.c
girepository/giobjectinfo.c
girepository/girparser.c
girepository/gitypelib.c
giscanner/ast.py
giscanner/doctemplates/C/callback.tmpl [new file with mode: 0644]
giscanner/doctemplates/C/field.tmpl [new file with mode: 0644]
giscanner/doctemplates/C/function.tmpl
giscanner/doctemplates/C/interface.tmpl [new file with mode: 0644]
giscanner/doctemplates/Gjs/callback.tmpl [new file with mode: 0644]
giscanner/doctemplates/Gjs/class.tmpl
giscanner/doctemplates/Gjs/enum.tmpl
giscanner/doctemplates/Gjs/field.tmpl [new file with mode: 0644]
giscanner/doctemplates/Gjs/function.tmpl
giscanner/doctemplates/Gjs/interface.tmpl [new file with mode: 0644]
giscanner/doctemplates/Gjs/property.tmpl
giscanner/doctemplates/Gjs/signal.tmpl
giscanner/doctemplates/Gjs/vfunc.tmpl
giscanner/doctemplates/Python/callback.tmpl [new file with mode: 0644]
giscanner/doctemplates/Python/class.tmpl
giscanner/doctemplates/Python/field.tmpl [new file with mode: 0644]
giscanner/doctemplates/Python/function.tmpl
giscanner/doctemplates/Python/interface.tmpl [new file with mode: 0644]
giscanner/doctemplates/Python/property.tmpl
giscanner/doctemplates/Python/signal.tmpl
giscanner/doctemplates/Python/vfunc.tmpl
giscanner/doctemplates/base.tmpl
giscanner/doctemplates/class.tmpl
giscanner/doctemplates/namespace.tmpl
giscanner/docwriter.py
giscanner/dumper.py
giscanner/girparser.py
giscanner/maintransformer.py
giscanner/scannerlexer.l
giscanner/shlibs.py
giscanner/utils.py
gobject-introspection-1.0.pc
gobject-introspection-1.0.pc.in
gobject-introspection-no-export-1.0.pc
gobject-introspection-no-export-1.0.pc.in
scannerlexer.c
tests/Makefile.in
tests/offsets/Makefile.in
tests/scanner/Makefile.in
tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page [moved from tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion.None.page with 56% similarity]
tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.ATestError.page
tests/scanner/Regress-1.0-C-expected/Regress.AliasedTestBoxed.page
tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion-None.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion-x.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationBitfield.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationCallback.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields-arr.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields-field1.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields-len.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationForeachFunc.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationListCallback.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationNotifyFunc.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-attribute-signal.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-function-property.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-list-signal.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-parent_instance.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-property.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-signal.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-tab-property.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.allow_none.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleeowns.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleesowns.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_n.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_nz.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.create_object.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.do_not_use.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.extra_annos.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.foreach.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_hash.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_objects.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_strings.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.hidden_self.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.in.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout2.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout3.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.method.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.notrans.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.out.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.parse_args.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data2.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data3.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.string_out.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.use_buffer.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page [deleted file]
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.with_voidp.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObjectClass-parent_class.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObjectClass.page
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationStruct-objects.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.AnnotationStruct.page
tests/scanner/Regress-1.0-C-expected/Regress.BOOL_CONSTANT.page [moved from tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion.None.page with 56% similarity]
tests/scanner/Regress-1.0-C-expected/Regress.DOUBLE_CONSTANT.page [moved from tests/scanner/Regress-1.0-Gjs-expected/Regress.AnAnonymousUnion.None.page with 56% similarity]
tests/scanner/Regress-1.0-C-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FOO_PIE_IS_TASTY.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FOO_SUCCESS_INT.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooASingle.page
tests/scanner/Regress-1.0-C-expected/Regress.FooAddressType.page
tests/scanner/Regress-1.0-C-expected/Regress.FooBRect-x.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooBRect-y.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.add.page
tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.new.page
tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.page
tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion-rect.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion-type.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion-v.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.get_contained_type.page
tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.new.page
tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.page
tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.method.page
tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.new.page
tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.page
tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.page
tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.some_method.page
tests/scanner/Regress-1.0-C-expected/Regress.FooBufferClass.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooCallback.page
tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.method.page
tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.page
tests/scanner/Regress-1.0-C-expected/Regress.FooEnumFullname.page
tests/scanner/Regress-1.0-C-expected/Regress.FooEnumNoType.page
tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.method.page
tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.page
tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.returnv.page
tests/scanner/Regress-1.0-C-expected/Regress.FooError.page
tests/scanner/Regress-1.0-C-expected/Regress.FooError.quark.page
tests/scanner/Regress-1.0-C-expected/Regress.FooEvent-any.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooEvent-expose.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooEvent-type.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooEvent.page
tests/scanner/Regress-1.0-C-expected/Regress.FooEventAny-send_event.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooEventAny.page
tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose-count.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose-send_event.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose.page
tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsNoType.page
tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsType.page
tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct-regress_foo.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.copy.page
tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.new.page
tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.page
tests/scanner/Regress-1.0-C-expected/Regress.FooInterface-do_regress_foo.page
tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.do_regress_foo.page
tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.page
tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.static_method.page
tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface-do_regress_foo.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface-parent_iface.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface.do_regress_foo.page
tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface.page
tests/scanner/Regress-1.0-C-expected/Regress.FooObject-hidden.page
tests/scanner/Regress-1.0-C-expected/Regress.FooObject-parent_instance.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooObject-read_fn.page
tests/scanner/Regress-1.0-C-expected/Regress.FooObject-signal.page
tests/scanner/Regress-1.0-C-expected/Regress.FooObject-some_int.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooObject-string.page
tests/scanner/Regress-1.0-C-expected/Regress.FooObject-virtual_method.page
tests/scanner/Regress-1.0-C-expected/Regress.FooObject.a_global_method.page
tests/scanner/Regress-1.0-C-expected/Regress.FooObject.append_new_stack_layer.page
tests/scanner/Regress-1.0-C-expected/Regress.FooObject.dup_name.page
tests/scanner/Regress-1.0-C-expected/Regress.FooObject.external_type.page
tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_default.page
tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_name.page
tests/scanner/Regress-1.0-C-expected/Regress.FooObject.handle_glyph.page
tests/scanner/Regress-1.0-C-expected/Regress.FooObject.is_it_time_yet.page
tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new.page
tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_as_super.page
tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_cookie.page
tests/scanner/Regress-1.0-C-expected/Regress.FooObject.page
tests/scanner/Regress-1.0-C-expected/Regress.FooObject.read.page
tests/scanner/Regress-1.0-C-expected/Regress.FooObject.skipped_method.page
tests/scanner/Regress-1.0-C-expected/Regress.FooObject.static_meth.page
tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page
tests/scanner/Regress-1.0-C-expected/Regress.FooObject.various.page
tests/scanner/Regress-1.0-C-expected/Regress.FooObject.virtual_method.page
tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-_reserved.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-parent_class.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-read_fn.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-virtual_method.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.page
tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.read_fn.page
tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.virtual_method.page
tests/scanner/Regress-1.0-C-expected/Regress.FooObjectCookie.page
tests/scanner/Regress-1.0-C-expected/Regress.FooOtherObject.page
tests/scanner/Regress-1.0-C-expected/Regress.FooOtherObjectClass.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-height.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-width.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-x.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-y.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.add.page
tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.new.page
tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.page
tests/scanner/Regress-1.0-C-expected/Regress.FooSkippable.page
tests/scanner/Regress-1.0-C-expected/Regress.FooStackLayer.page
tests/scanner/Regress-1.0-C-expected/Regress.FooStruct-member.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooStruct-priv.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooStruct.page
tests/scanner/Regress-1.0-C-expected/Regress.FooStructPrivate.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy-event.page
tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy_event.page
tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_bar.page
tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_baz.page
tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_bar.page
tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_baz.page
tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.page
tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-destroy_event.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-do_bar.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-do_baz.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-parent_iface.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.destroy_event.page
tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.do_bar.page
tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.do_baz.page
tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.page
tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject-parent_instance.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.new.page
tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.page
tests/scanner/Regress-1.0-C-expected/Regress.FooSubobjectClass-parent_class.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooSubobjectClass.page
tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-data.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-lines.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-x.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-y.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray.page
tests/scanner/Regress-1.0-C-expected/Regress.FooUnion-regress_foo.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooUnion.page
tests/scanner/Regress-1.0-C-expected/Regress.FooUtilityStruct-bar.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.FooUtilityStruct.page
tests/scanner/Regress-1.0-C-expected/Regress.FooVarargsCallback.page
tests/scanner/Regress-1.0-C-expected/Regress.FooXEvent.page
tests/scanner/Regress-1.0-C-expected/Regress.GI_SCANNER_ELSE.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.GI_SCANNER_IFDEF.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANT.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANTA.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.G_GINT64_CONSTANT.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.INT_CONSTANT.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.IntSet.page
tests/scanner/Regress-1.0-C-expected/Regress.Intset.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.LONG_STRING_CONSTANT.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema-attributes.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy2.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema.page
tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem-name.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem.page
tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem.set_name.page
tests/scanner/Regress-1.0-C-expected/Regress.MAXUINT64.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.MININT64.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.Mixed_Case_Constant.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.NEGATIVE_INT_CONSTANT.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.PtrArrayAlias.page
tests/scanner/Regress-1.0-C-expected/Regress.STRING_CONSTANT.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure-v.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure-x.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure.page
tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.page
tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.quark.page
tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed-nested_a.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed-priv.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed-some_int8.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.copy.page
tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.equals.page
tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new.page
tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor1.page
tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor2.page
tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor3.page
tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.page
tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB-some_int8.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB-some_long.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.copy.page
tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.new.page
tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.page
tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC-another_thing.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC-refcount.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.new.page
tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.page
tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.copy.page
tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.free.page
tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.get_magic.page
tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.new.page
tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.page
tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedPrivate.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestCallback.page
tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackArray.page
tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackFull.page
tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackGError.page
tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackHashtable.page
tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackOwnedGError.page
tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackUserData.page
tests/scanner/Regress-1.0-C-expected/Regress.TestDEFError.page
tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.page
tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.param.page
tests/scanner/Regress-1.0-C-expected/Regress.TestEnumNoGEnum.page
tests/scanner/Regress-1.0-C-expected/Regress.TestEnumUnsigned.page
tests/scanner/Regress-1.0-C-expected/Regress.TestError.page
tests/scanner/Regress-1.0-C-expected/Regress.TestError.quark.page
tests/scanner/Regress-1.0-C-expected/Regress.TestExternallyDefinedCallback.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestFlags.page
tests/scanner/Regress-1.0-C-expected/Regress.TestFloating-parent_instance.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.new.page
tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.page
tests/scanner/Regress-1.0-C-expected/Regress.TestFloatingClass-parent_class.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestFloatingClass.page
tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-copy.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-finalize.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-flags.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-instance.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-refcount.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.page
tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.ref.page
tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.unref.page
tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass-copy.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass-finalize.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass-type_class.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass.page
tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectCopyFunction.page
tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectFinalizeFunction.page
tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject-data.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject-fundamental_object.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.new.page
tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.page
tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObjectClass-fundamental_object_class.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObjectClass.page
tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable-parent_instance.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo.page
tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page
tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_origin.page
tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_size.page
tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.page
tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawableClass-parent_class.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawableClass.page
tests/scanner/Regress-1.0-C-expected/Regress.TestInheritPixmapObjectClass-parent_class.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestInheritPixmapObjectClass.page
tests/scanner/Regress-1.0-C-expected/Regress.TestInterface.page
tests/scanner/Regress-1.0-C-expected/Regress.TestInterfaceIface-base_iface.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestInterfaceIface.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-all.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-allow_none_vfunc.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-bare.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-boxed.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-cleanup.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-complex_vfunc.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-double.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-first.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-float.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-function_ptr.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-gtype.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table-old.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash_table.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-int.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list-old.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-matrix.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-parent_instance.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-len-prop.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-prop.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-foreign-struct.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-hash-prop.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-int64-prop.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-intarray-ret.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-obj.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-strv.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-uint64-prop.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-some_double.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-some_float.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-some_int8.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-string.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test-with-static-scope-arg.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj.constructor.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj.do_matrix.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_foreign_struct.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_int64.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_obj.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_uint64.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj.forced_method.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj.function_ptr.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_callback.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_callback.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_from_file.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj.null_out.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj.set_bare.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_inout_param.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_out_param.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_param.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val_no_out.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method_callback.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_0.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_1.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-_regress_reserved1.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-_regress_reserved2.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-allow_none_vfunc.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-complex_vfunc.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-matrix.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-parent_class.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-test_signal.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-test_signal_with_static_scope_arg.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass._regress_reserved1.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass._regress_reserved2.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.allow_none_vfunc.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.matrix.page
tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.page
tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.page
tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.quark.page
tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateEnum.page
tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct-this_is_public_after.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct-this_is_public_before.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct.page
tests/scanner/Regress-1.0-C-expected/Regress.TestReferenceEnum.page
tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_double.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_enum.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_int.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_int8.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.const_return.page
tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.copy.page
tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.equals.page
tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.page
tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB-nested_a.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB-some_int8.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.copy.page
tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.page
tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleCallback.page
tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_double.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_enum.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_int.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_int8.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.clone.page
tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.page
tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.parse.page
tests/scanner/Regress-1.0-C-expected/Regress.TestStructB-nested_a.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestStructB-some_int8.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.clone.page
tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.page
tests/scanner/Regress-1.0-C-expected/Regress.TestStructC-another_int.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestStructC-obj.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestStructC.page
tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-array1.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-array2.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-field.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-garray.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-list.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestStructD.page
tests/scanner/Regress-1.0-C-expected/Regress.TestStructE-some_type.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestStructE-some_union.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestStructE.page
tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_double.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_float.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_int.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_int64.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_long.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_pointer.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_uint.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_uint64.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_ulong.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union.page
tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data1.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data2.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data3.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data4.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data5.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data6.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-ref_count.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestStructF.page
tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray-array.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray-just_int.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.frob.page
tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.page
tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj-parent_instance.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.instance_method.page
tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.new.page
tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.page
tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.unset_bare.page
tests/scanner/Regress-1.0-C-expected/Regress.TestSubObjClass-parent_class.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestSubObjClass.page
tests/scanner/Regress-1.0-C-expected/Regress.TestTypeGUInt64.page
tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x-parent_instance.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x-testbool.page
tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.get_testbool.page
tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.new.page
tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.page
tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.set_testbool.page
tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.static_method.page
tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021xClass-parent_class.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021xClass.page
tests/scanner/Regress-1.0-C-expected/Regress.UTF8_CONSTANT.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.VaListAlias.page
tests/scanner/Regress-1.0-C-expected/Regress.aliased_caller_alloc.page
tests/scanner/Regress-1.0-C-expected/Regress.annotation_attribute_func.page
tests/scanner/Regress-1.0-C-expected/Regress.annotation_custom_destroy.page
tests/scanner/Regress-1.0-C-expected/Regress.annotation_get_source_file.page
tests/scanner/Regress-1.0-C-expected/Regress.annotation_init.page
tests/scanner/Regress-1.0-C-expected/Regress.annotation_invalid_regress_annotation.page
tests/scanner/Regress-1.0-C-expected/Regress.annotation_ptr_array.page
tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_array.page
tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_filename.page
tests/scanner/Regress-1.0-C-expected/Regress.annotation_set_source_file.page
tests/scanner/Regress-1.0-C-expected/Regress.annotation_space_after_comment_bug631690.page
tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_array_length.page
tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated.page
tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated_out.page
tests/scanner/Regress-1.0-C-expected/Regress.annotation_test_parsing_bug630862.page
tests/scanner/Regress-1.0-C-expected/Regress.annotation_transfer_floating.page
tests/scanner/Regress-1.0-C-expected/Regress.annotation_versioned.page
tests/scanner/Regress-1.0-C-expected/Regress.atest_error_quark.page
tests/scanner/Regress-1.0-C-expected/Regress.foo_async_ready_callback.page
tests/scanner/Regress-1.0-C-expected/Regress.foo_destroy_notify_callback.page
tests/scanner/Regress-1.0-C-expected/Regress.foo_init.page
tests/scanner/Regress-1.0-C-expected/Regress.foo_method_external_references.page
tests/scanner/Regress-1.0-C-expected/Regress.foo_not_a_constructor_new.page
tests/scanner/Regress-1.0-C-expected/Regress.foo_skip_me.page
tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant.page
tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant_ptr.page
tests/scanner/Regress-1.0-C-expected/Regress.foo_test_array.page
tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_param.page
tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_retval.page
tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_param.page
tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_retval.page
tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array.page
tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array_with_g.page
tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_qualifier.page
tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_type.page
tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback.page
tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback2.page
tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback3.page
tests/scanner/Regress-1.0-C-expected/Regress.func_obj_null_in.page
tests/scanner/Regress-1.0-C-expected/Regress.global_get_flags_out.page
tests/scanner/Regress-1.0-C-expected/Regress.has_parameter_named_attrs.page
tests/scanner/Regress-1.0-C-expected/Regress.introspectable_via_alias.page
tests/scanner/Regress-1.0-C-expected/Regress.not_introspectable_via_alias.page
tests/scanner/Regress-1.0-C-expected/Regress.random_function_with_skipped_structure.page
tests/scanner/Regress-1.0-C-expected/Regress.set_abort_on_error.page
tests/scanner/Regress-1.0-C-expected/Regress.test_array_callback.page
tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_out_objects.page
tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_in.page
tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_out.page
tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_return.page
tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint16_in.page
tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint32_in.page
tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint64_in.page
tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint8_in.page
tests/scanner/Regress-1.0-C-expected/Regress.test_array_gtype_in.page
tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_full_out.page
tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_in.page
tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_inout.page
tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_none_out.page
tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_in.page
tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_out.page
tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_out.page
tests/scanner/Regress-1.0-C-expected/Regress.test_async_ready_callback.page
tests/scanner/Regress-1.0-C-expected/Regress.test_boolean.page
tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_false.page
tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_true.page
tests/scanner/Regress-1.0-C-expected/Regress.test_boxeds_not_a_method.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.test_boxeds_not_a_static.page [new file with mode: 0644]
tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_full_return.page
tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_none_in.page
tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_out.page
tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_return.page
tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_in.page
tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_return.page
tests/scanner/Regress-1.0-C-expected/Regress.test_callback.page
tests/scanner/Regress-1.0-C-expected/Regress.test_callback_async.page
tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify.page
tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify_no_user_data.page
tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_async.page
tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_notifications.page
tests/scanner/Regress-1.0-C-expected/Regress.test_callback_user_data.page
tests/scanner/Regress-1.0-C-expected/Regress.test_closure.page
tests/scanner/Regress-1.0-C-expected/Regress.test_closure_one_arg.page
tests/scanner/Regress-1.0-C-expected/Regress.test_closure_variant.page
tests/scanner/Regress-1.0-C-expected/Regress.test_date_in_gvalue.page
tests/scanner/Regress-1.0-C-expected/Regress.test_def_error_quark.page
tests/scanner/Regress-1.0-C-expected/Regress.test_double.page
tests/scanner/Regress-1.0-C-expected/Regress.test_filename_return.page
tests/scanner/Regress-1.0-C-expected/Regress.test_float.page
tests/scanner/Regress-1.0-C-expected/Regress.test_garray_container_return.page
tests/scanner/Regress-1.0-C-expected/Regress.test_garray_full_return.page
tests/scanner/Regress-1.0-C-expected/Regress.test_gerror_callback.page
tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_container_return.page
tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_everything_return.page
tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_in.page
tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_return.page
tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return.page
tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return2.page
tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in.page
tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in2.page
tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return.page
tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return2.page
tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_in.page
tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_out.page
tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_return.page
tests/scanner/Regress-1.0-C-expected/Regress.test_glist_container_return.page
tests/scanner/Regress-1.0-C-expected/Regress.test_glist_everything_return.page
tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in.page
tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in2.page
tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return.page
tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return2.page
tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_in.page
tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_out.page
tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_container_return.page
tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_everything_return.page
tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in.page
tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in2.page
tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return.page
tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return2.page
tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_in.page
tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_out.page
tests/scanner/Regress-1.0-C-expected/Regress.test_gtype.page
tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_as.page
tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_asv.page
tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_i.page
tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_s.page
tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_v.page
tests/scanner/Regress-1.0-C-expected/Regress.test_hash_table_callback.page
tests/scanner/Regress-1.0-C-expected/Regress.test_int.page
tests/scanner/Regress-1.0-C-expected/Regress.test_int16.page
tests/scanner/Regress-1.0-C-expected/Regress.test_int32.page
tests/scanner/Regress-1.0-C-expected/Regress.test_int64.page
tests/scanner/Regress-1.0-C-expected/Regress.test_int8.page
tests/scanner/Regress-1.0-C-expected/Regress.test_int_out_utf8.page
tests/scanner/Regress-1.0-C-expected/Regress.test_int_value_arg.page
tests/scanner/Regress-1.0-C-expected/Regress.test_long.page
tests/scanner/Regress-1.0-C-expected/Regress.test_multi_callback.page
tests/scanner/Regress-1.0-C-expected/Regress.test_multi_double_args.page
tests/scanner/Regress-1.0-C-expected/Regress.test_multiline_doc_comments.page
tests/scanner/Regress-1.0-C-expected/Regress.test_nested_parameter.page
tests/scanner/Regress-1.0-C-expected/Regress.test_null_gerror_callback.page
tests/scanner/Regress-1.0-C-expected/Regress.test_owned_gerror_callback.page
tests/scanner/Regress-1.0-C-expected/Regress.test_short.page
tests/scanner/Regress-1.0-C-expected/Regress.test_simple_callback.page
tests/scanner/Regress-1.0-C-expected/Regress.test_size.page
tests/scanner/Regress-1.0-C-expected/Regress.test_skip_unannotated_callback.page
tests/scanner/Regress-1.0-C-expected/Regress.test_ssize.page
tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in.page
tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in_gvalue.page
tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out.page
tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_c.page
tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_container.page
tests/scanner/Regress-1.0-C-expected/Regress.test_strv_outarg.page
tests/scanner/Regress-1.0-C-expected/Regress.test_timet.page
tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_0.page
tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_1.page
tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_2.page
tests/scanner/Regress-1.0-C-expected/Regress.test_uint.page
tests/scanner/Regress-1.0-C-expected/Regress.test_uint16.page
tests/scanner/Regress-1.0-C-expected/Regress.test_uint32.page
tests/scanner/Regress-1.0-C-expected/Regress.test_uint64.page
tests/scanner/Regress-1.0-C-expected/Regress.test_uint8.page
tests/scanner/Regress-1.0-C-expected/Regress.test_ulong.page
tests/scanner/Regress-1.0-C-expected/Regress.test_unichar.page
tests/scanner/Regress-1.0-C-expected/Regress.test_unsigned_enum_param.page
tests/scanner/Regress-1.0-C-expected/Regress.test_ushort.page
tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_in.page
tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_return.page
tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_inout.page
tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_nonconst_return.page
tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_in.page
tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_out.page
tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out.page
tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_nonconst_return.page
tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_out.page
tests/scanner/Regress-1.0-C-expected/Regress.test_value_get_fundamental_object.page
tests/scanner/Regress-1.0-C-expected/Regress.test_value_return.page
tests/scanner/Regress-1.0-C-expected/Regress.test_value_set_fundamental_object.page
tests/scanner/Regress-1.0-C-expected/Regress.test_versioning.page
tests/scanner/Regress-1.0-C-expected/index.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_LARGE.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.ATestError.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AliasedTestBoxed.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnAnonymousUnion-x.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnAnonymousUnion.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationBitfield.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationCallback.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationFields-arr.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationFields-field1.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationFields-len.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationFields.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationForeachFunc.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationListCallback.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationNotifyFunc.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-function-property.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-property.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-tab-property.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.extra_annos.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch.page [moved from tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page with 68% similarity]
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationStruct-objects.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationStruct.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.BOOL_CONSTANT.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.DOUBLE_CONSTANT.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_PIE_IS_TASTY.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_SUCCESS_INT.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooASingle.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooAddressType.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect-x.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect-y.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.get_contained_type.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.new.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooCallback.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumFullname.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumNoType.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.method.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.returnv.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.quark.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEvent.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventAny-send_event.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventAny.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventExpose-count.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventExpose-send_event.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventExpose.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsNoType.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsType.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct-regress_foo.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface-do_regress_foo.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.do_regress_foo.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.static_method.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-read_fn.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-string.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-virtual_method.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.a_global_method.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_default.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.static_meth.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObjectCookie.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle-height.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle-width.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle-x.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle-y.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStackLayer.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStruct-member.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStruct-priv.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStruct.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy_event.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_bar.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_baz.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray-data.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray-lines.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray-x.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray-y.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUnion.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUtilityStruct-bar.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUtilityStruct.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.FooXEvent.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.GI_SCANNER_ELSE.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.GI_SCANNER_IFDEF.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.GUINT64_CONSTANT.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.GUINT64_CONSTANTA.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.G_GINT64_CONSTANT.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.INT_CONSTANT.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.LONG_STRING_CONSTANT.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema-attributes.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy2.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeXklConfigItem-name.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeXklConfigItem.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeXklConfigItem.set_name.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.MAXUINT64.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.MININT64.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.Mixed_Case_Constant.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.NEGATIVE_INT_CONSTANT.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.PtrArrayAlias.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.STRING_CONSTANT.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.quark.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed-nested_a.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed-priv.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed-some_int8.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB-some_int8.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB-some_long.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC-another_thing.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC-refcount.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallback.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackArray.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackFull.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackGError.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackHashtable.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackOwnedGError.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackUserData.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestDEFError.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.param.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumNoGEnum.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumUnsigned.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.quark.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestExternallyDefinedCallback.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFlags.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject-copy.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject-finalize.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObjectCopyFunction.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObjectFinalizeFunction.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritPixmapObjectClass-parent_class.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritPixmapObjectClass.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-allow_none_vfunc.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-bare.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-boxed.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-complex_vfunc.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-double.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-float.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-gtype.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-hash-table-old.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-hash-table.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-int.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list-old.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-matrix.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-len-prop.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-string.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.function_ptr.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.null_out.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method_callback.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.quark.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateEnum.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateStruct-this_is_public_after.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateStruct-this_is_public_before.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateStruct.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestReferenceEnum.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA-some_double.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA-some_enum.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA-some_int.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA-some_int8.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.const_return.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB-nested_a.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB-some_int8.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleCallback.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA-some_double.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA-some_enum.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA-some_int.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA-some_int8.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.parse.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB-nested_a.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB-some_int8.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC-another_int.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC-obj.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-array1.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-array2.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-field.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-garray.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-list.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE-some_type.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE-some_union.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data1.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data2.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data3.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data4.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data5.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data6.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-ref_count.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray-array.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray-just_int.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.instance_method.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestTypeGUInt64.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x-testbool.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.static_method.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.UTF8_CONSTANT.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.aliased_caller_alloc.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_attribute_func.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_get_source_file.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_init.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_invalid_regress_annotation.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_array.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_filename.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_set_source_file.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_space_after_comment_bug631690.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_array_length.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated_out.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_versioned.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.atest_error_quark.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_async_ready_callback.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_destroy_notify_callback.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_init.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_method_external_references.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_not_a_constructor_new.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_array.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_param.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_retval.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_param.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_retval.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array_with_g.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_qualifier.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_type.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.func_obj_null_in.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.global_get_flags_out.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.has_parameter_named_attrs.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.introspectable_via_alias.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.set_abort_on_error.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_callback.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_out_objects.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_in.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_out.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_return.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint16_in.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint32_in.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint64_in.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint8_in.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gtype_in.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_full_out.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_in.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_inout.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_none_out.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_in.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_out.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_out.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_async_ready_callback.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_false.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_true.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boxeds_not_a_method.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boxeds_not_a_static.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_full_return.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_none_in.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_return.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_in.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_return.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_async.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify_no_user_data.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_async.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_notifications.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_user_data.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_def_error_quark.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_double.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_float.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_container_return.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_full_return.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gerror_callback.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_container_return.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_everything_return.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return2.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in2.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return2.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_in.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_out.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_return.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_out.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_out.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gtype.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_hash_table_callback.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int16.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int32.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int64.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int8.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_out_utf8.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_long.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_callback.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_double_args.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multiline_doc_comments.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_nested_parameter.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_null_gerror_callback.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_owned_gerror_callback.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_short.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_simple_callback.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_size.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ssize.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_c.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_container.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_outarg.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_timet.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_0.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_1.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_2.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint16.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint32.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint64.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint8.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ulong.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unichar.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unsigned_enum_param.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ushort.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_in.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_return.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_inout.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_nonconst_return.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_in.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_out.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_nonconst_return.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_out.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page
tests/scanner/Regress-1.0-Gjs-expected/Regress.test_versioning.page
tests/scanner/Regress-1.0-Gjs-expected/index.page
tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.ATestError.page
tests/scanner/Regress-1.0-Python-expected/Regress.AliasedTestBoxed.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion-None.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion-x.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationBitfield.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationCallback.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationFields-arr.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationFields-field1.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationFields-len.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationFields.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationForeachFunc.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationListCallback.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationNotifyFunc.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-function-property.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-parent_instance.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-property.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-tab-property.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.parse_args.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch.page [moved from tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page with 82% similarity]
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationStruct-objects.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationStruct.page
tests/scanner/Regress-1.0-Python-expected/Regress.BOOL_CONSTANT.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.DOUBLE_CONSTANT.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.FOO_PIE_IS_TASTY.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.FOO_SUCCESS_INT.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.FooASingle.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooAddressType.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect-x.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect-y.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion-rect.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion-type.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion-v.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion.get_contained_type.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.method.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooCallback.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.method.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumFullname.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumNoType.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.method.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.returnv.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooError.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooError.quark.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent-any.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent-expose.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent-type.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooEventAny-send_event.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.FooEventAny.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooEventExpose-count.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.FooEventExpose-send_event.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.FooEventExpose.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsNoType.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsType.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct-regress_foo.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface-do_regress_foo.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.static_method.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-parent_instance.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-read_fn.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-some_int.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-string.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-virtual_method.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooObjectCookie.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooOtherObject.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle-height.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle-width.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle-x.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle-y.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooStackLayer.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct-member.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct-priv.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooStructPrivate.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy-event.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy_event.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_bar.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_baz.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooSubobject-parent_instance.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.FooSubobject.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray-data.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray-lines.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray-x.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray-y.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooUnion-regress_foo.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.FooUnion.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooUtilityStruct-bar.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.FooUtilityStruct.page
tests/scanner/Regress-1.0-Python-expected/Regress.FooXEvent.page
tests/scanner/Regress-1.0-Python-expected/Regress.GI_SCANNER_ELSE.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.GI_SCANNER_IFDEF.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.GUINT64_CONSTANT.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.GUINT64_CONSTANTA.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.G_GINT64_CONSTANT.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.INT_CONSTANT.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.Intset.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.LONG_STRING_CONSTANT.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema-attributes.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy2.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema.page
tests/scanner/Regress-1.0-Python-expected/Regress.LikeXklConfigItem-name.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.LikeXklConfigItem.page
tests/scanner/Regress-1.0-Python-expected/Regress.LikeXklConfigItem.set_name.page
tests/scanner/Regress-1.0-Python-expected/Regress.MAXUINT64.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.MININT64.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.Mixed_Case_Constant.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.NEGATIVE_INT_CONSTANT.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.PtrArrayAlias.page
tests/scanner/Regress-1.0-Python-expected/Regress.STRING_CONSTANT.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.quark.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed-nested_a.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed-priv.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed-some_int8.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB-some_int8.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB-some_long.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC-another_thing.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC-refcount.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedPrivate.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestCallback.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackArray.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackFull.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackGError.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackHashtable.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackOwnedGError.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackUserData.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestDEFError.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.param.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumUnsigned.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestError.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestError.quark.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestExternallyDefinedCallback.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestFlags.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestFloating-parent_instance.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestFloating.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-copy.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-finalize.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-flags.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-instance.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-refcount.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectCopyFunction.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectFinalizeFunction.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject-data.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject-fundamental_object.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable-parent_instance.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritPixmapObjectClass-parent_class.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritPixmapObjectClass.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestInterface.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-allow_none_vfunc.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-bare.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-boxed.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-complex_vfunc.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-double.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-float.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-function_ptr.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-gtype.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table-old.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash_table.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-int.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list-old.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-parent_instance.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-len-prop.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-some_double.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-some_float.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-some_int8.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-string.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.function_ptr.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.quark.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateEnum.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct-this_is_public_after.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct-this_is_public_before.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestReferenceEnum.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA-some_double.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA-some_enum.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA-some_int.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA-some_int8.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB-nested_a.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB-some_int8.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleCallback.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA-some_double.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA-some_enum.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA-some_int.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA-some_int8.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB-nested_a.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB-some_int8.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC-another_int.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC-obj.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-array1.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-array2.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-field.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-garray.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-list.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE-some_type.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE-some_union.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_double.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_float.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_int.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_int64.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_long.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_pointer.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_uint.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_uint64.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_ulong.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data1.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data2.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data3.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data4.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data5.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data6.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-ref_count.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray-array.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray-just_int.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj-parent_instance.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestTypeGUInt64.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x-parent_instance.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x-testbool.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page
tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page
tests/scanner/Regress-1.0-Python-expected/Regress.UTF8_CONSTANT.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page
tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page
tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page
tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page
tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page
tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page
tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page
tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page
tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page
tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page
tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page
tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page
tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page
tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page
tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page
tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page
tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page
tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page
tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page
tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page
tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page
tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page
tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page
tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page
tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page
tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page
tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page
tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page
tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page
tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page
tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page
tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page
tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page
tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page
tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page
tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page
tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_boxeds_not_a_method.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.test_boxeds_not_a_static.page [new file with mode: 0644]
tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page
tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page
tests/scanner/Regress-1.0-Python-expected/index.page
tests/scanner/Regress-1.0-expected.gir
tests/scanner/Regress-1.0-sections-expected.txt
tests/scanner/annotationparser/Makefile.in
tests/scanner/regress.c
tests/scanner/regress.h
tests/warn/Makefile.in

index d1d15d8..52f7ee3 100644 (file)
@@ -27,18 +27,18 @@ CLEANFILES += gir/cairo-1.0.gir
 EXTRA_DIST += gir/cairo-1.0.gir.in
 
 # Doesn't seem to work to do gir/%.typelib =(
-gir/cairo-1.0.typelib: g-ir-compiler
-gir/DBus-1.0.typelib: g-ir-compiler
-gir/DBusGLib-1.0.typelib: g-ir-compiler
-gir/fontconfig-2.0.typelib: g-ir-compiler
-gir/freetype2-2.0.typelib: g-ir-compiler
-gir/GL-1.0.typelib: g-ir-compiler
-gir/libxml2-2.0.typelib: g-ir-compiler
-gir/xft-2.0.typelib: g-ir-compiler
-gir/xlib-2.0.typelib: g-ir-compiler
-gir/xfixes-4.0.typelib: g-ir-compiler
-gir/xrandr-1.3.typelib: g-ir-compiler
-gir/win32-1.0.typelib: g-ir-compiler
+gir/cairo-1.0.typelib: g-ir-compiler$(EXEEXT)
+gir/DBus-1.0.typelib: g-ir-compiler$(EXEEXT)
+gir/DBusGLib-1.0.typelib: g-ir-compiler$(EXEEXT)
+gir/fontconfig-2.0.typelib: g-ir-compiler$(EXEEXT)
+gir/freetype2-2.0.typelib: g-ir-compiler$(EXEEXT)
+gir/GL-1.0.typelib: g-ir-compiler$(EXEEXT)
+gir/libxml2-2.0.typelib: g-ir-compiler$(EXEEXT)
+gir/xft-2.0.typelib: g-ir-compiler$(EXEEXT)
+gir/xlib-2.0.typelib: g-ir-compiler$(EXEEXT)
+gir/xfixes-4.0.typelib: g-ir-compiler$(EXEEXT)
+gir/xrandr-1.3.typelib: g-ir-compiler$(EXEEXT)
+gir/win32-1.0.typelib: g-ir-compiler$(EXEEXT)
 
 # glib with source (to enable documentation)
 if WITH_GLIBSRC
@@ -58,11 +58,7 @@ endif
 GLIB_INCLUDEDIR=$(shell pkg-config --variable=includedir glib-2.0)/glib-2.0
 GLIB_LIBDIR=$(shell pkg-config --variable=libdir glib-2.0)
 
-if OS_WIN32
-GLIB_LIBRARY=libglib-2.0-0
-else
 GLIB_LIBRARY=glib-2.0
-endif
 
 GLib_2_0_gir_LIBS = $(GLIB_LIBRARY) $(GOBJECT_LIBRARY)
 GLib_2_0_gir_SCANNERFLAGS = \
@@ -99,11 +95,7 @@ gir/DBusGLib-1.0.typelib: GObject-2.0.gir
 GOBJECT_INCLUDEDIR=$(shell pkg-config --variable=includedir gobject-2.0)/glib-2.0
 GOBJECT_LIBDIR=$(shell pkg-config --variable=libdir gobject-2.0)
 
-if OS_WIN32
-GOBJECT_LIBRARY=libgobject-2.0-0
-else
 GOBJECT_LIBRARY=gobject-2.0
-endif
 
 GObject-2.0.gir: GLib-2.0.gir
 GObject_2_0_gir_LIBS = $(GOBJECT_LIBRARY)
@@ -131,11 +123,7 @@ BUILT_GIRSOURCES += GObject-2.0.gir
 GMODULE_INCLUDEDIR=$(shell pkg-config --variable=includedir gmodule-2.0)/glib-2.0
 GMODULE_LIBDIR=$(shell pkg-config --variable=libdir gmodule-2.0)
 
-if OS_WIN32
-GMODULE_LIBRARY=libgmodule-2.0-0
-else
 GMODULE_LIBRARY=gmodule-2.0
-endif
 
 GModule-2.0.gir: GLib-2.0.gir
 
@@ -161,11 +149,7 @@ BUILT_GIRSOURCES += GModule-2.0.gir
 GIO_INCLUDEDIR=$(shell pkg-config --variable=includedir gio-2.0)/glib-2.0
 GIO_LIBDIR=$(shell pkg-config --variable=libdir gio-2.0)
 
-if OS_WIN32
-GIO_LIBRARY=libgio-2.0-0
-else
 GIO_LIBRARY=gio-2.0
-endif
 
 if HAVE_GIO_UNIX
 GIO_UNIX_HDRS=$(shell pkg-config --variable=includedir gio-unix-2.0)/gio-unix-2.0/gio/*.h
index e3a934a..bccd815 100644 (file)
@@ -62,33 +62,42 @@ nobase_dist_template_DATA =         \
        giscanner/doctemplates/base.tmpl        \
        giscanner/doctemplates/class.tmpl       \
        giscanner/doctemplates/namespace.tmpl   \
+       giscanner/doctemplates/C/callback.tmpl  \
        giscanner/doctemplates/C/class.tmpl     \
        giscanner/doctemplates/C/constructor.tmpl       \
        giscanner/doctemplates/C/default.tmpl   \
        giscanner/doctemplates/C/enum.tmpl      \
        giscanner/doctemplates/C/function.tmpl  \
+       giscanner/doctemplates/C/field.tmpl     \
+       giscanner/doctemplates/C/interface.tmpl \
        giscanner/doctemplates/C/method.tmpl            \
        giscanner/doctemplates/C/namespace.tmpl \
        giscanner/doctemplates/C/property.tmpl  \
        giscanner/doctemplates/C/record.tmpl    \
        giscanner/doctemplates/C/signal.tmpl    \
        giscanner/doctemplates/C/vfunc.tmpl     \
+       giscanner/doctemplates/Python/callback.tmpl     \
        giscanner/doctemplates/Python/class.tmpl        \
        giscanner/doctemplates/Python/constructor.tmpl  \
        giscanner/doctemplates/Python/default.tmpl      \
        giscanner/doctemplates/Python/enum.tmpl \
        giscanner/doctemplates/Python/function.tmpl     \
+       giscanner/doctemplates/Python/field.tmpl        \
+       giscanner/doctemplates/Python/interface.tmpl    \
        giscanner/doctemplates/Python/method.tmpl       \
        giscanner/doctemplates/Python/namespace.tmpl    \
        giscanner/doctemplates/Python/property.tmpl     \
        giscanner/doctemplates/Python/record.tmpl       \
        giscanner/doctemplates/Python/signal.tmpl       \
        giscanner/doctemplates/Python/vfunc.tmpl        \
+       giscanner/doctemplates/Gjs/callback.tmpl        \
        giscanner/doctemplates/Gjs/class.tmpl   \
        giscanner/doctemplates/Gjs/constructor.tmpl     \
        giscanner/doctemplates/Gjs/default.tmpl \
        giscanner/doctemplates/Gjs/enum.tmpl    \
        giscanner/doctemplates/Gjs/function.tmpl        \
+       giscanner/doctemplates/Gjs/field.tmpl   \
+       giscanner/doctemplates/Gjs/interface.tmpl       \
        giscanner/doctemplates/Gjs/method.tmpl  \
        giscanner/doctemplates/Gjs/namespace.tmpl       \
        giscanner/doctemplates/Gjs/property.tmpl        \
index 35e79a8..b56ebfa 100644 (file)
@@ -906,7 +906,7 @@ check_LTLIBRARIES =
 bin_SCRIPTS = g-ir-scanner g-ir-annotation-tool $(am__append_5)
 EXTRA_LTLIBRARIES = libcmph.la
 INTROSPECTION_SCANNER = \
-    env PATH=.libs:$(PATH) \
+    env PATH=".libs:$(PATH)" \
         LPATH=.libs \
         CC="$(CC)" \
         PYTHONPATH=$(top_builddir):$(top_srcdir) \
@@ -923,7 +923,7 @@ INTROSPECTION_SCANNER_ARGS = \
     --add-include-path=$(top_builddir)
 
 INTROSPECTION_COMPILER = \
-    env PATH=.libs:$(PATH) \
+    env PATH=".libs:$(PATH)" \
         $(top_builddir)/g-ir-compiler$(EXEEXT)
 
 INTROSPECTION_COMPILER_ARGS = \
@@ -933,7 +933,7 @@ INTROSPECTION_COMPILER_ARGS = \
     --includedir=$(top_builddir)
 
 INTROSPECTION_DOCTOOL = \
-    env PATH=.libs:$(PATH) \
+    env PATH=".libs:$(PATH)" \
         LPATH=.libs \
         PYTHONPATH=$(top_builddir):$(top_srcdir) \
         UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
@@ -1180,33 +1180,42 @@ nobase_dist_template_DATA = \
        giscanner/doctemplates/base.tmpl        \
        giscanner/doctemplates/class.tmpl       \
        giscanner/doctemplates/namespace.tmpl   \
+       giscanner/doctemplates/C/callback.tmpl  \
        giscanner/doctemplates/C/class.tmpl     \
        giscanner/doctemplates/C/constructor.tmpl       \
        giscanner/doctemplates/C/default.tmpl   \
        giscanner/doctemplates/C/enum.tmpl      \
        giscanner/doctemplates/C/function.tmpl  \
+       giscanner/doctemplates/C/field.tmpl     \
+       giscanner/doctemplates/C/interface.tmpl \
        giscanner/doctemplates/C/method.tmpl            \
        giscanner/doctemplates/C/namespace.tmpl \
        giscanner/doctemplates/C/property.tmpl  \
        giscanner/doctemplates/C/record.tmpl    \
        giscanner/doctemplates/C/signal.tmpl    \
        giscanner/doctemplates/C/vfunc.tmpl     \
+       giscanner/doctemplates/Python/callback.tmpl     \
        giscanner/doctemplates/Python/class.tmpl        \
        giscanner/doctemplates/Python/constructor.tmpl  \
        giscanner/doctemplates/Python/default.tmpl      \
        giscanner/doctemplates/Python/enum.tmpl \
        giscanner/doctemplates/Python/function.tmpl     \
+       giscanner/doctemplates/Python/field.tmpl        \
+       giscanner/doctemplates/Python/interface.tmpl    \
        giscanner/doctemplates/Python/method.tmpl       \
        giscanner/doctemplates/Python/namespace.tmpl    \
        giscanner/doctemplates/Python/property.tmpl     \
        giscanner/doctemplates/Python/record.tmpl       \
        giscanner/doctemplates/Python/signal.tmpl       \
        giscanner/doctemplates/Python/vfunc.tmpl        \
+       giscanner/doctemplates/Gjs/callback.tmpl        \
        giscanner/doctemplates/Gjs/class.tmpl   \
        giscanner/doctemplates/Gjs/constructor.tmpl     \
        giscanner/doctemplates/Gjs/default.tmpl \
        giscanner/doctemplates/Gjs/enum.tmpl    \
        giscanner/doctemplates/Gjs/function.tmpl        \
+       giscanner/doctemplates/Gjs/field.tmpl   \
+       giscanner/doctemplates/Gjs/interface.tmpl       \
        giscanner/doctemplates/Gjs/method.tmpl  \
        giscanner/doctemplates/Gjs/namespace.tmpl       \
        giscanner/doctemplates/Gjs/property.tmpl        \
@@ -1256,8 +1265,7 @@ STATIC_GIRSOURCES = \
 # glib
 GLIB_INCLUDEDIR = $(shell pkg-config --variable=includedir glib-2.0)/glib-2.0
 GLIB_LIBDIR = $(shell pkg-config --variable=libdir glib-2.0)
-@OS_WIN32_FALSE@GLIB_LIBRARY = glib-2.0
-@OS_WIN32_TRUE@GLIB_LIBRARY = libglib-2.0-0
+GLIB_LIBRARY = glib-2.0
 GLib_2_0_gir_LIBS = $(GLIB_LIBRARY) $(GOBJECT_LIBRARY)
 GLib_2_0_gir_SCANNERFLAGS = \
             --external-library \
@@ -1284,8 +1292,7 @@ GLib_2_0_gir_FILES = $(GLIB_LIBDIR)/glib-2.0/include/glibconfig.h \
 # gobject
 GOBJECT_INCLUDEDIR = $(shell pkg-config --variable=includedir gobject-2.0)/glib-2.0
 GOBJECT_LIBDIR = $(shell pkg-config --variable=libdir gobject-2.0)
-@OS_WIN32_FALSE@GOBJECT_LIBRARY = gobject-2.0
-@OS_WIN32_TRUE@GOBJECT_LIBRARY = libgobject-2.0-0
+GOBJECT_LIBRARY = gobject-2.0
 GObject_2_0_gir_LIBS = $(GOBJECT_LIBRARY)
 GObject_2_0_gir_SCANNERFLAGS = \
             --external-library \
@@ -1310,8 +1317,7 @@ GObject_2_0_gir_FILES = \
 # gmodule
 GMODULE_INCLUDEDIR = $(shell pkg-config --variable=includedir gmodule-2.0)/glib-2.0
 GMODULE_LIBDIR = $(shell pkg-config --variable=libdir gmodule-2.0)
-@OS_WIN32_FALSE@GMODULE_LIBRARY = gmodule-2.0
-@OS_WIN32_TRUE@GMODULE_LIBRARY = libgmodule-2.0-0
+GMODULE_LIBRARY = gmodule-2.0
 GModule_2_0_gir_LIBS = $(GMODULE_LIBRARY)
 GModule_2_0_gir_SCANNERFLAGS = \
             --external-library \
@@ -1333,8 +1339,7 @@ GModule_2_0_gir_FILES = $(GLIB_INCLUDEDIR)/gmodule.h \
 # gio
 GIO_INCLUDEDIR = $(shell pkg-config --variable=includedir gio-2.0)/glib-2.0
 GIO_LIBDIR = $(shell pkg-config --variable=libdir gio-2.0)
-@OS_WIN32_FALSE@GIO_LIBRARY = gio-2.0
-@OS_WIN32_TRUE@GIO_LIBRARY = libgio-2.0-0
+GIO_LIBRARY = gio-2.0
 @HAVE_GIO_UNIX_FALSE@GIO_UNIX_HDRS = 
 @HAVE_GIO_UNIX_TRUE@GIO_UNIX_HDRS = $(shell pkg-config --variable=includedir gio-unix-2.0)/gio-unix-2.0/gio/*.h
 @HAVE_GIO_UNIX_FALSE@GIO_UNIX_PACKAGES = 
@@ -3404,18 +3409,18 @@ gir/cairo-1.0.gir: gir/cairo-1.0.gir.in Makefile
        < $< > $@.tmp && mv $@.tmp $@
 
 # Doesn't seem to work to do gir/%.typelib =(
-gir/cairo-1.0.typelib: g-ir-compiler
-gir/DBus-1.0.typelib: g-ir-compiler
-gir/DBusGLib-1.0.typelib: g-ir-compiler
-gir/fontconfig-2.0.typelib: g-ir-compiler
-gir/freetype2-2.0.typelib: g-ir-compiler
-gir/GL-1.0.typelib: g-ir-compiler
-gir/libxml2-2.0.typelib: g-ir-compiler
-gir/xft-2.0.typelib: g-ir-compiler
-gir/xlib-2.0.typelib: g-ir-compiler
-gir/xfixes-4.0.typelib: g-ir-compiler
-gir/xrandr-1.3.typelib: g-ir-compiler
-gir/win32-1.0.typelib: g-ir-compiler
+gir/cairo-1.0.typelib: g-ir-compiler$(EXEEXT)
+gir/DBus-1.0.typelib: g-ir-compiler$(EXEEXT)
+gir/DBusGLib-1.0.typelib: g-ir-compiler$(EXEEXT)
+gir/fontconfig-2.0.typelib: g-ir-compiler$(EXEEXT)
+gir/freetype2-2.0.typelib: g-ir-compiler$(EXEEXT)
+gir/GL-1.0.typelib: g-ir-compiler$(EXEEXT)
+gir/libxml2-2.0.typelib: g-ir-compiler$(EXEEXT)
+gir/xft-2.0.typelib: g-ir-compiler$(EXEEXT)
+gir/xlib-2.0.typelib: g-ir-compiler$(EXEEXT)
+gir/xfixes-4.0.typelib: g-ir-compiler$(EXEEXT)
+gir/xrandr-1.3.typelib: g-ir-compiler$(EXEEXT)
+gir/win32-1.0.typelib: g-ir-compiler$(EXEEXT)
 
 GLib-2.0.gir: g-ir-scanner g-ir-compiler$(EXEEXT)
 
index 5b345fa..36d63a4 100644 (file)
@@ -2,11 +2,6 @@
 
 # Change or pass in as a variable/env var if needed
 # The main DLLs that are used to build introspection files that are "installed"
-GI_DLLNAME = girepository-1-vs$(VSVER)
-GLIB_DLLNAME = glib-2-vs$(VSVER)
-GMODULE_DLLNAME = gmodule-2-vs$(VSVER)
-GOBJECT_DLLNAME = gobject-2-vs$(VSVER)
-GIO_DLLNAME = gio-2-vs$(VSVER)
 CAIROGOBJECT_DLLNAME= cairo-gobject-vs$(VSVER)
 
 # Please do not change anything after this line
@@ -119,7 +114,7 @@ GLib-$(GLIB_APIVERSION).gir: glib_list
        @-echo Generating $@...
        $(PYTHON2) $(G_IR_SCANNER_CURRENT) --verbose -I.. --add-include-path=.. \
        --add-include-path=..\gir --add-include-path=. --namespace=GLib --nsversion=$(GLIB_APIVERSION)  \
-       --no-libtool --pkg=glib-$(GLIB_APIVERSION) --include=win32-$(GI_APIVERSION) --library=$(GLIB_DLLNAME) --library=$(GOBJECT_DLLNAME)      \
+       --no-libtool --pkg=glib-$(GLIB_APIVERSION) --include=win32-$(GI_APIVERSION) --library=glib-2.0 --library=gobject-2.0    \
        --external-library --reparse-validate --identifier-prefix=G --symbol-prefix=g   \
        --symbol-prefix=glib --c-include="glib.h" -I$(BASEDIR)\include\glib-$(GLIB_APIVERSION)  \
        -I$(BASEDIR)\lib\glib-2.0\include -I$(BASEDIR)\include -DGETTEXT_PACKAGE=Dummy  \
@@ -129,7 +124,7 @@ GModule-$(GLIB_APIVERSION).gir: GLib-$(GLIB_APIVERSION).gir
        @-echo Generating $@...
        $(PYTHON2) $(G_IR_SCANNER_CURRENT) --verbose -I.. --add-include-path=.. \
        --add-include-path=..\gir --add-include-path=. --namespace=GModule --nsversion=2.0      \
-       --no-libtool --include=GLib-$(GLIB_APIVERSION) --pkg=gmodule-$(GLIB_APIVERSION) --library=$(GMODULE_DLLNAME)    \
+       --no-libtool --include=GLib-$(GLIB_APIVERSION) --pkg=gmodule-$(GLIB_APIVERSION) --library=gmodule-2.0   \
        --external-library --reparse-validate --identifier-prefix=G --c-include="gmodule.h"     \
        -I$(BASEDIR)\include\glib-2.0 -I$(BASEDIR)\lib\glib-2.0\include -I$(BASEDIR)\include    \
        $(BASEDIR)\include\glib-2.0\gmodule.h ..\gir\gmodule-2.0.c -o $@
@@ -138,7 +133,7 @@ GObject-$(GLIB_APIVERSION).gir: gobject_list GModule-$(GLIB_APIVERSION).gir
        @-echo Generating $@...
        $(PYTHON2) $(G_IR_SCANNER_CURRENT) --verbose -I.. --add-include-path=.. \
        --add-include-path=..\gir --add-include-path=. --namespace=GObject --nsversion=$(GLIB_APIVERSION)       \
-       --no-libtool --include=GLib-$(GLIB_APIVERSION) --pkg=gobject-$(GLIB_APIVERSION) --library=$(GOBJECT_DLLNAME)    \
+       --no-libtool --include=GLib-$(GLIB_APIVERSION) --pkg=gobject-$(GLIB_APIVERSION) --library=gobject-2.0   \
        --external-library --reparse-validate --identifier-prefix=G --c-include="glib-gobject.h"        \
        -I$(BASEDIR)/include/glib-2.0 -I$(BASEDIR)/lib/glib-2.0/include -I$(BASEDIR)/include    \
        -DGOBJECT_COMPILATION --filelist=gobject_list -o $@
@@ -148,7 +143,7 @@ Gio-$(GLIB_APIVERSION).gir: gio_list GObject-$(GLIB_APIVERSION).gir
        $(PYTHON2) $(G_IR_SCANNER_CURRENT) --verbose -I.. --add-include-path=.. \
        --add-include-path=..\gir --add-include-path=. --namespace=Gio --nsversion=$(GLIB_APIVERSION)   \
        --no-libtool --pkg=gio-$(GLIB_APIVERSION) --pkg=gio-windows-$(GLIB_APIVERSION) --include=GObject-$(GLIB_APIVERSION)     \
-       --library=$(GIO_DLLNAME) --external-library --reparse-validate --warn-all       \
+       --library=gio-2.0 --external-library --reparse-validate --warn-all      \
        --identifier-prefix=G --include=GLib-$(GLIB_APIVERSION) --c-include="gio/gio.h" -DGIO_COMPILATION       \
        -I$(BASEDIR)\include\glib-2.0 -I$(BASEDIR)\lib\glib-2.0\include \
        -I$(BASEDIR)\include --filelist=gio_list -o $@
@@ -159,7 +154,7 @@ GIRepository-$(GLIB_APIVERSION).gir: gi_list GObject-$(GLIB_APIVERSION).gir win3
        --add-include-path=..\gir --add-include-path=. --namespace=GIRepository --nsversion=$(GLIB_APIVERSION)  \
        --identifier-prefix=GI --symbol-prefix=g --c-include="girepository.h" --add-include-path=.      \
        --no-libtool --pkg=gobject-$(GLIB_APIVERSION) --include=GObject-$(GLIB_APIVERSION)      \
-       --library=$(GI_DLLNAME) -I..\girepository -I.. -I%BASEDIR%\include      \
+       --library=girepository-1.0 -I..\girepository -I.. -I%BASEDIR%\include   \
        -I%BASEDIR%\include\glib-2.0 -I%BASEDIR%\lib\glib-2.0\include --filelist=gi_list        \
        -DGI_COMPILATION -o $@
 
index 7ee51f1..34ca6d3 100644 (file)
@@ -69,33 +69,42 @@ copy ..\..\..\giscanner\collections\ordereddict.py $(CopyDir)\lib\gobject-intros
 copy ..\..\..\giscanner\doctemplates\base.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates
 copy ..\..\..\giscanner\doctemplates\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates
 copy ..\..\..\giscanner\doctemplates\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates
+copy ..\..\..\giscanner\doctemplates\C\callback.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
 copy ..\..\..\giscanner\doctemplates\C\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
 copy ..\..\..\giscanner\doctemplates\C\constructor.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
 copy ..\..\..\giscanner\doctemplates\C\default.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
 copy ..\..\..\giscanner\doctemplates\C\enum.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
 copy ..\..\..\giscanner\doctemplates\C\function.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
+copy ..\..\..\giscanner\doctemplates\C\field.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
+copy ..\..\..\giscanner\doctemplates\C\interface.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
 copy ..\..\..\giscanner\doctemplates\C\method.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
 copy ..\..\..\giscanner\doctemplates\C\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
 copy ..\..\..\giscanner\doctemplates\C\property.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
 copy ..\..\..\giscanner\doctemplates\C\record.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
 copy ..\..\..\giscanner\doctemplates\C\signal.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
 copy ..\..\..\giscanner\doctemplates\C\vfunc.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
+copy ..\..\..\giscanner\doctemplates\Python\callback.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
 copy ..\..\..\giscanner\doctemplates\Python\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
 copy ..\..\..\giscanner\doctemplates\Python\constructor.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
 copy ..\..\..\giscanner\doctemplates\Python\default.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
 copy ..\..\..\giscanner\doctemplates\Python\enum.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
 copy ..\..\..\giscanner\doctemplates\Python\function.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
+copy ..\..\..\giscanner\doctemplates\Python\field.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
+copy ..\..\..\giscanner\doctemplates\Python\interface.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
 copy ..\..\..\giscanner\doctemplates\Python\method.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
 copy ..\..\..\giscanner\doctemplates\Python\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
 copy ..\..\..\giscanner\doctemplates\Python\property.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
 copy ..\..\..\giscanner\doctemplates\Python\record.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
 copy ..\..\..\giscanner\doctemplates\Python\signal.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
 copy ..\..\..\giscanner\doctemplates\Python\vfunc.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
+copy ..\..\..\giscanner\doctemplates\Gjs\callback.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
 copy ..\..\..\giscanner\doctemplates\Gjs\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
 copy ..\..\..\giscanner\doctemplates\Gjs\constructor.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
 copy ..\..\..\giscanner\doctemplates\Gjs\default.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
 copy ..\..\..\giscanner\doctemplates\Gjs\enum.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
 copy ..\..\..\giscanner\doctemplates\Gjs\function.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
+copy ..\..\..\giscanner\doctemplates\Gjs\field.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
+copy ..\..\..\giscanner\doctemplates\Gjs\interface.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
 copy ..\..\..\giscanner\doctemplates\Gjs\method.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
 copy ..\..\..\giscanner\doctemplates\Gjs\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
 copy ..\..\..\giscanner\doctemplates\Gjs\property.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
index 618aad8..8621731 100644 (file)
@@ -73,33 +73,42 @@ copy ..\..\..\giscanner\collections\ordereddict.py $(CopyDir)\lib\gobject-intros
 copy ..\..\..\giscanner\doctemplates\base.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates&#x0D;&#x0A;
 copy ..\..\..\giscanner\doctemplates\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates&#x0D;&#x0A;
 copy ..\..\..\giscanner\doctemplates\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates&#x0D;&#x0A;
+copy ..\..\..\giscanner\doctemplates\C\callback.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C&#x0D;&#x0A;
 copy ..\..\..\giscanner\doctemplates\C\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C&#x0D;&#x0A;
 copy ..\..\..\giscanner\doctemplates\C\constructor.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C&#x0D;&#x0A;
 copy ..\..\..\giscanner\doctemplates\C\default.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C&#x0D;&#x0A;
 copy ..\..\..\giscanner\doctemplates\C\enum.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C&#x0D;&#x0A;
 copy ..\..\..\giscanner\doctemplates\C\function.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C&#x0D;&#x0A;
+copy ..\..\..\giscanner\doctemplates\C\field.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C&#x0D;&#x0A;
+copy ..\..\..\giscanner\doctemplates\C\interface.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C&#x0D;&#x0A;
 copy ..\..\..\giscanner\doctemplates\C\method.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C&#x0D;&#x0A;
 copy ..\..\..\giscanner\doctemplates\C\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C&#x0D;&#x0A;
 copy ..\..\..\giscanner\doctemplates\C\property.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C&#x0D;&#x0A;
 copy ..\..\..\giscanner\doctemplates\C\record.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C&#x0D;&#x0A;
 copy ..\..\..\giscanner\doctemplates\C\signal.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C&#x0D;&#x0A;
 copy ..\..\..\giscanner\doctemplates\C\vfunc.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C&#x0D;&#x0A;
+copy ..\..\..\giscanner\doctemplates\Python\callback.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python&#x0D;&#x0A;
 copy ..\..\..\giscanner\doctemplates\Python\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python&#x0D;&#x0A;
 copy ..\..\..\giscanner\doctemplates\Python\constructor.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python&#x0D;&#x0A;
 copy ..\..\..\giscanner\doctemplates\Python\default.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python&#x0D;&#x0A;
 copy ..\..\..\giscanner\doctemplates\Python\enum.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python&#x0D;&#x0A;
 copy ..\..\..\giscanner\doctemplates\Python\function.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python&#x0D;&#x0A;
+copy ..\..\..\giscanner\doctemplates\Python\field.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python&#x0D;&#x0A;
+copy ..\..\..\giscanner\doctemplates\Python\interface.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python&#x0D;&#x0A;
 copy ..\..\..\giscanner\doctemplates\Python\method.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python&#x0D;&#x0A;
 copy ..\..\..\giscanner\doctemplates\Python\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python&#x0D;&#x0A;
 copy ..\..\..\giscanner\doctemplates\Python\property.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python&#x0D;&#x0A;
 copy ..\..\..\giscanner\doctemplates\Python\record.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python&#x0D;&#x0A;
 copy ..\..\..\giscanner\doctemplates\Python\signal.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python&#x0D;&#x0A;
 copy ..\..\..\giscanner\doctemplates\Python\vfunc.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python&#x0D;&#x0A;
+copy ..\..\..\giscanner\doctemplates\Gjs\callback.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs&#x0D;&#x0A;
 copy ..\..\..\giscanner\doctemplates\Gjs\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs&#x0D;&#x0A;
 copy ..\..\..\giscanner\doctemplates\Gjs\constructor.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs&#x0D;&#x0A;
 copy ..\..\..\giscanner\doctemplates\Gjs\default.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs&#x0D;&#x0A;
 copy ..\..\..\giscanner\doctemplates\Gjs\enum.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs&#x0D;&#x0A;
 copy ..\..\..\giscanner\doctemplates\Gjs\function.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs&#x0D;&#x0A;
+copy ..\..\..\giscanner\doctemplates\Gjs\field.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs&#x0D;&#x0A;
+copy ..\..\..\giscanner\doctemplates\Gjs\interface.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs&#x0D;&#x0A;
 copy ..\..\..\giscanner\doctemplates\Gjs\method.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs&#x0D;&#x0A;
 copy ..\..\..\giscanner\doctemplates\Gjs\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs&#x0D;&#x0A;
 copy ..\..\..\giscanner\doctemplates\Gjs\property.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs&#x0D;&#x0A;
index 28b73c7..303622f 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -7,7 +7,7 @@
 #
 
 INTROSPECTION_SCANNER = \
-    env PATH=.libs:$(PATH) \
+    env PATH=".libs:$(PATH)" \
         LPATH=.libs \
         CC="$(CC)" \
         PYTHONPATH=$(top_builddir):$(top_srcdir) \
@@ -24,7 +24,7 @@ INTROSPECTION_SCANNER_ARGS = \
     --add-include-path=$(top_builddir)
 
 INTROSPECTION_COMPILER = \
-    env PATH=.libs:$(PATH) \
+    env PATH=".libs:$(PATH)" \
         $(top_builddir)/g-ir-compiler$(EXEEXT)
 
 INTROSPECTION_COMPILER_ARGS = \
@@ -34,7 +34,7 @@ INTROSPECTION_COMPILER_ARGS = \
     --includedir=$(top_builddir)
 
 INTROSPECTION_DOCTOOL = \
-    env PATH=.libs:$(PATH) \
+    env PATH=".libs:$(PATH)" \
         LPATH=.libs \
         PYTHONPATH=$(top_builddir):$(top_srcdir) \
         UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
index 2056753..950bda6 100644 (file)
@@ -96,7 +96,7 @@
 #define PACKAGE_NAME "gobject-introspection"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "gojbect-introspection 1.39.90"
+#define PACKAGE_STRING "gojbect-introspection 1.40.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "gobject-introspection"
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.39.90"
+#define PACKAGE_VERSION "1.40.0"
 
 /* Define to the platform's shared library suffix */
 #define SHLIB_SUFFIX ".dll"
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "1.39.90"
+#define VERSION "1.40.0"
 
 /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
    `char[]'. */
index 67af2b1..a4f5f95 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gobject-introspection 1.39.90.
+# Generated by GNU Autoconf 2.69 for gobject-introspection 1.40.0.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=introspection>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='gobject-introspection'
 PACKAGE_TARNAME='gobject-introspection'
-PACKAGE_VERSION='1.39.90'
-PACKAGE_STRING='gobject-introspection 1.39.90'
+PACKAGE_VERSION='1.40.0'
+PACKAGE_STRING='gobject-introspection 1.40.0'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=introspection'
 PACKAGE_URL=''
 
@@ -1426,7 +1426,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gobject-introspection 1.39.90 to adapt to many kinds of systems.
+\`configure' configures gobject-introspection 1.40.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1497,7 +1497,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gobject-introspection 1.39.90:";;
+     short | recursive ) echo "Configuration of gobject-introspection 1.40.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1651,7 +1651,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gobject-introspection configure 1.39.90
+gobject-introspection configure 1.40.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2203,7 +2203,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gobject-introspection $as_me 1.39.90, which was
+It was created by gobject-introspection $as_me 1.40.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3071,7 +3071,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gobject-introspection'
- VERSION='1.39.90'
+ VERSION='1.40.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3303,7 +3303,7 @@ AM_BACKSLASH='\'
 
 
 # Used in docs/reference/version.xml
-GI_VERSION=1.39.90
+GI_VERSION=1.40.0
 
 
 # Check for Win32
@@ -15410,7 +15410,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gobject-introspection $as_me 1.39.90, which was
+This file was extended by gobject-introspection $as_me 1.40.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15476,7 +15476,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gobject-introspection config.status 1.39.90
+gobject-introspection config.status 1.40.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
index 5e893ef..96da585 100644 (file)
@@ -3,8 +3,8 @@
 
 dnl the gi version number
 m4_define(gi_major_version, 1)
-m4_define(gi_minor_version, 39)
-m4_define(gi_micro_version, 90)
+m4_define(gi_minor_version, 40)
+m4_define(gi_micro_version, 0)
 m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version)
 
 AC_PREREQ([2.63])
index 9cd3870..855da74 100644 (file)
@@ -15,7 +15,7 @@
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">GObject Introspection Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      This document is for GObject Introspection version 1.39.90
+      This document is for GObject Introspection version 1.40.0
 .
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="http://developer.gnome.org/gi/unstable/" target="_top">http://developer.gnome.org/gi/unstable/</a>.
index 0cc13e8..f4c5ba2 100644 (file)
 /**
  * g_application_add_main_option_entries:
  * @application: a #GApplication
- * @entries: a %NULL-terminated list of #GOptionEntrys
+ * @entries: (array zero-terminated=1) (element-type GOptionEntry): a
+ *           %NULL-terminated list of #GOptionEntrys
  *
  * Adds main option entries to be handled by @application.
  *
  * @cancellable: (allow-none): a %GCancellable or %NULL
  *
  * Creates a %GSource that can be attached to a %GMainContext to monitor
- * for the availibility of the specified @condition on the socket.
+ * for the availability of the specified @condition on the socket.
  *
  * The callback on the source is of the #GSocketSourceFunc type.
  *
  * g_subprocess_get_identifier:
  * @subprocess: a #GSubprocess
  *
- * On UNIX, returns the process ID as a decimal string.  On Windows,
- * returns the result of GetProcessId() also as a string.
+ * On UNIX, returns the process ID as a decimal string.
+ * On Windows, returns the result of GetProcessId() also as a string.
  */
 
 
index 31029d8..9326bbf 100644 (file)
 
 
 /**
- * GVariantDict: (skip)
+ * GVariantDict:
  *
  * #GVariantDict is a mutable interface to #GVariant dictionaries.
  *
  * character until it knows that the next character is not a mark that
  * could combine with the base character.)
  *
+ * Using extensions such as "//TRANSLIT" may not work (or may not work
+ * well) on many platforms.  Consider using g_str_to_ascii() instead.
+ *
  * Returns: If the conversion was successful, a newly allocated
  *               nul-terminated string, which must be freed with
  *               g_free(). Otherwise %NULL and @error will be set.
 /**
  * g_get_monotonic_time:
  *
- * Queries the system monotonic time, if available.
- *
- * On POSIX systems with clock_gettime() and `CLOCK_MONOTONIC` this call
- * is a very shallow wrapper for that.  Otherwise, we make a best effort
- * that probably involves returning the wall clock time (with at least
- * microsecond accuracy, subject to the limitations of the OS kernel).
+ * Queries the system monotonic time.
  *
- * It's important to note that POSIX `CLOCK_MONOTONIC` does
- * not count time spent while the machine is suspended.
+ * The monotonic clock will always increase and doesn't suffer
+ * discontinuities when the user (or NTP) changes the system time.  It
+ * may or may not continue to tick during times where the machine is
+ * suspended.
  *
- * On Windows, "limitations of the OS kernel" is a rather substantial
- * statement.  Depending on the configuration of the system, the wall
- * clock time is updated as infrequently as 64 times a second (which
- * is approximately every 16ms). Also, on XP (but not on Vista or later)
- * the monotonic clock is locally monotonic, but may differ in exact
- * value between processes due to timer wrap handling.
+ * We try to use the clock that corresponds as closely as possible to
+ * the passage of time as measured by system calls such as poll() but it
+ * may not always be possible to do this.
  *
  * Returns: the monotonic time, in microseconds
  * Since: 2.28
  * otherwise you have to make sure that any dynamically allocated
  * values are freed yourself.
  *
+ * It is safe to continue iterating the #GHashTable afterward:
+ * |[
+ * while (g_hash_table_iter_next (&iter, &key, &value))
+ *   {
+ *     if (condition)
+ *       g_hash_table_iter_remove (&iter);
+ *   }
+ * ]|
+ *
  * Since: 2.16
  */
 
  *
  * Passes the results of polling back to the main loop.
  *
+ * You must have successfully acquired the context with
+ * g_main_context_acquire() before you may call this function.
+ *
  * Returns: %TRUE if some sources are ready to be dispatched.
  */
 
  * @context: a #GMainContext
  *
  * Dispatches all pending sources.
+ *
+ * You must have successfully acquired the context with
+ * g_main_context_acquire() before you may call this function.
  */
 
 
  * Prepares to poll sources within a main loop. The resulting information
  * for polling is determined by calling g_main_context_query ().
  *
+ * You must have successfully acquired the context with
+ * g_main_context_acquire() before you may call this function.
+ *
  * Returns: %TRUE if some source is ready to be dispatched
  *               prior to polling.
  */
  *
  * Determines information necessary to poll this main loop.
  *
+ * You must have successfully acquired the context with
+ * g_main_context_acquire() before you may call this function.
+ *
  * Returns: the number of records actually stored in @fds,
  *   or, if more than @n_fds records need to be stored, the number
  *   of records that need to be stored.
  * @source will hold a reference on @child_source while @child_source
  * is attached to it.
  *
+ * This API is only intended to be used by implementations of #GSource.
+ * Do not call this API on a #GSource that you did not create.
+ *
  * Since: 2.28
  */
 
  * the @revents field in the #GPollFD struct and return %TRUE if events need
  * to be processed.
  *
+ * This API is only intended to be used by implementations of #GSource.
+ * Do not call this API on a #GSource that you did not create.
+ *
  * Using this API forces the linear scanning of event sources on each
  * main loop iteration.  Newly-written event sources should try to use
  * g_source_add_unix_fd() instead of this API.
  * It is not necessary to remove the fd before destroying the source; it
  * will be cleaned up automatically.
  *
+ * This API is only intended to be used by implementations of #GSource.
+ * Do not call this API on a #GSource that you did not create.
+ *
  * As the name suggests, this function is not available on Windows.
  *
  * Returns: an opaque tag
  * If you want to remove a fd, don't set its event mask to zero.
  * Instead, call g_source_remove_unix_fd().
  *
+ * This API is only intended to be used by implementations of #GSource.
+ * Do not call this API on a #GSource that you did not create.
+ *
  * As the name suggests, this function is not available on Windows.
  *
  * Since: 2.36
  * The return value of this function is only defined when the function
  * is called from the check or dispatch functions for @source.
  *
+ * This API is only intended to be used by implementations of #GSource.
+ * Do not call this API on a #GSource that you did not create.
+ *
  * As the name suggests, this function is not available on Windows.
  *
  * Returns: the conditions reported on the fd
  *
  * Detaches @child_source from @source and destroys it.
  *
+ * This API is only intended to be used by implementations of #GSource.
+ * Do not call this API on a #GSource that you did not create.
+ *
  * Since: 2.28
  */
 
  *
  * Removes a file descriptor from the set of file descriptors polled for
  * this source.
+ *
+ * This API is only intended to be used by implementations of #GSource.
+ * Do not call this API on a #GSource that you did not create.
  */
 
 
  * watched while keeping the same source around.  In the normal case you
  * will just want to destroy the source.
  *
+ * This API is only intended to be used by implementations of #GSource.
+ * Do not call this API on a #GSource that you did not create.
+ *
  * As the name suggests, this function is not available on Windows.
  *
  * Since: 2.36
  * source will be dispatched if it is ready to be dispatched and no
  * sources at a higher (numerically smaller) priority are ready to be
  * dispatched.
+ *
+ * A child source always has the same priority as its parent.  It is not
+ * permitted to change the priority of a source once it has been added
+ * as a child of another source.
  */
 
 
  * for both sources is reached during the same main context iteration
  * then the order of dispatch is undefined.
  *
+ * This API is only intended to be used by implementations of #GSource.
+ * Do not call this API on a #GSource that you did not create.
+ *
  * Since: 2.36
  */
 
 
 
 /**
+ * g_str_to_ascii:
+ * @str: a string, in UTF-8
+ * @from_locale: (allow-none): the source locale, if known
+ *
+ * Transliterate @str to plain ASCII.
+ *
+ * For best results, @str should be in composed normalised form.
+ *
+ * This function performs a reasonably good set of character
+ * replacements.  The particular set of replacements that is done may
+ * change by version or even by runtime environment.
+ *
+ * If the source language of @str is known, it can used to improve the
+ * accuracy of the translation by passing it as @from_locale.  It should
+ * be a valid POSIX locale string (of the form
+ * "language[_territory][.codeset][@modifier]").
+ *
+ * If @from_locale is %NULL then the current locale is used.
+ *
+ * If you want to do translation for no specific locale, and you want it
+ * to be done independently of the currently locale, specify "C" for
+ * @from_locale.
+ *
+ * Returns: a string in plain ASCII
+ */
+
+
+/**
  * g_str_tokenize_and_fold:
  * @string: a string
  * @translit_locale: (allow-none): the language code (like 'de' or
index 3e3b312..d92a861 100644 (file)
  */
 
 /**
+ * g_object_info_get_field_offset:
+ * @info: a #GIObjectInfo
+ * @n: index of queried field
+ *
+ * Obtain the offset of the specified field.
+ *
+ * Returns: field offset in bytes
+ */
+static gint32
+g_object_info_get_field_offset (GIObjectInfo *info,
+                                gint          n)
+{
+  GIRealInfo *rinfo = (GIRealInfo *)info;
+  Header *header = (Header *)rinfo->typelib->data;
+  ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
+  guint32 offset;
+  gint i;
+  FieldBlob *field_blob;
+
+  offset = rinfo->offset + header->object_blob_size
+    + (blob->n_interfaces + blob->n_interfaces % 2) * 2;
+
+  for (i = 0; i < n; i++)
+    {
+      field_blob = (FieldBlob *)&rinfo->typelib->data[offset];
+      offset += header->field_blob_size;
+      if (field_blob->has_embedded_type)
+        offset += header->callback_blob_size;
+    }
+
+  return offset;
+}
+
+/**
  * g_object_info_get_parent:
  * @info: a #GIObjectInfo
  *
@@ -251,18 +285,11 @@ g_object_info_get_field (GIObjectInfo *info,
 {
   gint offset;
   GIRealInfo *rinfo = (GIRealInfo *)info;
-  Header *header;
-  ObjectBlob *blob;
 
   g_return_val_if_fail (info != NULL, NULL);
   g_return_val_if_fail (GI_IS_OBJECT_INFO (info), NULL);
 
-  header = (Header *)rinfo->typelib->data;
-  blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
-
-  offset = rinfo->offset + header->object_blob_size
-    + (blob->n_interfaces + blob->n_interfaces % 2) * 2
-    + n * header->field_blob_size;
+  offset = g_object_info_get_field_offset(info, n);
 
   return (GIFieldInfo *) g_info_new (GI_INFO_TYPE_FIELD, (GIBaseInfo*)info, rinfo->typelib, offset);
 }
@@ -313,9 +340,7 @@ g_object_info_get_property (GIObjectInfo *info,
   header = (Header *)rinfo->typelib->data;
   blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
 
-  offset = rinfo->offset + header->object_blob_size
-    + (blob->n_interfaces + blob->n_interfaces % 2) * 2
-    + blob->n_fields * header->field_blob_size
+  offset = g_object_info_get_field_offset(info, blob->n_fields)
     + n * header->property_blob_size;
 
   return (GIPropertyInfo *) g_info_new (GI_INFO_TYPE_PROPERTY, (GIBaseInfo*)info,
@@ -370,9 +395,7 @@ g_object_info_get_method (GIObjectInfo *info,
   blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
 
 
-  offset = rinfo->offset + header->object_blob_size
-    + (blob->n_interfaces + blob->n_interfaces % 2) * 2
-    + blob->n_fields * header->field_blob_size
+  offset = g_object_info_get_field_offset(info, blob->n_fields)
     + blob->n_properties * header->property_blob_size
     + n * header->function_blob_size;
 
@@ -406,9 +429,7 @@ g_object_info_find_method (GIObjectInfo *info,
   header = (Header *)rinfo->typelib->data;
   blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
 
-  offset = rinfo->offset + header->object_blob_size
-    + (blob->n_interfaces + blob->n_interfaces % 2) * 2
-    + blob->n_fields * header->field_blob_size +
+  offset = g_object_info_get_field_offset(info, blob->n_fields)
     + blob->n_properties * header->property_blob_size;
 
   return _g_base_info_find_method ((GIBaseInfo*)info, offset, blob->n_methods, name);
@@ -518,9 +539,7 @@ g_object_info_get_signal (GIObjectInfo *info,
   header = (Header *)rinfo->typelib->data;
   blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
 
-  offset = rinfo->offset + header->object_blob_size
-    + (blob->n_interfaces + blob->n_interfaces % 2) * 2
-    + blob->n_fields * header->field_blob_size
+  offset = g_object_info_get_field_offset(info, blob->n_fields)
     + blob->n_properties * header->property_blob_size
     + blob->n_methods * header->function_blob_size
     + n * header->signal_blob_size;
@@ -609,9 +628,7 @@ g_object_info_get_vfunc (GIObjectInfo *info,
   header = (Header *)rinfo->typelib->data;
   blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
 
-  offset = rinfo->offset + header->object_blob_size
-    + (blob->n_interfaces + blob->n_interfaces % 2) * 2
-    + blob->n_fields * header->field_blob_size
+  offset = g_object_info_get_field_offset(info, blob->n_fields)
     + blob->n_properties * header->property_blob_size
     + blob->n_methods * header->function_blob_size
     + blob->n_signals * header->signal_blob_size
@@ -652,9 +669,7 @@ g_object_info_find_vfunc (GIObjectInfo *info,
   header = (Header *)rinfo->typelib->data;
   blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
 
-  offset = rinfo->offset + header->object_blob_size
-    + (blob->n_interfaces + blob->n_interfaces % 2) * 2
-    + blob->n_fields * header->field_blob_size
+  offset = g_object_info_get_field_offset(info, blob->n_fields)
     + blob->n_properties * header->property_blob_size
     + blob->n_methods * header->function_blob_size
     + blob->n_signals * header->signal_blob_size;
@@ -769,9 +784,7 @@ g_object_info_get_constant (GIObjectInfo *info,
   header = (Header *)rinfo->typelib->data;
   blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
 
-  offset = rinfo->offset + header->object_blob_size
-    + (blob->n_interfaces + blob->n_interfaces % 2) * 2
-    + blob->n_fields * header->field_blob_size
+  offset = g_object_info_get_field_offset(info, blob->n_fields)
     + blob->n_properties * header->property_blob_size
     + blob->n_methods * header->function_blob_size
     + blob->n_signals * header->signal_blob_size
index 82005fc..c7feb6a 100644 (file)
@@ -62,37 +62,38 @@ struct _GIrParser
 
 typedef enum
 {
+  STATE_NONE = 0,
   STATE_START,
   STATE_END,
   STATE_REPOSITORY,
   STATE_INCLUDE,
-  STATE_C_INCLUDE,
-  STATE_PACKAGE,  /* 5 */
+  STATE_C_INCLUDE,     /* 5 */
+  STATE_PACKAGE,
   STATE_NAMESPACE,
   STATE_ENUM,
   STATE_BITFIELD,
-  STATE_FUNCTION,
-  STATE_FUNCTION_RETURN,  /* 10 */
+  STATE_FUNCTION,      /* 10 */
+  STATE_FUNCTION_RETURN,
   STATE_FUNCTION_PARAMETERS,
   STATE_FUNCTION_PARAMETER,
   STATE_CLASS,
-  STATE_CLASS_FIELD,
-  STATE_CLASS_PROPERTY,  /* 15 */
+  STATE_CLASS_FIELD,   /* 15 */
+  STATE_CLASS_PROPERTY,
   STATE_INTERFACE,
   STATE_INTERFACE_PROPERTY,
   STATE_INTERFACE_FIELD,
-  STATE_IMPLEMENTS,
-  STATE_PREREQUISITE,    /* 20 */
+  STATE_IMPLEMENTS,    /* 20 */
+  STATE_PREREQUISITE,
   STATE_BOXED,
   STATE_BOXED_FIELD,
   STATE_STRUCT,
-  STATE_STRUCT_FIELD,
-  STATE_UNION,           /* 25 */
+  STATE_STRUCT_FIELD,  /* 25 */
+  STATE_UNION,
   STATE_UNION_FIELD,
   STATE_NAMESPACE_CONSTANT,
   STATE_CLASS_CONSTANT,
-  STATE_INTERFACE_CONSTANT,
-  STATE_ALIAS,           /* 30 */
+  STATE_INTERFACE_CONSTANT,  /* 30 */
+  STATE_ALIAS,
   STATE_TYPE,
   STATE_ATTRIBUTE,
   STATE_PASSTHROUGH
@@ -123,7 +124,7 @@ struct _ParseContext
   GList *type_stack;
   GList *type_parameters;
   int type_depth;
-  gboolean in_embedded_type;
+  ParseState in_embedded_state;
 };
 #define CURRENT_NODE(ctx) ((GIrNode *)((ctx)->node_stack->data))
 
@@ -807,7 +808,7 @@ start_function (GMarkupParseContext *context,
   const gchar *throws;
   GIrNodeFunction *function;
   gboolean found = FALSE;
-  gboolean in_embedded_type;
+  ParseState in_embedded_state = STATE_NONE;
 
   switch (ctx->state)
     {
@@ -830,8 +831,10 @@ start_function (GMarkupParseContext *context,
     case STATE_ENUM:
       found = strcmp (element_name, "function") == 0;
       break;
+    case STATE_CLASS_FIELD:
     case STATE_STRUCT_FIELD:
       found = (found || strcmp (element_name, "callback") == 0);
+      in_embedded_state = ctx->state;
       break;
     default:
       break;
@@ -840,12 +843,10 @@ start_function (GMarkupParseContext *context,
   if (!found)
     return FALSE;
 
-  in_embedded_type = ctx->state == STATE_STRUCT_FIELD;
-
   if (!introspectable_prelude (context, attribute_names, attribute_values, ctx, STATE_FUNCTION))
     return TRUE;
 
-  ctx->in_embedded_type = in_embedded_type;
+  ctx->in_embedded_state = in_embedded_state;
 
   name = find_attribute ("name", attribute_names, attribute_values);
   shadows = find_attribute ("shadows", attribute_names, attribute_values);
@@ -3210,10 +3211,10 @@ end_element_handler (GMarkupParseContext *context,
        else
          {
             g_debug("case STATE_FUNCTION %d", CURRENT_NODE (ctx)->type);
-            if (ctx->in_embedded_type)
+            if (ctx->in_embedded_state != STATE_NONE)
               {
-                ctx->in_embedded_type = FALSE;
-                state_switch (ctx, STATE_STRUCT_FIELD);
+                state_switch (ctx, ctx->in_embedded_state);
+                ctx->in_embedded_state = STATE_NONE;
               }
            else if (CURRENT_NODE (ctx)->type == G_IR_NODE_INTERFACE)
              state_switch (ctx, STATE_INTERFACE);
index 8883496..41b54fd 100644 (file)
@@ -1773,10 +1773,17 @@ validate_object_blob (ValidateContext *ctx,
 
   push_context (ctx, get_string_nofail (typelib, blob->name));
 
-  for (i = 0; i < blob->n_fields; i++, offset2 += sizeof (FieldBlob))
+  for (i = 0; i < blob->n_fields; i++)
     {
+      FieldBlob *blob = (FieldBlob*) &typelib->data[offset2];
+
       if (!validate_field_blob (ctx, offset2, error))
        return FALSE;
+
+      offset2 += sizeof (FieldBlob);
+      /* Special case fields which are callbacks. */
+      if (blob->has_embedded_type)
+        offset2 += sizeof (CallbackBlob);
     }
 
   for (i = 0; i < blob->n_properties; i++, offset2 += sizeof (PropertyBlob))
index b5b2ad7..130f50c 100644 (file)
@@ -409,12 +409,15 @@ but adds it to things like ctypes, symbols, and type_names.
             self.type_names[node.gtype_name] = node
         elif isinstance(node, Function):
             self.symbols[node.symbol] = node
-        if isinstance(node, (Compound, Class, Interface)):
+        if isinstance(node, (Compound, Class, Interface, Boxed)):
             for fn in chain(node.methods, node.static_methods, node.constructors):
                 if not isinstance(fn, Function):
                     continue
                 fn.namespace = self
                 self.symbols[fn.symbol] = fn
+        if isinstance(node, (Compound, Class, Interface)):
+            for f in node.fields:
+                f.namespace = self
         if isinstance(node, (Class, Interface)):
             for m in chain(node.signals, node.properties):
                 m.namespace = self
@@ -678,8 +681,8 @@ class VFunction(Callable):
         self.invoker = None
 
     @classmethod
-    def from_callback(cls, cb):
-        obj = cls(cb.name, cb.retval, cb.parameters[1:],
+    def from_callback(cls, name, cb):
+        obj = cls(name, cb.retval, cb.parameters[1:],
                   cb.throws)
         return obj
 
@@ -916,6 +919,7 @@ class Field(Annotated):
         self.bits = bits
         self.anonymous_node = anonymous_node
         self.private = False
+        self.namespace = None
         self.parent = None  # a compound
 
     def __cmp__(self, other):
diff --git a/giscanner/doctemplates/C/callback.tmpl b/giscanner/doctemplates/C/callback.tmpl
new file mode 100644 (file)
index 0000000..f285ff6
--- /dev/null
@@ -0,0 +1,4 @@
+<%inherit file="./function.tmpl"/>
+<%block name="info">
+    ${formatter.format_xref(node.parent, type="guide", group=page_kind)}
+  </%block>
diff --git a/giscanner/doctemplates/C/field.tmpl b/giscanner/doctemplates/C/field.tmpl
new file mode 100644 (file)
index 0000000..b66ae92
--- /dev/null
@@ -0,0 +1 @@
+<%inherit file="/base.tmpl"/>
index 8d66943..3f9e627 100644 (file)
@@ -6,7 +6,7 @@
         <api:type>${formatter.format_type(node.retval.type) | x}</api:type>
       </api:returns>
       <api:name>${formatter.format_function_name(node)}</api:name>
-% for arg in formatter.get_parameters(node):
+% for arg in formatter.get_in_parameters(node):
 % if arg.type.ctype == '<varargs>':
       <api:varargs/>
 % else:
     </api:function>
 </%block>
 <%block name="synopsis">
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 ${node.retval.type.ctype} ${formatter.format_function_name(node)} (\
-% if not formatter.get_parameters(node):
+% if not formatter.get_in_parameters(node):
 void\
 % else:
-% for ix, arg in enumerate(formatter.get_parameters(node)):
+% for ix, arg in enumerate(formatter.get_in_parameters(node)):
 % if ix != 0:
 ${' ' * (len(formatter.format_type(node.retval.type)) + len(formatter.format_function_name(node)) + 3)}\
 % endif
@@ -33,18 +33,17 @@ ${' ' * (len(formatter.format_type(node.retval.type)) + len(formatter.format_fun
 % else:
 ${formatter.format_type(arg.type) | x} ${arg.argname}\
 % endif
-% if ix != len(formatter.get_parameters(node)) - 1:
+% if ix != len(formatter.get_in_parameters(node)) - 1:
 ,
 % endif
 % endfor
 % endif
 );
-</code></synopsis>
-</%block>
+  </code></synopsis></%block>
 <%block name="details">
-% if formatter.get_parameters(node) or node.retval:
+% if formatter.get_in_parameters(node) or node.retval:
 <terms>
-% for arg in formatter.get_parameters(node):
+% for arg in formatter.get_in_parameters(node):
 <item>
 <title><code>${arg.argname}</code></title>
 ${formatter.format(node, arg.doc)}
diff --git a/giscanner/doctemplates/C/interface.tmpl b/giscanner/doctemplates/C/interface.tmpl
new file mode 100644 (file)
index 0000000..3f18b02
--- /dev/null
@@ -0,0 +1,2 @@
+<%! page_type="guide" %>\
+<%inherit file="/class.tmpl"/>
diff --git a/giscanner/doctemplates/Gjs/callback.tmpl b/giscanner/doctemplates/Gjs/callback.tmpl
new file mode 100644 (file)
index 0000000..d7b9779
--- /dev/null
@@ -0,0 +1,27 @@
+<%inherit file="/base.tmpl"/>
+<%block name="synopsis">
+  <synopsis><code mime="text/x-gjs">
+function on${node.name}(\
+${', '.join('%s: %s' % (arg.argname, formatter.format_type(arg.type, True)) for arg in formatter.get_in_parameters(node))}\
+): ${formatter.format_out_parameters(node)} {
+}
+  </code></synopsis></%block>
+<%block name="details">
+% if formatter.has_any_parameters(node):
+<terms>
+% for arg in formatter.get_in_parameters(node):
+<item>
+<title><code>${arg.argname}</code></title>
+${formatter.format(node, arg.doc)}
+</item>
+% endfor
+% for arg in formatter.get_out_parameters(node):
+<item>
+<title><code>${(arg.argname + ' (out)') if arg.direction == 'inout' else arg.argname}</code></title>
+${formatter.format(node, arg.doc)}
+</item>
+% endfor
+</terms>
+% endif
+</%block>
+
index 887c646..7694d72 100644 (file)
@@ -1,18 +1,30 @@
 <%inherit file="/class.tmpl"/>
 <%block name="synopsis">
-  <synopsis><code>
+  <synopsis>\
+% if node.namespace is not None:
+<code>
 const ${namespace.name} = imports.gi.${namespace.name};
 
-let ${formatter.to_underscores(node.name).lower()} = new ${namespace.name}.${node.name}(\
+let ${formatter.to_lower_camel_case(node.name)} = new ${namespace.name}.${node.name}(\
+% if isinstance(node, (ast.Class, ast.Interface)):
 % if len(node.properties) > 0:
 {
 % for ix, property_ in enumerate(node.properties):
-% if property_.construct or property_.construct_only or property_.writable:
+% if (property_.construct or property_.construct_only) and property_.writable:
     <link xref='${namespace.name}.${node.name}-${property_.name}'>${property_.name.replace('-', '_')}</link>: value,
 % endif
 % endfor
 }\
 % endif
+% else:
+${formatter.format_gboxed_constructor(node)}\
+% endif
 );
-  </code></synopsis>
-</%block>
+  </code>\
+% else:
+  <p>
+    This structure is inside ${node.parent.namespace.name}.${node.parent.name}
+    and can only be used as a field of that.
+  </p>
+% endif
+</synopsis></%block>
index 35cdd43..e239de1 100644 (file)
@@ -1,3 +1,4 @@
+<%! page_type="guide" %>
 <%inherit file="/base.tmpl"/>
 <%block name="details">
 % if node.members:
@@ -11,3 +12,10 @@ ${formatter.format(node, member.doc)}
 </terms>
 % endif
 </%block>
+<%block name="links">\
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="${formatter.mime_type}"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>\
+</%block>
\ No newline at end of file
diff --git a/giscanner/doctemplates/Gjs/field.tmpl b/giscanner/doctemplates/Gjs/field.tmpl
new file mode 100644 (file)
index 0000000..dda8246
--- /dev/null
@@ -0,0 +1,9 @@
+<%inherit file="/base.tmpl"/>
+<%block name="info">
+    ${formatter.format_xref(node.parent, type="guide", group=page_kind)}
+    <title type="link" role="topic">${node.name}</title>
+</%block>
+<%block name="synopsis">
+  <synopsis><code mime="text/x-gjs">
+${node.parent.name}.${formatter.to_underscores(node)}: ${formatter.format_type(node.type, True)} (${formatter.format_property_flags(node)})
+  </code></synopsis></%block>
index e0fd961..8e9d741 100644 (file)
@@ -6,7 +6,7 @@
         <api:type>${formatter.format_type(node.retval.type) | x}</api:type>
       </api:returns>
       <api:name>${node.symbol}</api:name>
-% for arg in formatter.get_parameters(node):
+% for arg in formatter.get_in_parameters(node):
 % if arg.type.ctype == '<varargs>':
       <api:varargs/>
 % else:
     </api:function>
 </%block>
 <%block name="synopsis">
-<synopsis><code mime="text/x-gjs">
+  <synopsis><code mime="text/x-gjs">
 function \
-${node.name}(\
-${', '.join('%s:%s' % (arg.argname, formatter.format_type(arg.type)) for arg in formatter.get_parameters(node))}\
-):${formatter.format_type(node.retval.type)} {
+${node.name if node.shadows is None else node.shadows}(\
+${', '.join('%s: %s' % (arg.argname, formatter.format_type(arg.type, True)) for arg in formatter.get_in_parameters(node))}\
+): ${formatter.format_out_parameters(node)} {
     // Gjs wrapper for ${node.symbol}()
 }
-</code></synopsis>
-</%block>
+  </code></synopsis></%block>
 <%block name="details">
-% if formatter.get_parameters(node) or node.retval:
+% if formatter.has_any_parameters(node):
 <terms>
-% for arg in formatter.get_parameters(node):
+% for arg in formatter.get_in_parameters(node):
 <item>
 <title><code>${arg.argname}</code></title>
 ${formatter.format(node, arg.doc)}
 </item>
 % endfor
-% if node.retval and node.retval.type.ctype != 'void':
+% for arg in formatter.get_out_parameters(node):
 <item>
-<title><code>Returns</code></title>
-${formatter.format(node, node.retval.doc)}
+<title><code>${(arg.argname + ' (out)') if arg.direction == 'inout' else arg.argname}</code></title>
+${formatter.format(node, arg.doc)}
 </item>
-% endif
+% endfor
 </terms>
 % endif
 </%block>
diff --git a/giscanner/doctemplates/Gjs/interface.tmpl b/giscanner/doctemplates/Gjs/interface.tmpl
new file mode 100644 (file)
index 0000000..2f01f20
--- /dev/null
@@ -0,0 +1,17 @@
+<%inherit file="/class.tmpl"/>
+<%block name="synopsis">
+  <synopsis><code>
+const ${namespace.name} = imports.gi.${namespace.name};
+
+let ${formatter.to_underscores(node).lower()} = new ${namespace.name}.${node.name}(\
+% if len(node.properties) > 0:
+{
+% for ix, property_ in enumerate(node.properties):
+% if (property_.construct or property_.construct_only) and property_.writable:
+    <link xref='${namespace.name}.${node.name}-${property_.name}'>${property_.name.replace('-', '_')}</link>: value,
+% endif
+% endfor
+}\
+% endif
+);
+  </code></synopsis></%block>
index 3316a00..dda8246 100644 (file)
@@ -4,7 +4,6 @@
     <title type="link" role="topic">${node.name}</title>
 </%block>
 <%block name="synopsis">
-<synopsis><code mime="text/x-python">
-"${node.name}"             ${formatter.format_type(node.type)}                : ${formatter.format_property_flags(node)}
-</code></synopsis>
-</%block>
+  <synopsis><code mime="text/x-gjs">
+${node.parent.name}.${formatter.to_underscores(node)}: ${formatter.format_type(node.type, True)} (${formatter.format_property_flags(node)})
+  </code></synopsis></%block>
index 084d974..7c50816 100644 (file)
@@ -4,21 +4,22 @@
     <title type="link" role="topic">${node.name}</title>
 </%block>
 <%block name="synopsis">
-<synopsis><code mime="text/x-python">
-function callback(${formatter.to_underscores(node.parent.name).lower()}, \
-% for arg in formatter.get_parameters(node):
-${arg.argname}:${formatter.format_type(arg.type)}, \
+  <synopsis><code mime="text/x-gjs">
+connect('${node.name}', function (${formatter.to_lower_camel_case(node.parent.name)}, \
+% for arg in formatter.get_in_parameters(node):
+% if arg.type.target_fundamental != 'none':
+${arg.argname}: ${formatter.format_type(arg.type, True)}, \
+% endif
 % endfor
-):${formatter.format_type(node.retval.type)};
-</code></synopsis>
-</%block>
+): ${formatter.format_type(node.retval.type, True)});
+  </code></synopsis></%block>
 <%block name="details">
 <terms>
 <item>
-<title><code>${formatter.to_underscores(node.parent.name).lower()}</code></title>
+<title><code>${formatter.to_lower_camel_case(node.parent.name)}</code></title>
 <p>instance of ${formatter.format_xref(node.parent)} that is emitting the signal</p>
 </item>
-% for arg in formatter.get_parameters(node):
+% for arg in formatter.get_in_parameters(node):
 <item>
 <title><code>${arg.argname}</code></title>
 ${formatter.format(node, arg.doc)}
index 1cbe511..2bd1127 100644 (file)
@@ -1,16 +1,15 @@
 <%inherit file="/base.tmpl"/>
 <%block name="synopsis">
-<synopsis><code mime="text/x-gjs">
+  <synopsis><code mime="text/x-gjs">
 function vfunc_${node.name}(\
-${', '.join('%s:%s' % (arg.argname, formatter.format_type(arg.type)) for arg in formatter.get_parameters(node))}\
-):${formatter.format_type(node.retval.type)} {
+${', '.join('%s: %s' % (arg.argname, formatter.format_type(arg.type, True)) for arg in formatter.get_in_parameters(node))}\
+): ${formatter.format_out_parameters(node)} {
 }
-</code></synopsis>
-</%block>
+  </code></synopsis></%block>
 <%block name="details">
-% if formatter.get_parameters(node) or node.retval:
+% if formatter.get_in_parameters(node) or node.retval:
 <terms>
-% for arg in formatter.get_parameters(node):
+% for arg in formatter.get_in_parameters(node):
 <item>
 <title><code>${arg.argname}</code></title>
 ${formatter.format(node, arg.doc)}
@@ -25,3 +24,4 @@ ${formatter.format(node, node.retval.doc)}
 </terms>
 % endif
 </%block>
+
diff --git a/giscanner/doctemplates/Python/callback.tmpl b/giscanner/doctemplates/Python/callback.tmpl
new file mode 100644 (file)
index 0000000..4fcbfe3
--- /dev/null
@@ -0,0 +1,27 @@
+<%inherit file="/base.tmpl"/>
+<%block name="synopsis">
+  <synopsis><code mime="text/x-python">
+% if formatter.get_in_parameters(node):
+@accepts(${', '.join((formatter.format_type(arg.type) for arg in formatter.get_in_parameters(node)))})
+% endif
+@returns(${formatter.format_type(node.retval.type) | x})
+def on_${node.name}(${', '.join((arg.argname for arg in formatter.get_in_parameters(node)))}):
+  </code></synopsis></%block>
+<%block name="details">
+% if formatter.get_in_parameters(node) or node.retval:
+<terms>
+% for arg in formatter.get_in_parameters(node):
+<item>
+<title><code>${arg.argname}</code></title>
+${formatter.format(node, arg.doc)}
+</item>
+% endfor
+% if node.retval and node.retval.type.ctype != 'void':
+<item>
+<title><code>Returns</code></title>
+${formatter.format(node, node.retval.doc)}
+</item>
+% endif
+</terms>
+% endif
+</%block>
index 435b31a..51d25a9 100644 (file)
@@ -3,7 +3,8 @@
   <synopsis><code>
 from gi.repository import ${namespace.name}
 
-${formatter.to_underscores(node.name).lower()} = ${namespace.name}.${node.name}(\
+${formatter.to_underscores(node).lower()} = ${namespace.name}.${node.name}(\
+% if isinstance(node, (ast.Class, ast.Interface)):
 % for ix, property_ in enumerate(node.properties):
 % if property_.construct or property_.construct_only or property_.writable:
 <link xref='${namespace.name}.${node.name}-${property_.name}'>${property_.name.replace('-', '_')}</link>=value\
@@ -12,6 +13,6 @@ ${formatter.to_underscores(node.name).lower()} = ${namespace.name}.${node.name}(
 % endif
 % endif
 % endfor
-)\
-  </code></synopsis>
-</%block>
+% endif
+)
+  </code></synopsis></%block>
diff --git a/giscanner/doctemplates/Python/field.tmpl b/giscanner/doctemplates/Python/field.tmpl
new file mode 100644 (file)
index 0000000..b66ae92
--- /dev/null
@@ -0,0 +1 @@
+<%inherit file="/base.tmpl"/>
index 072a118..7ad1ac0 100644 (file)
@@ -6,7 +6,7 @@
         <api:type>${formatter.format_type(node.retval.type) | x}</api:type>
       </api:returns>
       <api:name>${node.symbol}</api:name>
-% for arg in formatter.get_parameters(node):
+% for arg in formatter.get_in_parameters(node):
 % if arg.type.ctype == '<varargs>':
       <api:varargs/>
 % else:
     </api:function>
 </%block>
 <%block name="synopsis">
-<synopsis><code mime="text/x-python">
-% if formatter.get_parameters(node):
-@accepts(\
-${', '.join((formatter.format_type(arg.type) for arg in formatter.get_parameters(node)))}\
-)
+  <synopsis><code mime="text/x-python">
+% if formatter.get_in_parameters(node):
+@accepts(${', '.join((formatter.format_type(arg.type) for arg in formatter.get_in_parameters(node)))})
 % endif
 @returns(${formatter.format_type(node.retval.type) | x})
-def \
-${node.name}(\
-${', '.join((formatter.format_parameter_name(node, arg) for arg in formatter.get_parameters(node)))}\
-):
+def ${node.name}(${', '.join((formatter.format_parameter_name(node, arg) for arg in formatter.get_in_parameters(node)))}):
     # Python wrapper for ${node.symbol}()
-</code></synopsis>
-</%block>
+  </code></synopsis></%block>
 <%block name="details">
-% if formatter.get_parameters(node) or node.retval:
+% if formatter.get_in_parameters(node) or node.retval:
 <terms>
-% for ix, arg in enumerate(formatter.get_parameters(node)):
+% for ix, arg in enumerate(formatter.get_in_parameters(node)):
 <item>
 <title><code>${formatter.format_parameter_name(node, arg)}</code></title>
 ${formatter.format(node, arg.doc)}
diff --git a/giscanner/doctemplates/Python/interface.tmpl b/giscanner/doctemplates/Python/interface.tmpl
new file mode 100644 (file)
index 0000000..b3596a8
--- /dev/null
@@ -0,0 +1,16 @@
+<%inherit file="/class.tmpl"/>
+<%block name="synopsis">
+  <synopsis><code>
+from gi.repository import ${namespace.name}
+
+${formatter.to_underscores(node).lower()} = ${namespace.name}.${node.name}(\
+% for ix, property_ in enumerate(node.properties):
+% if property_.construct or property_.construct_only or property_.writable:
+<link xref='${namespace.name}.${node.name}-${property_.name}'>${property_.name.replace('-', '_')}</link>=value\
+% if ix != len(node.properties) - 1:
+, \
+% endif
+% endif
+% endfor
+)\
+  </code></synopsis></%block>
index 3316a00..c93d59b 100644 (file)
@@ -4,7 +4,6 @@
     <title type="link" role="topic">${node.name}</title>
 </%block>
 <%block name="synopsis">
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 "${node.name}"             ${formatter.format_type(node.type)}                : ${formatter.format_property_flags(node)}
-</code></synopsis>
-</%block>
+  </code></synopsis></%block>
index dc93110..c61b722 100644 (file)
@@ -4,21 +4,20 @@
     <title type="link" role="topic">${node.name}</title>
 </%block>
 <%block name="synopsis">
-<synopsis><code mime="text/x-python">
-def callback(${formatter.to_underscores(node.parent.name).lower()}, \
-% for arg in formatter.get_parameters(node):
+  <synopsis><code mime="text/x-python">
+def callback(${formatter.to_underscores(node.parent).lower()}, \
+% for arg in formatter.get_in_parameters(node):
 ${arg.argname}, \
 % endfor
 user_param1, ...)
-</code></synopsis>
-</%block>
+  </code></synopsis></%block>
 <%block name="details">
 <terms>
 <item>
-<title><code>${formatter.to_underscores(node.parent.name).lower()}</code></title>
+<title><code>${formatter.to_underscores(node.parent).lower()}</code></title>
 <p>instance of ${formatter.format_xref(node.parent)} that is emitting the signal</p>
 </item>
-% for arg in formatter.get_parameters(node):
+% for arg in formatter.get_in_parameters(node):
 <item>
 <title><code>${arg.argname}</code></title>
 ${formatter.format(node, arg.doc)}
index 98a3093..2c532e7 100644 (file)
@@ -1,22 +1,16 @@
 <%inherit file="/base.tmpl"/>
 <%block name="synopsis">
-<synopsis><code mime="text/x-python">
-% if formatter.get_parameters(node):
-@accepts(\
-${', '.join((formatter.format_type(arg.type) for arg in formatter.get_parameters(node)))}\
-)
+  <synopsis><code mime="text/x-python">
+% if formatter.get_in_parameters(node):
+@accepts(${', '.join((formatter.format_type(arg.type) for arg in formatter.get_in_parameters(node)))})
 % endif
 @returns(${formatter.format_type(node.retval.type) | x})
-def \
-do_${node.name}(\
-${', '.join((arg.argname for arg in formatter.get_parameters(node)))}\
-):
-</code></synopsis>
-</%block>
+def do_${node.name}(${', '.join((arg.argname for arg in formatter.get_in_parameters(node)))}):
+  </code></synopsis></%block>
 <%block name="details">
-% if formatter.get_parameters(node) or node.retval:
+% if formatter.get_in_parameters(node) or node.retval:
 <terms>
-% for arg in formatter.get_parameters(node):
+% for arg in formatter.get_in_parameters(node):
 <item>
 <title><code>${arg.argname}</code></title>
 ${formatter.format(node, arg.doc)}
index 7898077..7a1d8db 100644 (file)
@@ -6,24 +6,15 @@
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    <%block name="info">
-      ${formatter.format_xref(node.parent, type="guide", group=page_kind)}
-    </%block>
+  <info><%block name="info">
+    ${formatter.format_xref(node.parent, type="guide", group=page_kind)}
+</%block>\
   </info>
-  <title><%block name="title">${formatter.format_page_name(node)}</%block></title>
-  <%block name="synopsis">
-  </%block>
-  <%block name="doc">
-    ${formatter.format(node, node.doc)}
-  </%block>
-  <%block name="since_version">
-    % if node.version:
-    <p>Since ${node.version}</p>
-    % endif
-  </%block>
-  <%block name="details">
-  </%block>
-  <%block name="links">
-  </%block>
+  <title><%block name="title">${formatter.format_page_name(node)}</%block></title><%block name="synopsis"></%block><%block name="doc">
+${formatter.format(node, node.doc)}
+</%block><%block name="since_version">\
+% if node.version:
+  <p>Since ${node.version}</p>\
+% endif
+</%block><%block name="details"></%block><%block name="links"></%block>
 </page>
index 7f8b686..8633386 100644 (file)
@@ -1,6 +1,7 @@
 <%! page_type="guide" %>\
 <%inherit file="/base.tmpl"/>
 <%block name="details">
+% if isinstance(node, ast.Class):
   <synopsis>
     <title>Hierarchy</title>
     <tree>
 % endfor
     </tree>
   </synopsis>
+% elif isinstance(node, ast.Interface):
+  <synopsis>
+    <title>Prerequisites</title>
+    <p>${node.name} requires ${formatter.format_prerequisites(node)}</p>
+  </synopsis>
+  <synopsis>
+    <title>Known Implementations</title>
+    <p>${formatter.format_known_implementations(node)}</p>
+  </synopsis>
+% endif
 </%block>
-<%block name="links">
+<%block name="links">\
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="${formatter.mime_type}"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="${formatter.mime_type}"
          groups="method" style="linklist">
@@ -23,8 +39,9 @@
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="${formatter.mime_type}"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
+% if isinstance(node, (ast.Class, ast.Interface)):
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
   </links>
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+% endif
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
-  </links>
+  </links>\
 </%block>
index bb58bb1..d4edcec 100644 (file)
@@ -1,11 +1,9 @@
 <%! page_type="guide" %>\
 <%inherit file="/base.tmpl"/>
-<%block name="doc">
-</%block>
-<%block name="info">
-</%block>
+<%block name="doc"></%block>
+<%block name="info"></%block>
 <%block name="links">
-  <links type="topic" ui:expanded="true" groups="class" style="linklist">
+  <links type="topic" ui:expanded="true" groups="class interface" style="linklist">
     <title>Classes</title>
   </links>
   <links type="topic" ui:expanded="true" groups="function" style="linklist">
@@ -15,5 +13,4 @@
     <title>Other</title>
   </links>
 </%block>
-<%block name="since_version">
-</%block>
+<%block name="since_version"></%block>
index a4c817e..d888c81 100644 (file)
@@ -42,13 +42,18 @@ def make_page_id(node, recursive=False):
     if hasattr(node, '_chain') and node._chain:
         parent = node._chain[-1]
     else:
-        parent = None
+        parent = getattr(node, 'parent', None)
 
     if parent is None:
-        return '%s.%s' % (node.namespace.name, node.name)
+        if isinstance(node, ast.Function) and node.shadows:
+            return '%s.%s' % (node.namespace.name, node.shadows)
+        else:
+            return '%s.%s' % (node.namespace.name, node.name)
 
-    if isinstance(node, (ast.Property, ast.Signal, ast.VFunction)):
+    if isinstance(node, (ast.Property, ast.Signal, ast.VFunction, ast.Field)):
         return '%s-%s' % (make_page_id(parent, recursive=True), node.name)
+    elif isinstance(node, ast.Function) and node.shadows:
+        return '%s.%s' % (make_page_id(parent, recursive=True), node.shadows)
     else:
         return '%s.%s' % (make_page_id(parent, recursive=True), node.name)
 
@@ -56,8 +61,10 @@ def make_page_id(node, recursive=False):
 def get_node_kind(node):
     if isinstance(node, ast.Namespace):
         node_kind = 'namespace'
-    elif isinstance(node, (ast.Class, ast.Interface)):
+    elif isinstance(node, (ast.Class, ast.Boxed, ast.Compound)):
         node_kind = 'class'
+    elif isinstance(node, ast.Interface):
+        node_kind = 'interface'
     elif isinstance(node, ast.Record):
         node_kind = 'record'
     elif isinstance(node, ast.Function):
@@ -67,7 +74,7 @@ def get_node_kind(node):
             node_kind = 'constructor'
         else:
             node_kind = 'function'
-    elif isinstance(node, ast.Enum):
+    elif isinstance(node, (ast.Enum, ast.Bitfield)):
         node_kind = 'enum'
     elif isinstance(node, ast.Property) and node.parent is not None:
         node_kind = 'property'
@@ -75,6 +82,10 @@ def get_node_kind(node):
         node_kind = 'signal'
     elif isinstance(node, ast.VFunction) and node.parent is not None:
         node_kind = 'vfunc'
+    elif isinstance(node, ast.Callable):
+        node_kind = 'callback'
+    elif isinstance(node, ast.Field):
+        node_kind = 'field'
     else:
         node_kind = 'default'
 
@@ -170,11 +181,16 @@ class DocFormatter(object):
         return saxutils.escape(text)
 
     def should_render_node(self, node):
-        if isinstance(node, ast.Constant):
-            return False
-
         if getattr(node, "private", False):
             return False
+        # Nodes without namespace are AST bugs really
+        # They are used for structs and unions declared
+        # inline inside other structs, but they are not
+        # even picked up by g-ir-compiler, because they
+        # don't create a <type/> element.
+        # So just ignore them.
+        if isinstance(node, ast.Node) and node.namespace is None:
+            return False
 
         return True
 
@@ -184,7 +200,7 @@ class DocFormatter(object):
 
         result = ''
         for para in doc.split('\n\n'):
-            result += '<p>'
+            result += '  <p>'
             result += self.format_inline(node, para)
             result += '</p>'
         return result
@@ -295,7 +311,7 @@ class DocFormatter(object):
 
         return dispatch[kind](node, match, props)
 
-    def get_parameters(self, node):
+    def get_in_parameters(self, node):
         raise NotImplementedError
 
     def format_inline(self, node, para):
@@ -312,12 +328,12 @@ class DocFormatter(object):
     def format_function_name(self, func):
         raise NotImplementedError
 
-    def format_type(self, type_):
+    def format_type(self, type_, link=False):
         raise NotImplementedError
 
     def format_page_name(self, node):
         if isinstance(node, ast.Namespace):
-            return 'Index'
+            return node.name
         elif isinstance(node, ast.Function):
             return self.format_function_name(node)
         elif isinstance(node, ast.Property) and node.parent is not None:
@@ -326,39 +342,74 @@ class DocFormatter(object):
             return '%s::%s' % (self.format_page_name(node.parent), node.name)
         elif isinstance(node, ast.VFunction) and node.parent is not None:
             return '%s::%s' % (self.format_page_name(node.parent), node.name)
+        elif isinstance(node, ast.Field) and node.parent is not None:
+            return '%s->%s' % (self.format_page_name(node.parent), node.name)
         else:
             return make_page_id(node)
 
     def format_xref(self, node, **attrdict):
-        if node is None:
+        if node is None or not hasattr(node, 'namespace'):
             attrs = [('xref', 'index')] + attrdict.items()
             return xmlwriter.build_xml_tag('link', attrs)
         elif isinstance(node, ast.Member):
             # Enum/BitField members are linked to the main enum page.
             return self.format_xref(node.parent, **attrdict) + '.' + node.name
+        elif node.namespace is self._transformer.namespace:
+            return self.format_internal_xref(node, attrdict)
         else:
-            attrs = [('xref', make_page_id(node))] + attrdict.items()
-            return xmlwriter.build_xml_tag('link', attrs)
+            return self.format_external_xref(node, attrdict)
+
+    def format_internal_xref(self, node, attrdict):
+        attrs = [('xref', make_page_id(node))] + attrdict.items()
+        return xmlwriter.build_xml_tag('link', attrs)
+
+    def format_external_xref(self, node, attrdict):
+        ns = node.namespace
+        attrs = [('href', '../%s-%s/%s.html' % (ns.name, str(ns.version),
+                                                make_page_id(node)))]
+        attrs += attrdict.items()
+        return xmlwriter.build_xml_tag('link', attrs, self.format_page_name(node))
+
+    def field_is_writable(self, field):
+        return True
 
     def format_property_flags(self, property_, construct_only=False):
         flags = []
+
         if property_.readable and not construct_only:
             flags.append("Read")
-        if property_.writable and not construct_only:
+        if property_.writable and not construct_only and \
+           self.field_is_writable(property_):
             flags.append("Write")
-        if property_.construct:
-            flags.append("Construct")
-        if property_.construct_only:
-            flags.append("Construct Only")
+        if isinstance(property_, ast.Property):
+            if property_.construct:
+                flags.append("Construct")
+            if property_.construct_only:
+                flags.append("Construct Only")
 
         return " / ".join(flags)
 
-    def to_underscores(self, string):
-        return to_underscores(string)
+    def to_underscores(self, node):
+        if isinstance(node, ast.Property):
+            return node.name.replace('-', '_')
+        elif node.name:
+            return to_underscores(node.name)
+        elif isinstance(node, ast.Callback):
+            return 'callback'
+        elif isinstance(node, ast.Union):
+            return 'anonymous_union'
+        elif isinstance(node, ast.Field):
+            return 'anonymous field'
+        else:
+            raise Exception('invalid node')
+
+    def to_lower_camel_case(self, string):
+        return string[0].lower() + string[1:]
 
     def get_class_hierarchy(self, node):
-        parent_chain = [node]
+        assert isinstance(node, ast.Class)
 
+        parent_chain = [node]
         while node.parent_type:
             node = self._transformer.lookup_typenode(node.parent_type)
             parent_chain.append(node)
@@ -366,6 +417,42 @@ class DocFormatter(object):
         parent_chain.reverse()
         return parent_chain
 
+    def format_prerequisites(self, node):
+        assert isinstance(node, ast.Interface)
+
+        if len(node.prerequisites) > 0:
+            if len(node.prerequisites) > 1:
+                return ', '.join(node.prerequisites[:-1]) + \
+                    ' and ' + node.prerequisites[-1]
+            else:
+                return node.prerequisites[0]
+        else:
+            return 'GObject.Object'
+
+    def format_known_implementations(self, node):
+        assert isinstance(node, ast.Interface)
+
+        node_name = node.namespace.name + '.' + node.name
+        impl = []
+
+        for c in node.namespace.itervalues():
+            if not isinstance(c, ast.Class):
+                continue
+            for implemented in c.interfaces:
+                if implemented.target_giname == node_name:
+                    impl.append(c)
+                    break
+
+        if len(impl) == 0:
+            return 'None'
+        else:
+            out = '%s is implemented by ' % (node.name,)
+            if len(impl) == 1:
+                return out + impl[0].name
+            else:
+                return out + ', '.join(i.name for i in impl[:-1]) + \
+                    ' and ' + impl[-1].name
+
 
 class DocFormatterC(DocFormatter):
     language = "C"
@@ -377,7 +464,7 @@ class DocFormatterC(DocFormatter):
         "NULL": "NULL",
     }
 
-    def format_type(self, type_):
+    def format_type(self, type_, link=False):
         if isinstance(type_, ast.Array):
             return self.format_type(type_.element_type) + '*'
         elif type_.ctype is not None:
@@ -394,7 +481,7 @@ class DocFormatterC(DocFormatter):
         else:
             return func.name
 
-    def get_parameters(self, node):
+    def get_in_parameters(self, node):
         return node.all_parameters
 
 
@@ -406,6 +493,9 @@ class DocFormatterIntrospectableBase(DocFormatter):
         if not getattr(node, "introspectable", True):
             return False
 
+        if isinstance(node, ast.Function) and node.shadowed_by is not None:
+            return False
+
         return super(DocFormatterIntrospectableBase, self).should_render_node(node)
 
 
@@ -466,7 +556,7 @@ class DocFormatterPython(DocFormatterIntrospectableBase):
 
         return fundamental_types.get(name, name)
 
-    def format_type(self, type_):
+    def format_type(self, type_, link=False):
         if isinstance(type_, (ast.List, ast.Array)):
             return '[' + self.format_type(type_.element_type) + ']'
         elif isinstance(type_, ast.Map):
@@ -483,7 +573,7 @@ class DocFormatterPython(DocFormatterIntrospectableBase):
         else:
             return func.name
 
-    def get_parameters(self, node):
+    def get_in_parameters(self, node):
         return node.all_parameters
 
 
@@ -506,68 +596,282 @@ class DocFormatterGjs(DocFormatterIntrospectableBase):
 
         return False
 
+    def resolve_gboxed_constructor(self, node):
+        zero_args_constructor = None
+        default_constructor = None
+
+        introspectable_constructors = \
+            filter(lambda c: getattr(c, 'introspectable', True),
+                   node.constructors)
+        for c in introspectable_constructors:
+            if zero_args_constructor is None and \
+               len(c.parameters) == 0:
+                zero_args_constructor = c
+            if default_constructor is None and \
+               c.name == 'new':
+                default_constructor = c
+        if default_constructor is None:
+            default_constructor = zero_args_constructor
+        if default_constructor is None and \
+           len(introspectable_constructors) > 0:
+            default_constructor = introspectable_constructors[0]
+
+        node.gjs_default_constructor = default_constructor
+        node.gjs_zero_args_constructor = zero_args_constructor
+
+    def should_render_node(self, node):
+        if isinstance(node, (ast.Compound, ast.Boxed)):
+            self.resolve_gboxed_constructor(node)
+
+        if isinstance(node, ast.Compound) and node.disguised and \
+           len(node.methods) == len(node.static_methods) == len(node.constructors) == 0:
+            return False
+
+        if isinstance(node, ast.ErrorQuarkFunction):
+            return False
+        if isinstance(node, ast.Field):
+            if node.type is None:
+                return False
+            if isinstance(node.parent, (ast.Class, ast.Union)):
+                return False
+        if isinstance(node, ast.Union) and node.name is None:
+            return False
+        if isinstance(node, ast.Class):
+            is_gparam_subclass = False
+            if node.parent_type:
+                parent = self._transformer.lookup_typenode(node.parent_type)
+                while parent:
+                    if parent.namespace.name == 'GObject' and \
+                       parent.name == 'ParamSpec':
+                        is_gparam_subclass = True
+                        break
+                    if parent.parent_type is None:
+                        break
+                    parent = self._transformer.lookup_typenode(parent.parent_type)
+            if is_gparam_subclass:
+                return False
+
+        return super(DocFormatterGjs, self).should_render_node(node)
+
     def format_fundamental_type(self, name):
         fundamental_types = {
+            "none": "void",
+            "gpointer": "void",
+            "gboolean": "Boolean",
+            "gint8": "Number(gint8)",
+            "guint8": "Number(guint8)",
+            "gint16": "Number(gint16)",
+            "guint16": "Number(guint16)",
+            "gint32": "Number(gint32)",
+            "guint32": "Number(guint32)",
+            "gchar": "Number(gchar)",
+            "guchar": "Number(guchar)",
+            "gshort": "Number(gshort)",
+            "gint": "Number(gint)",
+            "guint": "Number(guint)",
+            "gfloat": "Number(gfloat)",
+            "gdouble": "Number(gdouble)",
             "utf8": "String",
             "gunichar": "String",
-            "gchar": "String",
-            "guchar": "String",
-            "gboolean": "Boolean",
-            "gint": "Number",
-            "guint": "Number",
-            "glong": "Number",
-            "gulong": "Number",
-            "gint64": "Number",
-            "guint64": "Number",
-            "gfloat": "Number",
-            "gdouble": "Number",
-            "gchararray": "String",
-            "GParam": "GLib.Param",
-            "PyObject": "Object",
-            "GStrv": "[String]",
-            "GVariant": "GLib.Variant"}
+            "filename": "String",
+            "GType": "GObject.Type",
+            "GVariant": "GLib.Variant",
+            # These cannot be fully represented in gjs
+            "gsize": "Number(gsize)",
+            "gssize": "Number(gssize)",
+            "gintptr": "Number(gintptr)",
+            "guintptr": "Number(guintptr)",
+            "glong": "Number(glong)",
+            "gulong": "Number(gulong)",
+            "gint64": "Number(gint64)",
+            "guint64": "Number(guint64)",
+            "long double": "Number(long double)",
+            "long long": "Number(long long)",
+            "unsigned long long": "Number(unsigned long long)"}
 
         return fundamental_types.get(name, name)
 
-    def format_type(self, type_):
-        if isinstance(type_, (ast.List, ast.Array)):
-            return '[' + self.format_type(type_.element_type) + ']'
+    def format_type(self, type_, link=False):
+        if isinstance(type_, ast.Array) and \
+           type_.element_type.target_fundamental in ('gint8', 'guint8'):
+            return 'ByteArray'
+        elif isinstance(type_, (ast.List, ast.Array)):
+            return 'Array(' + self.format_type(type_.element_type, link) + ')'
         elif isinstance(type_, ast.Map):
-            return '{%s: %s}' % (self.format_type(type_.key_type),
-                                 self.format_type(type_.value_type))
-        elif type_.target_fundamental == "none":
+            return '{%s: %s}' % (self.format_type(type_.key_type, link),
+                                 self.format_type(type_.value_type, link))
+        elif not type_ or type_.target_fundamental == "none":
             return "void"
         elif type_.target_giname is not None:
-            return type_.target_giname
+            giname = type_.target_giname
+            if giname in ('GLib.ByteArray', 'GLib.Bytes'):
+                return 'ByteArray'
+            if giname == 'GObject.Value':
+                return 'Any'
+            if giname == 'GObject.Closure':
+                return 'Function'
+            if link:
+                nsname = self._transformer.namespace.name
+                if giname.startswith(nsname + '.'):
+                    return '<link xref="%s">%s</link>' % (giname, giname)
+                else:
+                    resolved = self._transformer.lookup_typenode(type_)
+                    if resolved:
+                        return self.format_xref(resolved)
+            return giname
         else:
             return self.format_fundamental_type(type_.target_fundamental)
 
     def format_function_name(self, func):
+        name = func.name
+        if func.shadows:
+            name = func.shadows
+
         if func.is_method:
-            return "%s.prototype.%s" % (self.format_page_name(func.parent), func.name)
-        elif func.is_constructor:
-            return "%s.%s" % (self.format_page_name(func.parent), func.name)
+            return "%s.prototype.%s" % (self.format_page_name(func.parent), name)
+        elif func.parent is not None:
+            return "%s.%s" % (self.format_page_name(func.parent), name)
         else:
-            return func.name
+            return name
+
+    def format_page_name(self, node):
+        if isinstance(node, (ast.Field, ast.Property)):
+            return '%s.%s' % (self.format_page_name(node.parent), self.to_underscores(node))
+        else:
+            return DocFormatterIntrospectableBase.format_page_name(self, node)
 
-    def get_parameters(self, node):
-        skip = []
+    def has_any_parameters(self, node):
+        return len(node.parameters) > 0 or \
+            node.retval.type.target_fundamental != 'none'
+
+    def get_in_parameters(self, node):
+        skip = set()
         for param in node.parameters:
             if param.direction == ast.PARAM_DIRECTION_OUT:
-                skip.append(param)
+                skip.add(param)
+            if param.closure_name is not None:
+                skip.add(node.get_parameter(param.closure_name))
+            if param.destroy_name is not None:
+                skip.add(node.get_parameter(param.destroy_name))
+            if isinstance(param.type, ast.Array) and param.type.length_param_name is not None:
+                skip.add(node.get_parameter(param.type.length_param_name))
+
+        params = []
+        for param in node.parameters:
+            if param not in skip:
+                params.append(param)
+        return params
+
+    def get_out_parameters(self, node):
+        skip = set()
+        for param in node.parameters:
+            if param.direction == ast.PARAM_DIRECTION_IN:
+                skip.add(param)
             if param.closure_name is not None:
-                skip.append(node.get_parameter(param.closure_name))
+                skip.add(node.get_parameter(param.closure_name))
             if param.destroy_name is not None:
-                skip.append(node.get_parameter(param.destroy_name))
+                skip.add(node.get_parameter(param.destroy_name))
             if isinstance(param.type, ast.Array) and param.type.length_param_name is not None:
-                skip.append(node.get_parameter(param.type.length_param_name))
+                skip.add(node.get_parameter(param.type.length_param_name))
 
         params = []
+        if node.retval.type.target_fundamental != 'none':
+            name = 'return_value'
+            if node.retval.type.target_fundamental == 'gboolean':
+                name = 'ok'
+
+            ret_param = ast.Parameter(name, node.retval.type,
+                                      ast.PARAM_DIRECTION_OUT)
+            ret_param.doc = node.retval.doc
+            params.append(ret_param)
         for param in node.parameters:
             if param not in skip:
                 params.append(param)
+
+        if len(params) == 1:
+            params[0].argname = 'Returns'
+
         return params
 
+    def format_in_parameters(self, node):
+        in_params = self.get_in_parameters(node)
+        return ', '.join(('%s: %s' % (p.argname, self.format_type(p.type, True)))
+                         for p in in_params)
+
+    def format_out_parameters(self, node):
+        out_params = self.get_out_parameters(node)
+
+        if len(out_params) == 0:
+            return 'void'
+        elif len(out_params) == 1:
+            return self.format_type(out_params[0].type, True)
+        else:
+            return '[' + ', '.join(('%s: %s' % (p.argname, self.format_type(p.type, True)))
+                                   for p in out_params) + ']'
+
+    def field_is_writable(self, node):
+        if isinstance(node, ast.Field):
+            if node.type is None:
+                return False
+            if node.private:
+                return False
+            if isinstance(node.parent, ast.Union):
+                return False
+            if node.type.target_fundamental not in \
+               (None, 'none', 'gpointer', 'utf8', 'filename', 'va_list'):
+                return True
+
+            resolved = self._transformer.lookup_typenode(node.type)
+            if resolved:
+                if isinstance(resolved, ast.Compound) and node.type.ctype[-1] != '*':
+                    return self._struct_is_simple(resolved)
+                elif isinstance(resolved, (ast.Enum, ast.Bitfield)):
+                    return True
+            return False
+        else:
+            return True
+
+    def _struct_is_simple(self, node):
+        if node.disguised or len(node.fields) == 0:
+            return False
+
+        for f in node.fields:
+            if not self.field_is_writable(f):
+                return False
+        return True
+
+    def format_gboxed_constructor(self, node):
+        if node.namespace.name == 'GLib' and node.name == 'Variant':
+            return 'signature: String, value: Any'
+
+        zero_args_constructor = node.gjs_zero_args_constructor
+        default_constructor = node.gjs_default_constructor
+
+        can_allocate = zero_args_constructor is not None
+        if not can_allocate and isinstance(node, ast.Record):
+            can_allocate = self._struct_is_simple(node)
+
+        # Small lie: if can_allocate is False, and
+        # default_constructor is None, then you cannot
+        # construct the boxed in any way. But let's
+        # pretend you can with the regular constructor
+        if can_allocate or default_constructor is None:
+            if isinstance(node, ast.Compound):
+                fields = filter(self.field_is_writable, node.fields)
+                out = ''
+                if len(fields) > 0:
+                    out += "{\n"
+                    for f in fields:
+                        out += "    <link xref='%s.%s-%s'>%s</link>: value\n" % \
+                               (node.namespace.name, node.name, f.name, f.name)
+                    out += "}"
+                return out
+            else:
+                return ''
+        else:
+            construct_params = self.get_in_parameters(default_constructor)
+            return ', '.join(('%s: %s' % (p.argname, self.format_type(p.type)))
+                             for p in construct_params)
 
 LANGUAGES = {
     "c": DocFormatterC,
@@ -616,10 +920,16 @@ class DocWriter(object):
     def _walk_node(self, output, node, chain):
         if isinstance(node, ast.Function) and node.moved_to is not None:
             return False
-        if getattr(node, 'disguised', False):
-            return False
         if self._formatter.should_render_node(node):
             self._render_node(node, chain, output)
+
+            # hack: fields are not Nodes in the ast, so we don't
+            # see them in the visit. Handle them manually here
+            if isinstance(node, (ast.Compound, ast.Class)):
+                chain.append(node)
+                for f in node.fields:
+                    self._walk_node(output, f, chain)
+                chain.pop()
             return True
         return False
 
@@ -638,7 +948,8 @@ class DocWriter(object):
                                  node=node,
                                  page_id=page_id,
                                  page_kind=page_kind,
-                                 formatter=self._formatter)
+                                 formatter=self._formatter,
+                                 ast=ast)
 
         output_file_name = os.path.join(os.path.abspath(output),
                                         page_id + '.page')
index b415dd1..ce11961 100644 (file)
@@ -103,6 +103,7 @@ class DumpCompiler(object):
         # We have to use the current directory to work around Unix
         # sysadmins who mount /tmp noexec
         tmpdir = tempfile.mkdtemp('', 'tmp-introspect', dir=os.getcwd())
+        os.mkdir(os.path.join(tmpdir, '.libs'))
 
         tpl_args = {}
         if self._uninst_srcdir is not None:
@@ -159,7 +160,7 @@ class DumpCompiler(object):
             o_path = self._generate_tempfile(tmpdir, '.o')
 
         if os.name == 'nt':
-            ext = 'exe'
+            ext = '.exe'
         else:
             ext = ''
 
@@ -262,7 +263,7 @@ class DumpCompiler(object):
             args.extend(['-o', output])
         if libtool:
             if os.name == 'nt':
-                args.append('-export-all-symbols')
+                args.append('-Wl,--export-all-symbols')
             else:
                 args.append('-export-dynamic')
 
@@ -295,10 +296,26 @@ class DumpCompiler(object):
             print "g-ir-scanner: link: %s" % (
                 subprocess.list2cmdline(args), )
             sys.stdout.flush()
+        msys = os.environ.get('MSYSTEM', None)
+        if msys:
+            shell = os.environ.get('SHELL', 'sh.exe')
+            # Create a temporary script file that
+            # runs the command we want
+            tf, tf_name = tempfile.mkstemp()
+            f = os.fdopen(tf, 'wb')
+            shellcontents = ' '.join([x.replace('\\', '/') for x in args])
+            fcontents = '#!/bin/sh\nunset PWD\n{}\n'.format(shellcontents)
+            f.write(fcontents)
+            f.close()
+            shell = utils.which(shell)
+            args = [shell, tf_name.replace('\\', '/')]
         try:
             subprocess.check_call(args)
         except subprocess.CalledProcessError as e:
             raise LinkerError(e)
+        finally:
+            if msys:
+                os.remove(tf_name)
 
     def _add_link_internal_args(self, args, libtool):
         # An "internal" link is where the library to be introspected
index 25e9035..cac166d 100644 (file)
@@ -585,5 +585,6 @@ class GIRParser(object):
             members.append(member)
         for func_node in self._find_children(node, _corens('function')):
             func = self._parse_function_common(func_node, ast.Function)
+            func.parent = obj
             obj.static_methods.append(func)
         self._namespace.append(obj)
index c107bee..d9811cf 100644 (file)
@@ -1023,15 +1023,35 @@ method or constructor of some type."""
         uscored_prefix = self._get_uscored_prefix(func, subsymbol)
         target = self._transformer.lookup_typenode(func.parameters[0].type)
 
-        func.instance_parameter = func.parameters.pop(0)
-        self._namespace.float(func)
-
-        if not func.is_method:
+        if not func.is_method and not subsymbol.startswith(uscored_prefix + '_'):
+            # Uh oh! This function starts with uscored_prefix, but not
+            # uscored_prefix + '_', so if we split, we're splitting on something
+            # which is not _
+            # Examples of this are g_resources_register() (splits as
+            # g_resource + _register) and gdk_events_get_angle() (splits as
+            # gdk_event + _get_angle).
+            # As the C name suggests, these are not methods, but for backward
+            # compatibility reasons we need to create a method with the old
+            # name, and a moved-to annotation pointing to the new variant.
+
+            newfunc = func.clone()
+            newfunc.moved_to = func.name
+            newfunc.instance_parameter = newfunc.parameters.pop(0)
             subsym_idx = func.symbol.find(subsymbol)
-            func.name = func.symbol[(subsym_idx + len(uscored_prefix) + 1):]
-            func.is_method = True
+            newfunc.name = func.symbol[(subsym_idx + len(uscored_prefix) + 1):]
+            newfunc.is_method = True
+
+            target.methods.append(newfunc)
+        else:
+            func.instance_parameter = func.parameters.pop(0)
+            self._namespace.float(func)
 
-        target.methods.append(func)
+            if not func.is_method:
+                subsym_idx = func.symbol.find(subsymbol)
+                func.name = func.symbol[(subsym_idx + len(uscored_prefix) + 1):]
+                func.is_method = True
+
+            target.methods.append(func)
 
     def _get_uscored_prefix(self, func, subsymbol):
         # Here we check both the c_symbol_prefix and (if that fails),
@@ -1225,16 +1245,24 @@ method or constructor of some type."""
                 field.writable = False
 
         for field in class_struct.fields:
-            if not isinstance(field.anonymous_node, ast.Callback):
+            callback = None
+
+            if isinstance(field.anonymous_node, ast.Callback):
+                callback = field.anonymous_node
+            elif field.type is not None:
+                callback = self._transformer.lookup_typenode(field.type)
+                if not isinstance(callback, ast.Callback):
+                    continue
+            else:
                 continue
-            callback = field.anonymous_node
+
             # Check the first parameter is the object
             if len(callback.parameters) == 0:
                 continue
             firstparam_type = callback.parameters[0].type
             if firstparam_type != node_type:
                 continue
-            vfunc = ast.VFunction.from_callback(callback)
+            vfunc = ast.VFunction.from_callback(field.name, callback)
             vfunc.instance_parameter = callback.parameters[0]
             vfunc.inherit_file_positions(callback)
 
index 42f85ea..941154d 100644 (file)
@@ -31,6 +31,7 @@
 %{
 #include <ctype.h>
 #include <stdio.h>
+#include <string.h>
 #ifndef _WIN32
 #include <limits.h>
 #endif
@@ -152,6 +153,7 @@ stringtext                          ([^\\\"])|(\\.)
 
 "__asm"[\t\f\v\r ]+"volatile"                  { if (!parse_ignored_macro()) REJECT; }
 "__asm__"[\t\f\v\r ]+"volatile"                { if (!parse_ignored_macro()) REJECT; }
+"__asm__"[\t\f\v\r ]+"__volatile__"    { if (!parse_ignored_macro()) REJECT; }
 "__asm"                                { if (!parse_ignored_macro()) REJECT; }
 "__asm__"                              { if (!parse_ignored_macro()) REJECT; }
 "__attribute__"                        { if (!parse_ignored_macro()) REJECT; }
@@ -161,8 +163,10 @@ stringtext                         ([^\\\"])|(\\.)
 "__inline__"                            { return INLINE; }
 "__inline"                             { return INLINE; }
 "__nonnull"                            { if (!parse_ignored_macro()) REJECT; }
+"_Noreturn"                            { /* Ignore */ }
 "__signed__"                           { return SIGNED; }
 "__restrict"                           { return RESTRICT; }
+"__restrict__"                         { return RESTRICT; }
 "__typeof"                             { if (!parse_ignored_macro()) REJECT; }
 "__volatile"                           { return VOLATILE; }
 "__volatile__"                         { return VOLATILE; }
index 21fcafd..ec974fa 100644 (file)
@@ -24,7 +24,7 @@ import platform
 import re
 import subprocess
 
-from .utils import get_libtool_command, extract_libtool_shlib
+from .utils import get_libtool_command, extract_libtool_shlib, which
 
 
 # For .la files, the situation is easy.
@@ -89,10 +89,93 @@ def _resolve_non_libtool(options, binary, libraries):
             binary.args[0] = old_argdir
 
     if os.name == 'nt':
+        args = []
+        compiler_cmd = os.environ.get('CC', 'cc')
+        libsearch = []
+
+        # When we are using Visual C++...
+        if 'cl.exe' in compiler_cmd or 'cl' in compiler_cmd:
+            # The search path of the .lib's on Visual C++
+            # is dependent on the LIB environmental variable,
+            # so just query for that
+            is_msvc = True
+            libpath = os.environ.get('LIB')
+            libsearch = libpath.split(';')
+
+            # Use the dumpbin utility that's included in
+            # every Visual C++ installation to find out which
+            # DLL the library gets linked to
+            args.append('dumpbin.exe')
+            args.append('-symbols')
+
+        # When we are not using Visual C++ (i.e. we are using GCC)...
+        else:
+            is_msvc = False
+            libtool = get_libtool_command(options)
+            if libtool:
+                args.append(which(os.environ.get('SHELL', 'sh.exe')))
+                args.extend(libtool)
+                args.append('--mode=execute')
+            # FIXME: it could have prefix (i686-w64-mingw32-dlltool.exe)
+            args.extend(['dlltool.exe', '--identify'])
+            proc = subprocess.Popen([compiler_cmd, '-print-search-dirs'],
+                                    stdout=subprocess.PIPE)
+            o, e = proc.communicate()
+            for line in o.splitlines():
+                if line.startswith('libraries: '):
+                    libsearch = line[len('libraries: '):].split(';')
+
         shlibs = []
+        not_resolved = []
+        for lib in libraries:
+            found = False
+            candidates = [
+                'lib%s.dll.a' % lib,
+                'lib%s.a' % lib,
+                '%s.dll.a' % lib,
+                '%s.a' % lib,
+                '%s.lib' % lib,
+            ]
+            for l in libsearch:
+                if found:
+                    break
+                if l.startswith('='):
+                    l = l[1:]
+                for c in candidates:
+                    if found:
+                        break
+                    implib = os.path.join(l, c)
+                    if os.path.exists(implib):
+                        proc = subprocess.Popen(args + [implib],
+                                                stdout=subprocess.PIPE)
+                        o, e = proc.communicate()
+                        for line in o.splitlines():
+                            if is_msvc:
+                                # On Visual Studio, dumpbin -symbols something.lib gives the
+                                # filename of DLL without the '.dll' extension that something.lib
+                                # links to, in the line that contains
+                                # __IMPORT_DESCRIPTOR_<dll_filename_that_something.lib_links_to>
+
+                                if '__IMPORT_DESCRIPTOR_' in line:
+                                    line_tokens = line.split()
+                                    for item in line_tokens:
+                                        if item.startswith('__IMPORT_DESCRIPTOR_'):
+                                            shlibs.append(item[20:] + '.dll')
+                                            found = True
+                                            break
+                                if found:
+                                    break
+                            else:
+                                shlibs.append(line)
+                                found = True
+                                break
+            if not found:
+                not_resolved.append(lib)
+        if len(not_resolved) > 0:
+            raise SystemExit(
+                "ERROR: can't resolve libraries to shared libraries: " +
+                ", ".join(not_resolved))
 
-        for library in libraries:
-            shlibs.append(library + '.dll')
     else:
         args = []
         libtool = get_libtool_command(options)
index abd1a26..537109c 100644 (file)
@@ -132,7 +132,7 @@ def extract_libtool(la_file):
     # FIXME: This hackish, but I'm not sure how to do this
     #        in a way which is compatible with both libtool 2.2
     #        and pre-2.2. Johan 2008-10-21
-    libname = libname.replace('.libs/.libs', '.libs')
+    libname = libname.replace('.libs/.libs', '.libs').replace('.libs\\.libs', '.libs')
     return libname
 
 
@@ -182,3 +182,30 @@ def cflag_real_include_path(cflag):
         return cflag
 
     return "-I" + os.path.realpath(cflag[2:])
+
+
+def which(program):
+    def is_exe(fpath):
+        return os.path.isfile(fpath) and os.access(fpath, os.X_OK)
+
+    def is_nt_exe(fpath):
+        return not fpath.lower().endswith('.exe') and \
+            os.path.isfile(fpath + '.exe') and \
+            os.access(fpath + '.exe', os.X_OK)
+
+    fpath, fname = os.path.split(program)
+    if fpath:
+        if is_exe(program):
+            return program
+        if os.name == 'nt' and is_nt_exe(program):
+            return program + '.exe'
+    else:
+        for path in os.environ["PATH"].split(os.pathsep):
+            path = path.strip('"')
+            exe_file = os.path.join(path, program)
+            if is_exe(exe_file):
+                return exe_file
+            if os.name == 'nt' and is_nt_exe(exe_file):
+                return exe_file + '.exe'
+
+    return None
index f355c61..a765e61 100644 (file)
@@ -21,4 +21,4 @@ Libs.private:
 
 Name: gobject-introspection
 Description: GObject Introspection
-Version: 1.39.90
+Version: 1.40.0
index 9613fec..a08b5d2 100644 (file)
@@ -7,8 +7,8 @@ datadir=@datadir@
 includedir=@includedir@
 
 g_ir_scanner=${bindir}/g-ir-scanner
-g_ir_compiler=${bindir}/g-ir-compiler
-g_ir_generate=${bindir}/g-ir-generate
+g_ir_compiler=${bindir}/g-ir-compiler@EXEEXT@
+g_ir_generate=${bindir}/g-ir-generate@EXEEXT@
 gidatadir=${datadir}/gobject-introspection-1.0
 girdir=${datadir}/gir-1.0
 typelibdir=${libdir}/girepository-1.0
index 77fa506..baf31b2 100644 (file)
@@ -20,4 +20,4 @@ Libs.private:
 
 Name: gobject-introspection
 Description: GObject Introspection
-Version: 1.39.90
+Version: 1.40.0
index a6d6cc6..d214d22 100644 (file)
@@ -7,8 +7,8 @@ datadir=@datadir@
 includedir=@includedir@
 
 g_ir_scanner=${bindir}/g-ir-scanner
-g_ir_compiler=${bindir}/g-ir-compiler
-g_ir_generate=${bindir}/g-ir-generate
+g_ir_compiler=${bindir}/g-ir-compiler@EXEEXT@
+g_ir_generate=${bindir}/g-ir-generate@EXEEXT@
 girdir=${datadir}/gir-1.0
 typelibdir=${libdir}/girepository-1.0
 
index 19e11cd..1b2b041 100644 (file)
@@ -360,8 +360,8 @@ static void yy_fatal_error (yyconst char msg[]  );
        *yy_cp = '\0'; \
        (yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 144
-#define YY_END_OF_BUFFER 145
+#define YY_NUM_RULES 147
+#define YY_END_OF_BUFFER 148
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -369,110 +369,112 @@ struct yy_trans_info
        flex_int32_t yy_verify;
        flex_int32_t yy_nxt;
        };
-static yyconst flex_int16_t yy_acclist[894] =
+static yyconst flex_int16_t yy_acclist[917] =
     {   0,
-      145,  143,  144,    3,  143,  144,    1,  144,   44,  143,
-      144,  143,  144,   19,  143,  144,   39,  143,  144,   41,
-      143,  144,  143,  144,   28,  143,  144,   29,  143,  144,
-       37,  143,  144,   35,  143,  144,   68,  143,  144,   36,
-      143,  144,   34,  143,  144,   38,  143,  144,  136,  143,
-      144,  136,  143,  144,   31,  143,  144,   30,  143,  144,
-       46,  143,  144,   45,  143,  144,   47,  143,  144,   33,
-      143,  144,   93,  133,  143,  144,   93,  133,  143,  144,
-       93,  133,  143,  144,   93,  133,  143,  144,   93,  133,
-      143,  144,   24,  143,  144,  143,  144,   26,  143,  144,
-
-       40,  143,  144,   93,  133,  143,  144,   93,  133,  143,
-      144,   93,  133,  143,  144,   93,  133,  143,  144,   93,
-      133,  143,  144,   93,  133,  143,  144,   93,  133,  143,
-      144,   93,  133,  143,  144,   93,  133,  143,  144,   93,
-      133,  143,  144,   93,  133,  143,  144,   93,  133,  143,
-      144,   93,  133,  143,  144,   93,  133,  143,  144,   93,
-      133,  143,  144,   93,  133,  143,  144,   20,  143,  144,
-       42,  143,  144,   22,  143,  144,   43,  143,  144,    3,
-        1,   61,  141,   52,   23,   64,   54,  139,   50,   66,
-       48,   67,   49,   69,  137,    4,    6,   51,  137,  135,
-
-      136,  136,  136,  136,   27,   21,   25,   56,   62,   60,
-       63,   57,   93,  133,   93,  133,   93,  133,   93,  133,
-        2,   53,   93,  133,   93,  133,   93,  133,   93,  133,
-       93,  133,   93,  133,   93,  133,   93,  133,   93,  133,
-       93,  102,  133,   93,  133,   93,  133,   93,  133,   93,
-      133,   93,  133,   93,  133,   93,  133,   93,  110,  133,
-       93,  133,   93,  133,   93,  133,   93,  133,   93,  133,
-       93,  133,   93,  133,   93,  133,   93,  133,   93,  133,
-       93,  133,   93,  133,   55,   65,   32,  137,    6,  135,
-      136,  135,  136,  138,  136,  136,  136,  134,   58,   59,
-
-       93,  133,   93,  133,  142,  140,   93,  133,   93,  133,
-       93,  133,   93,  133,   93,  133,   93,  133,   93,  133,
-       93,  133,   93,  133,   93,  133,   93,  133,   93,  133,
-       93,   94,  133,   93,  133,   93,  133,   93,  133,   93,
-      133,   93,  133,   93,  133,   93,  133,   93,  133,   93,
-      133,   93,  133,   93,  133,   93,  133,   93,  108,  133,
-       93,  133,   93,  133,   93,  112,  133,   93,  133,   93,
-      133,   93,  133,   93,  133,   93,  133,   93,  133,   93,
-      133,   93,  133,   93,  133,   93,  133,   93,  133,   93,
-      133,   93,  133,   93,  133,   93,  133,   93,  133,   93,
-
-      133,  137,  135,  136,  135,  136,  135,  136,  138,  136,
-      134,  134,   93,  133,   93,  133,   93,  133,   89,   93,
-      133,   93,  133,   93,  133,   93,  133,   93,  133,   93,
-      133,   93,  133,   93,  133,   93,  133,   93,  133,   93,
-      133,   93,  133,   93,  133,   93,   95,  133,   93,  133,
-       93,   97,  133,   93,   98,  133,   93,  133,   93,  133,
-       93,  133,   93,  133,   93,  104,  133,   93,  105,  133,
-       93,  133,   93,  133,   93,  133,   93,  109,  133,   93,
-      133,   93,  117,  133,   93,  133,   93,  133,   93,  133,
-       93,  133,   93,  133,   93,  133,   93,  133,   93,  133,
-
-       93,  133,   91,   93,  133,   93,  133,   93,  133,   93,
-      133,   93,  130,  133,   93,  133,   93,  133,   18,   13,
-      135,  136,  134,  134,  134,   90,   93,  133,   93,  133,
-       93,  133,   86,   93,  133,   72,   93,  133,   93,  133,
-       93,  133,   93,  133,   93,  133,   93,  133,   93,  133,
-       93,  133,   93,  133,   93,  133,   93,  133,   93,  133,
-       93,   96,  133,   93,   99,  133,   93,  133,   93,  133,
-       93,  133,   93,  133,   92,   93,  133,   93,  107,  133,
-       93,  133,   93,  133,   93,  133,   93,  133,   93,  121,
-      133,   93,  133,   93,  133,   93,  133,   93,  133,   93,
-
-      133,   93,  133,   93,  128,  133,   93,  133,   93,  133,
-       93,  132,  133,   15,  134,   93,  133,   93,  133,   93,
-      133,   93,  133,   93,  133,   93,  133,   93,  133,   93,
-      133,   93,  133,   93,  133,   93,  133,   93,  133,   93,
-      133,   93,  133,   93,  133,   93,  133,   93,  103,  133,
-       93,  106,  133,   93,  111,  133,   93,  133,   93,  133,
-       93,  120,  133,   93,  122,  133,   93,  123,  133,   93,
-      124,  133,   93,  125,  133,   93,  126,  133,   93,  133,
-       93,  133,   93,  133,   14,   16,    5,   93,  133,   93,
-      133,   73,   93,  133,   93,  133,   76,   93,  133,   93,
-
-      133,   93,  133,   93,  133,   93,  133,   93,  133,   93,
-      133,   93,  133,   93,  133,   93,  133,   93,  133,   93,
-      101,  133,   93,  133,   93,  133,   93,  127,  133,   93,
-      133,   93,  133,   12,   93,  133,   93,  133,   93,  133,
-       93,  133,   79,   93,  133,   93,  116,  133,   93,  133,
-       93,  133,   93,  133,   83,   93,  133,   93,  133,   93,
-      133,   93,  100,  133,   93,  118,  133,   93,  119,  133,
-       93,  129,  133,   93,  131,  133,    8,   11,   17,   93,
-      133,   93,  133,   93,  133,   93,  133,   93,  133,   93,
-      133,   80,   93,  133,   93,  133,   93,  133,   93,  115,
-
-      133,   93,  133,    7,    8,   93,  133,   93,  133,   93,
-      133,   93,  133,   78,   93,  133,   93,  114,  133,   82,
-       93,  133,   81,   93,  133,   93,  133,   84,   93,  133,
-       93,  133,   93,  133,   75,   93,  133,   93,  133,   93,
-      113,  133,   93,  133,   93,  133,   93,  133,   93,  133,
-       93,  133,   85,   93,  133,   93,  133,   93,  133,   74,
-       93,  133,   77,   93,  133,   93,  133,   93,  133,   70,
-       93,  133,   93,  133,   93,  133,   93,  133,   71,   87,
-       93,  133,   93,  133,   88,   93,  133,    9,    9,   12,
-       10,   10,   11
-
+      148,  146,  147,    3,  146,  147,    1,  147,   44,  146,
+      147,  146,  147,   19,  146,  147,   39,  146,  147,   41,
+      146,  147,  146,  147,   28,  146,  147,   29,  146,  147,
+       37,  146,  147,   35,  146,  147,   68,  146,  147,   36,
+      146,  147,   34,  146,  147,   38,  146,  147,  139,  146,
+      147,  139,  146,  147,   31,  146,  147,   30,  146,  147,
+       46,  146,  147,   45,  146,  147,   47,  146,  147,   33,
+      146,  147,   96,  136,  146,  147,   96,  136,  146,  147,
+       96,  136,  146,  147,   96,  136,  146,  147,   96,  136,
+      146,  147,   24,  146,  147,  146,  147,   26,  146,  147,
+
+       40,  146,  147,   96,  136,  146,  147,   96,  136,  146,
+      147,   96,  136,  146,  147,   96,  136,  146,  147,   96,
+      136,  146,  147,   96,  136,  146,  147,   96,  136,  146,
+      147,   96,  136,  146,  147,   96,  136,  146,  147,   96,
+      136,  146,  147,   96,  136,  146,  147,   96,  136,  146,
+      147,   96,  136,  146,  147,   96,  136,  146,  147,   96,
+      136,  146,  147,   96,  136,  146,  147,   20,  146,  147,
+       42,  146,  147,   22,  146,  147,   43,  146,  147,    3,
+        1,   61,  144,   52,   23,   64,   54,  142,   50,   66,
+       48,   67,   49,   69,  140,    4,    6,   51,  140,  138,
+
+      139,  139,  139,  139,   27,   21,   25,   56,   62,   60,
+       63,   57,   96,  136,   96,  136,   96,  136,   96,  136,
+        2,   53,   96,  136,   96,  136,   96,  136,   96,  136,
+       96,  136,   96,  136,   96,  136,   96,  136,   96,  136,
+       96,  136,   96,  105,  136,   96,  136,   96,  136,   96,
+      136,   96,  136,   96,  136,   96,  136,   96,  136,   96,
+      113,  136,   96,  136,   96,  136,   96,  136,   96,  136,
+       96,  136,   96,  136,   96,  136,   96,  136,   96,  136,
+       96,  136,   96,  136,   96,  136,   55,   65,   32,  140,
+        6,  138,  139,  138,  139,  141,  139,  139,  139,  137,
+
+       58,   59,   96,  136,   96,  136,  145,  143,   96,  136,
+       96,  136,   96,  136,   96,  136,   96,  136,   96,  136,
+       96,  136,   96,  136,   96,  136,   96,  136,   96,  136,
+       96,  136,   96,  136,   96,   97,  136,   96,  136,   96,
+      136,   96,  136,   96,  136,   96,  136,   96,  136,   96,
+      136,   96,  136,   96,  136,   96,  136,   96,  136,   96,
+      136,   96,  111,  136,   96,  136,   96,  136,   96,  115,
+      136,   96,  136,   96,  136,   96,  136,   96,  136,   96,
+      136,   96,  136,   96,  136,   96,  136,   96,  136,   96,
+      136,   96,  136,   96,  136,   96,  136,   96,  136,   96,
+
+      136,   96,  136,   96,  136,  140,  138,  139,  138,  139,
+      138,  139,  141,  139,  137,  137,   96,  136,   96,  136,
+       96,  136,   92,   96,  136,   96,  136,   96,  136,   96,
+      136,   96,  136,   96,  136,   96,  136,   96,  136,   96,
+      136,   96,  136,   96,  136,   96,  136,   96,  136,   96,
+      136,   96,   98,  136,   96,  136,   96,  100,  136,   96,
+      101,  136,   96,  136,   96,  136,   96,  136,   96,  136,
+       96,  107,  136,   96,  108,  136,   96,  136,   96,  136,
+       96,  136,   96,  112,  136,   96,  136,   96,  120,  136,
+       96,  136,   96,  136,   96,  136,   96,  136,   96,  136,
+
+       96,  136,   96,  136,   96,  136,   96,  136,   94,   96,
+      136,   96,  136,   96,  136,   96,  136,   96,  133,  136,
+       96,  136,   96,  136,   18,   13,  138,  139,  137,  137,
+      137,   93,   96,  136,   96,  136,   96,  136,   89,   96,
+      136,   96,  136,   73,   96,  136,   96,  136,   96,  136,
+       96,  136,   96,  136,   96,  136,   96,  136,   96,  136,
+       96,  136,   96,  136,   96,  136,   96,  136,   96,   99,
+      136,   96,  102,  136,   96,  136,   96,  136,   96,  136,
+       96,  136,   95,   96,  136,   96,  110,  136,   96,  136,
+       96,  136,   96,  136,   96,  136,   96,  124,  136,   96,
+
+      136,   96,  136,   96,  136,   96,  136,   96,  136,   96,
+      136,   96,  131,  136,   96,  136,   96,  136,   96,  135,
+      136,   15,  137,   96,  136,   96,  136,   96,  136,   96,
+      136,   96,  136,   96,  136,   96,  136,   96,  136,   96,
+      136,   96,  136,   96,  136,   96,  136,   96,  136,   96,
+      136,   96,  136,   96,  136,   96,  136,   96,  106,  136,
+       96,  109,  136,   96,  114,  136,   96,  136,   96,  136,
+       96,  123,  136,   96,  125,  136,   96,  126,  136,   96,
+      127,  136,   96,  128,  136,   96,  129,  136,   96,  136,
+       96,  136,   96,  136,   14,   16,    5,   96,  136,   96,
+
+      136,   96,  136,   74,   96,  136,   96,  136,   77,   96,
+      136,   96,  136,   96,  136,   96,  136,   96,  136,   96,
+      136,   96,  136,   96,  136,   96,  136,   96,  136,   96,
+      136,   96,  104,  136,   96,  136,   96,  136,   96,  130,
+      136,   96,  136,   96,  136,   12,   96,  136,   96,  136,
+       96,  136,   96,  136,   96,  136,   80,   96,  136,   96,
+      119,  136,   96,  136,   96,  136,   96,  136,   86,   96,
+      136,   96,  136,   96,  136,   96,  103,  136,   96,  121,
+      136,   96,  122,  136,   96,  132,  136,   96,  134,  136,
+        8,   11,   17,   96,  136,   96,  136,   82,   96,  136,
+
+       96,  136,   96,  136,   96,  136,   96,  136,   81,   96,
+      136,   96,  136,   96,  136,   96,  118,  136,   96,  136,
+        7,    8,   96,  136,   96,  136,   96,  136,   96,  136,
+       79,   96,  136,   96,  117,  136,   84,   96,  136,   83,
+       96,  136,   96,  136,   87,   96,  136,   96,  136,   96,
+      136,   76,   96,  136,   96,  136,   96,  136,   96,  116,
+      136,   96,  136,   96,  136,   96,  136,   96,  136,   96,
+      136,   85,   96,  136,   88,   96,  136,   96,  136,   96,
+      136,   75,   96,  136,   78,   96,  136,   96,  136,   96,
+      136,   70,   96,  136,   96,  136,   96,  136,   96,  136,
+
+       71,   90,   96,  136,   96,  136,   91,   96,  136,   72,
+        9,    9,   12,   10,   10,   11
     } ;
 
-static yyconst flex_int16_t yy_accept[577] =
+static yyconst flex_int16_t yy_accept[599] =
     {   0,
         1,    1,    1,    2,    4,    7,    9,   12,   14,   17,
        20,   23,   25,   28,   31,   34,   37,   40,   43,   46,
@@ -486,57 +488,60 @@ static yyconst flex_int16_t yy_accept[577] =
       203,  204,  205,  205,  206,  207,  208,  209,  210,  211,
 
       212,  213,  215,  217,  219,  219,  219,  221,  222,  223,
-      225,  227,  229,  231,  233,  235,  237,  239,  241,  244,
-      246,  248,  250,  252,  254,  256,  258,  261,  263,  265,
+      225,  227,  229,  231,  233,  235,  237,  239,  241,  243,
+      246,  248,  250,  252,  254,  256,  258,  260,  263,  265,
       267,  269,  271,  273,  275,  277,  279,  281,  283,  285,
-      286,  287,  287,  287,  287,  287,  287,  287,  288,  288,
-      289,  289,  289,  290,  292,  294,  294,  295,  296,  297,
-      298,  299,  300,  301,  303,  305,  305,  306,  306,  306,
-      307,  307,  309,  311,  313,  315,  317,  319,  321,  323,
-      325,  327,  329,  331,  334,  336,  338,  340,  342,  344,
-      346,  348,  350,  352,  354,  356,  358,  361,  363,  365,
-
-      368,  370,  372,  374,  376,  378,  380,  382,  384,  386,
-      388,  390,  392,  394,  396,  398,  400,  402,  402,  402,
-      402,  402,  402,  402,  402,  402,  402,  402,  403,  403,
-      405,  407,  409,  410,  411,  412,  413,  415,  417,  419,
-      422,  424,  426,  428,  430,  432,  434,  436,  438,  440,
-      442,  444,  446,  449,  451,  454,  457,  459,  461,  463,
-      465,  468,  471,  473,  475,  477,  480,  482,  485,  487,
-      489,  491,  493,  495,  497,  499,  501,  503,  506,  508,
-      510,  512,  515,  517,  519,  519,  520,  520,  520,  520,
-      520,  520,  521,  521,  521,  521,  521,  523,  524,  525,
-
-      526,  529,  531,  533,  536,  539,  541,  543,  545,  547,
-      549,  551,  553,  555,  557,  559,  561,  564,  567,  569,
-      571,  573,  575,  578,  581,  583,  585,  587,  589,  592,
-      594,  596,  598,  600,  602,  604,  607,  609,  611,  614,
-      614,  614,  614,  615,  615,  615,  615,  615,  615,  615,
-      616,  618,  620,  620,  622,  624,  626,  628,  630,  632,
-      634,  636,  638,  640,  642,  644,  646,  648,  651,  654,
-      657,  659,  661,  664,  667,  670,  673,  676,  679,  681,
-      683,  685,  685,  685,  686,  686,  687,  687,  687,  687,
-      687,  688,  690,  692,  692,  695,  697,  700,  702,  704,
-
-      706,  708,  710,  712,  714,  716,  718,  720,  723,  725,
-      727,  730,  732,  734,  734,  734,  734,  734,  735,  735,
-      735,  735,  735,  737,  739,  739,  739,  741,  743,  746,
-      749,  751,  753,  755,  758,  760,  762,  765,  768,  771,
-      774,  777,  778,  778,  778,  778,  778,  778,  779,  779,
-      779,  780,  782,  784,  784,  784,  786,  788,  790,  792,
-      795,  797,  799,  802,  804,  805,  806,  806,  806,  806,
-      806,  808,  810,  810,  810,  812,  814,  817,  820,  823,
-      826,  828,  831,  831,  831,  831,  831,  833,  835,  835,
-      835,  838,  840,  843,  845,  845,  845,  845,  845,  847,
-
-      849,  849,  849,  851,  853,  856,  856,  856,  856,  856,
-      858,  860,  860,  860,  863,  866,  866,  866,  866,  866,
-      868,  870,  871,  871,  871,  871,  871,  871,  873,  875,
-      875,  875,  875,  875,  875,  877,  879,  880,  880,  880,
-      880,  880,  883,  885,  885,  885,  885,  885,  888,  888,
-      888,  888,  888,  888,  888,  888,  888,  888,  888,  888,
-      888,  888,  888,  889,  889,  889,  891,  891,  891,  891,
-      891,  892,  892,  892,  894,  894
+      287,  288,  289,  289,  289,  289,  289,  289,  289,  290,
+      290,  291,  291,  291,  292,  294,  296,  296,  297,  298,
+      299,  300,  301,  302,  303,  305,  307,  307,  308,  308,
+      308,  309,  309,  311,  313,  315,  317,  319,  321,  323,
+      325,  327,  329,  331,  333,  335,  338,  340,  342,  344,
+      346,  348,  350,  352,  354,  356,  358,  360,  362,  365,
+
+      367,  369,  372,  374,  376,  378,  380,  382,  384,  386,
+      388,  390,  392,  394,  396,  398,  400,  402,  404,  406,
+      406,  406,  406,  406,  406,  406,  406,  406,  406,  406,
+      407,  407,  409,  411,  413,  414,  415,  416,  417,  419,
+      421,  423,  426,  428,  430,  432,  434,  436,  438,  440,
+      442,  444,  446,  448,  450,  452,  455,  457,  460,  463,
+      465,  467,  469,  471,  474,  477,  479,  481,  483,  486,
+      488,  491,  493,  495,  497,  499,  501,  503,  505,  507,
+      509,  512,  514,  516,  518,  521,  523,  525,  525,  526,
+      526,  526,  526,  526,  526,  527,  527,  527,  527,  527,
+
+      529,  530,  531,  532,  535,  537,  539,  542,  544,  547,
+      549,  551,  553,  555,  557,  559,  561,  563,  565,  567,
+      569,  572,  575,  577,  579,  581,  583,  586,  589,  591,
+      593,  595,  597,  600,  602,  604,  606,  608,  610,  612,
+      615,  617,  619,  622,  622,  622,  622,  623,  623,  623,
+      623,  623,  623,  623,  624,  626,  628,  630,  630,  632,
+      634,  636,  638,  640,  642,  644,  646,  648,  650,  652,
+      654,  656,  658,  661,  664,  667,  669,  671,  674,  677,
+      680,  683,  686,  689,  691,  693,  695,  695,  695,  696,
+      696,  697,  697,  697,  697,  697,  698,  700,  702,  704,
+
+      704,  707,  709,  712,  714,  716,  718,  720,  722,  724,
+      726,  728,  730,  732,  735,  737,  739,  742,  744,  746,
+      746,  746,  746,  746,  747,  747,  747,  747,  747,  749,
+      751,  753,  753,  753,  755,  757,  760,  763,  765,  767,
+      769,  772,  774,  776,  779,  782,  785,  788,  791,  792,
+      792,  792,  792,  792,  792,  793,  793,  793,  794,  796,
+      798,  801,  801,  801,  801,  803,  805,  807,  809,  812,
+      814,  816,  819,  821,  822,  823,  823,  823,  823,  823,
+      825,  827,  827,  827,  827,  829,  831,  834,  837,  840,
+      843,  845,  848,  848,  848,  848,  848,  850,  852,  852,
+
+      852,  852,  855,  857,  859,  862,  864,  864,  864,  864,
+      864,  866,  868,  868,  868,  868,  870,  872,  875,  878,
+      878,  878,  878,  878,  880,  882,  882,  882,  882,  885,
+      888,  888,  888,  888,  888,  890,  892,  893,  893,  893,
+      893,  893,  893,  893,  895,  897,  897,  897,  897,  897,
+      897,  897,  899,  901,  901,  902,  902,  902,  902,  902,
+      905,  907,  907,  907,  907,  907,  907,  910,  910,  910,
+      910,  910,  910,  910,  910,  910,  910,  910,  911,  911,
+      911,  911,  911,  911,  911,  912,  912,  912,  914,  914,
+      914,  914,  914,  915,  915,  915,  917,  917
+
     } ;
 
 static yyconst flex_int32_t yy_ec[256] =
@@ -584,147 +589,151 @@ static yyconst flex_int32_t yy_meta[84] =
         1,    1,    1
     } ;
 
-static yyconst flex_int16_t yy_base[599] =
+static yyconst flex_int16_t yy_base[621] =
     {   0,
-        0,    0,  947,  948,   82,    0,  915,   78,   83,   58,
-       81,   81,  948,  948,  914,   78,  948,   79,   77,   94,
-      136,  196,  912,  948,   96,  912,   75,  948,    0,  908,
-      886,  107,  894,  948,  936,  948,  907,   80,   45,  866,
-       60,   62,   68,   72,  867,   71,  866,  874,  102,   66,
-      865,  863,  868,  948,   89,  948,  948,  144,    0,  948,
-      143,  948,  927,  167,  869,  101,  867,  856,  948,  948,
-      948,  948,  129,  948,  923,  948,  948,  948,  948,  948,
-      948,  907,  251,  150,    0,  948,    0,  134,    0,  226,
-      133,  158,    0,  948,  948,  948,  893,  948,  948,  948,
-
-      892,    0,  879,  881,  157,  160,  871,  948,  948,  850,
-      224,  851,  844,  856,  843,  858,  845,  851,  837,  838,
-      835,  835,  841,  837,  834,  831,    0,  131,  835,  153,
-      833,   89,  171,  837,  826,  829,  134,  139,  834,  948,
-      948,  280,  836,  164,  837,  250,  839,  948,  299,  948,
-      864,    0,    0,  195,  188,  307,  315,  183,  948,  192,
-      217,  948,  948,  846,  188,  256,  948,  889,  229,  948,
-      888,  852,  820,  100,  819,  810,  818,  816,  824,  819,
-      804,  817,  811,    0,  810,  822,  817,  805,  192,  819,
-      817,  813,  805,  811,  798,  813,    0,  799,  803,    0,
-
-      804,  801,  791,  789,  791,  793,  800,  786,  784,  784,
-      796,  795,  785,  789,  793,  795,  784,  846,  784,  786,
-      786,  781,  841,  783,  783,  779,  323,  339,  808,  219,
-      948,  244,  948,  948,  324,  308,  801,  794,  795,    0,
-      770,  768,  761,  765,  759,  213,  763,  758,  767,  758,
-      759,  760,    0,  760,    0,    0,  751,  759,  748,  755,
-        0,    0,  749,  759,  745,    0,  749,    0,  744,  744,
-      743,  740,  752,  742,  746,  751,  750,    0,  748,  738,
-      743,    0,  731,  743,  799,  948,  733,  795,  796,  737,
-      794,  948,  735,  735,  727,  366,  948,  303,  948,  313,
-
-        0,  745,  748,    0,  381,  720,  718,  729,  724,  766,
-      718,  712,  716,  723,  709,  725,    0,    0,  712,  713,
-      718,  709,    0,    0,  716,  702,  710,  705,    0,  713,
-      710,  712,  696,  705,  707,    0,  698,  701,    0,  704,
-      760,  759,  948,  758,  367,  699,  703,  744,  738,  948,
-      731,  707,  387,  699,  689,  679,  683,  682,  727,  674,
-      676,  686,  676,  723,  670,  668,  668,    0,    0,    0,
-      680,  681,    0,    0,    0,    0,    0,    0,  677,  677,
-      670,  730,  731,  948,  730,  948,  382,  391,  397,  727,
-      948,  707,  705,  660,  399,  671,    0,  655,  666,  699,
-
-      658,  659,  663,  660,  698,  655,  658,    0,  646,  643,
-        0,  656,  654,    0,  658,  709,  404,  948,  367,  406,
-      410,  708,  655,  685,  642,  412,  633,  642,  650,  649,
-      637,  644,  646,    0,  674,  633,    0,    0,    0,    0,
-        0,  686,  657,  385,  641,  692,  416,  948,  372,  691,
-      948,  657,  637,  635,  621,  616,  619,  632,  613,    0,
-      612,  629,  628,  622,  948,  669,  638,  392,  639,  407,
-      633,  641,  603,  609,  614,  605,    0,    0,    0,    0,
-      599,  616,  615,  394,  627,  421,  624,  622,  602,  609,
-      609,  608,    0,  607,  614,  310,  605,  417,  612,  614,
-
-      591,  583,  600,  599,    0,  617,  420,  605,  423,  603,
-      603,  589,  584,    0,    0,  613,  426,  610,  428,  611,
-      596,  948,  484,  505,  425,  493,  432,  459,  465,  438,
-      451,  429,  449,  430,  444,  446,  948,  447,  437,  440,
-      435,    0,  435,  435,  436,  430,  438,    0,  412,  439,
-      412,  440,  397,  441,  375,  442,  448,  452,  300,  445,
-      350,  312,  948,  264,  256,  948,  475,  486,  230,  226,
-      948,  118,   91,  948,  948,  500,  507,  514,  517,  524,
-      527,  533,  540,  546,  553,  560,  567,  574,  581,  588,
-      590,  597,  604,  608,  615,  622,  629,  636
-
+        0,    0,  969,  970,   82,    0,  937,   78,   83,   58,
+       81,   81,  970,  970,  936,   78,  970,   79,   77,   94,
+      136,  196,  934,  970,   96,  934,   75,  970,    0,  930,
+      908,  107,  916,  970,  958,  970,  929,   84,   43,  888,
+       60,   62,   68,   82,  889,   76,  888,  896,  102,   93,
+      887,  885,  890,  970,   89,  970,  970,  178,    0,  970,
+      125,  970,  949,  167,  891,   84,  889,  878,  970,  970,
+      970,  970,   83,  970,  945,  970,  970,  970,  970,  970,
+      970,  929,  251,  167,    0,  970,    0,  158,    0,  226,
+      162,  133,    0,  970,  970,  970,  915,  970,  970,  970,
+
+      914,    0,  901,  903,  148,  129,  893,  970,  970,  872,
+      871,  224,  872,  865,  877,  864,  879,  866,  872,  858,
+      859,  856,  856,  862,  858,  855,  852,    0,  160,  856,
+      165,  854,  105,  159,  858,  847,  850,   77,  140,  855,
+      970,  970,  280,  857,  131,  858,  250,  860,  970,  299,
+      970,  885,    0,    0,  217,  188,  307,  315,   72,  970,
+      197,  300,  970,  970,  867,  215,  235,  970,  910,  157,
+      970,  909,  873,  841,  838,  186,  839,  830,  838,  836,
+      844,  839,  824,  837,  831,    0,  830,  842,  837,  825,
+      195,  839,  837,  833,  825,  831,  818,  833,    0,  819,
+
+      823,    0,  824,  821,  811,  809,  811,  813,  820,  806,
+      804,  804,  816,  815,  805,  809,  813,  815,  804,  866,
+      804,  806,  806,  801,  861,  803,  803,  799,  362,  370,
+      828,  124,  970,  301,  970,  970,  303,  302,  821,  814,
+      815,    0,  790,  795,  787,  780,  784,  778,  213,  782,
+      777,  786,  777,  778,  779,    0,  779,    0,    0,  770,
+      778,  767,  774,    0,    0,  768,  778,  764,    0,  768,
+        0,  763,  763,  762,  759,  771,  761,  765,  770,  769,
+        0,  767,  757,  762,    0,  750,  762,  818,  970,  752,
+      814,  815,  756,  813,  970,  754,  754,  746,  345,  970,
+
+      195,  970,  305,    0,  764,  767,    0,  737,  351,  738,
+      736,  747,  742,  784,  736,  730,  734,  741,  727,  743,
+        0,    0,  730,  731,  736,  727,    0,    0,  734,  720,
+      728,  723,    0,  731,  728,  730,  714,  723,  725,    0,
+      716,  719,    0,  722,  778,  777,  970,  776,  308,  717,
+      721,  762,  756,  970,  749,  725,  698,  358,  716,  706,
+      696,  700,  699,  744,  691,  693,  703,  693,  740,  687,
+      685,  685,    0,    0,    0,  697,  698,    0,    0,    0,
+        0,    0,    0,  694,  694,  687,  747,  748,  970,  747,
+      970,  359,  370,  396,  744,  970,  724,  722,  675,  676,
+
+      398,  687,    0,  671,  682,  715,  674,  675,  679,  676,
+      714,  671,  674,    0,  662,  659,    0,  672,  670,    0,
+      674,  725,  402,  970,  226,  406,  413,  724,  671,  701,
+      656,  657,  415,  648,  657,  665,  664,  652,  659,  661,
+        0,  689,  648,    0,    0,    0,    0,    0,  701,  672,
+      407,  656,  707,  419,  970,  375,  706,  970,  672,  652,
+        0,  650,  650,  635,  630,  633,  646,  627,    0,  626,
+      643,  642,  636,  970,  683,  652,  396,  653,  409,  647,
+      655,  617,  614,  622,  627,  618,    0,    0,  630,    0,
+      611,  628,  627,  377,  639,  420,  636,  634,  614,  608,
+
+      620,  620,  619,  618,    0,  617,  624,  424,  615,  423,
+      622,  624,  601,  600,  592,  609,  608,    0,    0,  626,
+      431,  614,  425,  612,  612,  598,  601,  592,    0,    0,
+      621,  426,  618,  437,  619,  604,  970,  578,  584,  605,
+      432,  521,  441,  510,  498,  444,  444,  459,  436,  457,
+      438,  451,  454,  431,  970,  458,  439,  451,  440,    0,
+      445,  427,  440,  262,  447,  443,    0,  428,  424,  434,
+      423,  442,  410,  404,  445,  324,  447,  970,  449,  453,
+      315,  450,  362,  354,  970,  348,  312,  970,  461,  489,
+      290,  258,  970,  222,  209,  970,  970,  505,  512,  519,
+
+      522,  529,  532,  538,  545,  551,  558,  565,  572,  579,
+      586,  593,  595,  602,  609,  613,  620,  627,  634,  641
     } ;
 
-static yyconst flex_int16_t yy_def[599] =
+static yyconst flex_int16_t yy_def[621] =
     {   0,
-      575,    1,  575,  575,  575,  576,  575,  577,  575,  575,
-      575,  578,  575,  575,  575,  575,  575,  575,  575,  575,
-      575,  575,  575,  575,  575,  575,  575,  575,  579,  579,
-      579,  579,  579,  575,  575,  575,  575,  579,  579,  579,
-      579,  579,  579,  579,  579,  579,  579,  579,  579,  579,
-      579,  579,  579,  575,  575,  575,  575,  575,  576,  575,
-      577,  575,  577,  575,  575,  575,  575,  575,  575,  575,
-      575,  575,  578,  575,  578,  575,  575,  575,  575,  575,
-      575,  575,  575,  575,  580,  575,   83,   21,   22,  575,
-      575,  575,  581,  575,  575,  575,  575,  575,  575,  575,
-
-      575,  579,  579,  579,  582,  583,  579,  575,  575,  579,
-      579,  579,  579,  579,  579,  579,  579,  579,  579,  579,
-      579,  579,  579,  579,  579,  579,  579,  579,  579,  579,
-      579,  579,  579,  579,  579,  579,  579,  579,  579,  575,
-      575,  575,  575,  575,  575,  575,  575,  575,  575,  575,
-      575,  584,  580,  575,  575,  575,  575,  575,  575,  575,
-      581,  575,  575,  579,  579,  582,  575,  582,  583,  575,
-      583,  579,  579,  579,  579,  579,  579,  579,  579,  579,
-      579,  579,  579,  579,  579,  579,  579,  579,  579,  579,
-      579,  579,  579,  579,  579,  579,  579,  579,  579,  579,
-
-      579,  579,  579,  579,  579,  579,  579,  579,  579,  579,
-      579,  579,  579,  579,  579,  579,  579,  585,  575,  575,
-      575,  575,  586,  575,  575,  575,  575,  575,  584,  575,
-      575,  575,  575,  575,  575,  575,  579,  579,  579,  579,
-      579,  579,  579,  579,  579,  579,  579,  579,  579,  579,
-      579,  579,  579,  579,  579,  579,  579,  579,  579,  579,
-      579,  579,  579,  579,  579,  579,  579,  579,  579,  579,
-      579,  579,  579,  579,  579,  579,  579,  579,  579,  579,
-      579,  579,  579,  579,  585,  575,  575,  575,  587,  575,
-      586,  575,  575,  575,  575,  575,  575,  575,  575,  575,
-
-      579,  579,  579,  579,  579,  579,  579,  579,  579,  579,
-      579,  579,  579,  579,  579,  579,  579,  579,  579,  579,
-      579,  579,  579,  579,  579,  579,  579,  579,  579,  579,
-      579,  579,  579,  579,  579,  579,  579,  579,  579,  575,
-      588,  587,  575,  589,  575,  575,  575,  575,  575,  575,
-      579,  579,  575,  579,  579,  579,  579,  579,  579,  579,
-      579,  579,  579,  579,  579,  579,  579,  579,  579,  579,
-      579,  579,  579,  579,  579,  579,  579,  579,  579,  579,
-      579,  575,  588,  575,  589,  575,  575,  590,  575,  575,
-      575,  579,  579,  575,  579,  579,  579,  579,  579,  579,
-
-      579,  579,  579,  579,  579,  579,  579,  579,  579,  579,
-      579,  579,  579,  591,  575,  590,  590,  575,  590,  575,
-      592,  593,  579,  579,  575,  575,  579,  579,  579,  579,
-      579,  579,  579,  579,  579,  579,  579,  579,  579,  579,
-      579,  594,  575,  590,  575,  592,  592,  575,  592,  593,
-      575,  579,  579,  575,  575,  579,  579,  579,  579,  579,
-      579,  579,  579,  579,  575,  594,  575,  590,  575,  592,
-      579,  579,  575,  575,  579,  579,  579,  579,  579,  579,
-      579,  579,  575,  590,  575,  592,  579,  579,  575,  575,
-      579,  579,  579,  579,  575,  590,  575,  592,  579,  579,
-
-      575,  575,  579,  579,  579,  575,  590,  575,  592,  579,
-      579,  575,  575,  579,  579,  575,  590,  575,  592,  579,
-      579,  575,  575,  575,  590,  575,  592,  579,  579,  575,
-      575,  590,  575,  592,  579,  579,  575,  575,  590,  575,
-      592,  579,  579,  575,  590,  575,  592,  579,  575,  590,
-      575,  592,  575,  590,  575,  592,  595,  596,  575,  592,
-      595,  595,  575,  596,  596,  575,  597,  598,  597,  597,
-      575,  598,  598,  575,    0,  575,  575,  575,  575,  575,
-      575,  575,  575,  575,  575,  575,  575,  575,  575,  575,
-      575,  575,  575,  575,  575,  575,  575,  575
-
+      597,    1,  597,  597,  597,  598,  597,  599,  597,  597,
+      597,  600,  597,  597,  597,  597,  597,  597,  597,  597,
+      597,  597,  597,  597,  597,  597,  597,  597,  601,  601,
+      601,  601,  601,  597,  597,  597,  597,  601,  601,  601,
+      601,  601,  601,  601,  601,  601,  601,  601,  601,  601,
+      601,  601,  601,  597,  597,  597,  597,  597,  598,  597,
+      599,  597,  599,  597,  597,  597,  597,  597,  597,  597,
+      597,  597,  600,  597,  600,  597,  597,  597,  597,  597,
+      597,  597,  597,  597,  602,  597,   83,   21,   22,  597,
+      597,  597,  603,  597,  597,  597,  597,  597,  597,  597,
+
+      597,  601,  601,  601,  604,  605,  601,  597,  597,  601,
+      601,  601,  601,  601,  601,  601,  601,  601,  601,  601,
+      601,  601,  601,  601,  601,  601,  601,  601,  601,  601,
+      601,  601,  601,  601,  601,  601,  601,  601,  601,  601,
+      597,  597,  597,  597,  597,  597,  597,  597,  597,  597,
+      597,  597,  606,  602,  597,  597,  597,  597,  597,  597,
+      597,  603,  597,  597,  601,  601,  604,  597,  604,  605,
+      597,  605,  601,  601,  601,  601,  601,  601,  601,  601,
+      601,  601,  601,  601,  601,  601,  601,  601,  601,  601,
+      601,  601,  601,  601,  601,  601,  601,  601,  601,  601,
+
+      601,  601,  601,  601,  601,  601,  601,  601,  601,  601,
+      601,  601,  601,  601,  601,  601,  601,  601,  601,  607,
+      597,  597,  597,  597,  608,  597,  597,  597,  597,  597,
+      606,  597,  597,  597,  597,  597,  597,  597,  601,  601,
+      601,  601,  601,  601,  601,  601,  601,  601,  601,  601,
+      601,  601,  601,  601,  601,  601,  601,  601,  601,  601,
+      601,  601,  601,  601,  601,  601,  601,  601,  601,  601,
+      601,  601,  601,  601,  601,  601,  601,  601,  601,  601,
+      601,  601,  601,  601,  601,  601,  601,  607,  597,  597,
+      597,  609,  597,  608,  597,  597,  597,  597,  597,  597,
+
+      597,  597,  597,  601,  601,  601,  601,  601,  601,  601,
+      601,  601,  601,  601,  601,  601,  601,  601,  601,  601,
+      601,  601,  601,  601,  601,  601,  601,  601,  601,  601,
+      601,  601,  601,  601,  601,  601,  601,  601,  601,  601,
+      601,  601,  601,  597,  610,  609,  597,  611,  597,  597,
+      597,  597,  597,  597,  601,  601,  601,  597,  601,  601,
+      601,  601,  601,  601,  601,  601,  601,  601,  601,  601,
+      601,  601,  601,  601,  601,  601,  601,  601,  601,  601,
+      601,  601,  601,  601,  601,  601,  597,  610,  597,  611,
+      597,  597,  612,  597,  597,  597,  601,  601,  601,  597,
+
+      601,  601,  601,  601,  601,  601,  601,  601,  601,  601,
+      601,  601,  601,  601,  601,  601,  601,  601,  601,  613,
+      597,  612,  612,  597,  612,  597,  614,  615,  601,  601,
+      601,  597,  597,  601,  601,  601,  601,  601,  601,  601,
+      601,  601,  601,  601,  601,  601,  601,  601,  616,  597,
+      612,  597,  614,  614,  597,  614,  615,  597,  601,  601,
+      601,  597,  597,  597,  601,  601,  601,  601,  601,  601,
+      601,  601,  601,  597,  616,  597,  612,  597,  614,  601,
+      601,  597,  597,  597,  601,  601,  601,  601,  601,  601,
+      601,  601,  597,  612,  597,  614,  601,  601,  597,  597,
+
+      597,  601,  601,  601,  601,  601,  597,  612,  597,  614,
+      601,  601,  597,  597,  597,  601,  601,  601,  601,  597,
+      612,  597,  614,  601,  601,  597,  597,  597,  601,  601,
+      597,  612,  597,  614,  601,  601,  597,  597,  597,  597,
+      612,  597,  614,  601,  601,  597,  597,  597,  612,  597,
+      614,  601,  601,  597,  597,  597,  612,  597,  614,  601,
+      601,  597,  597,  612,  597,  614,  601,  597,  597,  612,
+      597,  614,  597,  597,  612,  597,  614,  597,  617,  618,
+      597,  614,  617,  617,  597,  618,  618,  597,  619,  620,
+      619,  619,  597,  620,  620,  597,    0,  597,  597,  597,
+
+      597,  597,  597,  597,  597,  597,  597,  597,  597,  597,
+      597,  597,  597,  597,  597,  597,  597,  597,  597,  597
     } ;
 
-static yyconst flex_int16_t yy_nxt[1032] =
+static yyconst flex_int16_t yy_nxt[1054] =
     {   0,
         4,    5,    6,    5,    5,    7,    8,    9,   10,   11,
        12,   13,   14,   15,   16,   17,   18,   19,   20,   21,
@@ -735,114 +744,116 @@ static yyconst flex_int16_t yy_nxt[1032] =
        44,   45,   29,   46,   29,   47,   29,   29,   29,   29,
        48,   49,   50,   51,   52,   53,   29,   29,   29,   54,
        55,   56,   57,   58,   62,   58,   58,   64,   69,   70,
-       71,   74,   77,  574,   82,   79,   83,   83,   83,   83,
+       71,   74,   77,   74,   82,   79,   83,   83,   83,   83,
 
        83,   83,   83,   83,   95,  100,  101,   84,   78,   80,
-       81,   72,   85,  105,  110,  115,  112,  106,  113,  140,
-      574,  118,  116,   96,   86,   97,   98,  123,  117,   63,
-      119,  127,   75,  120,  111,  121,  135,  124,  128,   74,
-      125,   65,   66,  136,  122,   58,   67,   58,   58,   62,
-      206,  151,   68,   87,  151,   88,   88,   88,   88,   88,
-       88,   89,   89,  167,  131,  132,  144,  207,  145,  141,
-      170,  242,  243,   90,  133,  158,  154,  134,   91,  152,
-       75,  159,  155,  575,   92,   93,  142,  142,  142,  142,
-      142,  142,  142,  142,   63,   90,  199,  213,  158,  154,
-
-      160,   91,  215,  200,  216,  214,  159,  155,  168,   92,
-      575,  171,   93,   87,  202,   89,   89,   89,   89,   89,
-       89,   89,   89,  160,  203,  204,  208,  220,  571,  238,
-      232,  159,  571,   90,  234,  221,  239,  230,   91,  170,
-      156,  209,  156,  231,   92,  157,  157,  157,  157,  157,
-      157,  157,  157,  232,  223,   90,  159,  234,  566,  235,
-      230,   91,  167,  257,  258,  236,  566,  231,  231,   92,
-       83,   83,   83,   83,   83,   83,   83,   83,  309,  174,
-      171,  175,  235,  176,  218,  310,  297,  177,  149,  150,
-      236,  178,  231,  150,  179,  180,  181,  182,  183,  142,
-
-      142,  142,  142,  142,  142,  142,  142,  168,  224,  297,
-      149,  150,  418,  227,  563,  227,  150,  225,  228,  228,
-      228,  228,  228,  228,  228,  228,  157,  157,  157,  157,
-      157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-      157,  157,  228,  228,  228,  228,  228,  228,  228,  228,
-      300,  299,  563,  233,  567,  350,  507,  233,  228,  228,
-      228,  228,  228,  228,  228,  228,  298,  348,  387,  418,
-      348,  388,  299,  300,  448,  233,  299,  150,  350,  349,
-      233,  150,  353,  387,  353,  353,  387,  418,  353,  298,
-      353,  353,  417,  418,  418,  417,  418,  299,  420,  150,
-
-      426,  421,  426,  426,  150,  417,  418,  420,  417,  448,
-      420,  447,  448,  426,  447,  426,  426,  447,  448,  448,
-      447,  444,  418,  448,  468,  448,  470,  418,  418,  559,
-      448,  418,  448,  484,  448,  354,  415,  448,  418,  418,
-      448,  418,  448,  418,  448,  419,  486,  448,  496,  562,
-      563,  557,  562,  565,  566,  517,  565,  555,  419,  525,
-      445,  394,  498,  527,  449,  534,  553,  551,  532,  519,
-      449,  509,  539,  541,  545,  552,  570,  571,  547,  570,
-      549,  550,  548,  546,  544,  556,  455,  573,  574,  543,
-      573,  542,  540,  554,  538,  558,  560,  537,  536,  568,
-
-       59,   59,  535,   59,   59,   59,   59,   61,   61,   61,
-       61,   61,   61,   61,   73,   73,   73,   73,   73,   73,
-       73,  102,  102,  102,  153,  153,  533,  153,  153,  153,
-      153,  161,  161,  166,  166,  166,  166,  166,  166,  166,
-      169,  169,  169,  169,  169,  169,  169,  229,  531,  530,
-      229,  229,  229,  285,  285,  285,  285,  285,  285,  285,
-      291,  291,  291,  291,  291,  291,  291,  342,  342,  342,
-      342,  342,  342,  342,  383,  383,  383,  383,  383,  383,
-      383,  385,  385,  385,  385,  385,  385,  385,  416,  416,
-      416,  416,  416,  416,  416,  442,  442,  446,  446,  446,
-
-      446,  446,  446,  446,  450,  450,  450,  450,  450,  450,
-      450,  466,  466,  466,  466,  561,  561,  561,  561,  561,
-      561,  561,  564,  564,  564,  564,  564,  564,  564,  569,
-      569,  569,  569,  569,  569,  569,  572,  572,  572,  572,
-      572,  572,  572,  529,  528,  526,  524,  523,  522,  521,
-      520,  518,  516,  515,  514,  513,  512,  511,  510,  508,
-      506,  505,  504,  503,  502,  501,  500,  499,  497,  495,
-      494,  493,  492,  491,  490,  489,  488,  487,  485,  483,
-      465,  482,  481,  480,  479,  478,  477,  476,  475,  474,
-      473,  472,  471,  451,  448,  469,  467,  465,  464,  463,
-
-      462,  461,  460,  459,  458,  457,  456,  454,  453,  452,
-      451,  418,  443,  441,  440,  439,  438,  437,  436,  435,
-      434,  433,  432,  431,  430,  429,  428,  427,  425,  424,
-      423,  422,  386,  384,  414,  413,  412,  411,  410,  409,
-      408,  407,  406,  405,  404,  403,  402,  401,  400,  399,
-      398,  397,  396,  395,  393,  392,  391,  349,  390,  389,
-      386,  343,  384,  382,  381,  380,  379,  378,  377,  376,
-      375,  374,  373,  372,  371,  370,  369,  368,  367,  366,
-      365,  364,  363,  362,  361,  360,  359,  358,  357,  356,
-      355,  352,  351,  347,  346,  345,  292,  344,  343,  341,
-
-      340,  286,  339,  338,  337,  336,  335,  334,  333,  332,
-      331,  330,  329,  328,  327,  326,  325,  324,  323,  322,
-      321,  320,  319,  318,  317,  316,  315,  314,  313,  312,
-      311,  308,  307,  306,  305,  304,  303,  302,  301,  296,
-      295,  294,  293,  292,  290,  289,  288,  287,  286,  284,
-      283,  282,  281,  280,  279,  278,  277,  276,  275,  274,
-      273,  272,  271,  270,  269,  268,  267,  266,  265,  264,
-      263,  262,  261,  260,  259,  256,  255,  254,  253,  252,
-      251,  250,  249,  248,  247,  246,  245,  244,  241,  240,
-      575,  575,  237,  152,  226,  222,  219,  217,  212,  211,
-
-      210,  205,  201,  198,  197,  196,  195,  194,  193,  192,
-      191,  190,  189,  188,  187,  186,  185,  184,  173,  172,
-      165,  164,  163,  162,  148,  575,  147,  146,  143,  575,
-      139,  138,  137,  130,  129,  126,  114,  109,  108,  107,
-      104,  103,   99,   94,   76,   60,  575,    3,  575,  575,
-      575,  575,  575,  575,  575,  575,  575,  575,  575,  575,
-      575,  575,  575,  575,  575,  575,  575,  575,  575,  575,
-      575,  575,  575,  575,  575,  575,  575,  575,  575,  575,
-      575,  575,  575,  575,  575,  575,  575,  575,  575,  575,
-      575,  575,  575,  575,  575,  575,  575,  575,  575,  575,
-
-      575,  575,  575,  575,  575,  575,  575,  575,  575,  575,
-      575,  575,  575,  575,  575,  575,  575,  575,  575,  575,
-      575,  575,  575,  575,  575,  575,  575,  575,  575,  575,
-      575
+       81,   72,   85,  105,  113,  116,  114,  106,  110,  141,
+      160,  119,  117,   96,   86,   97,   98,  111,  118,   63,
+      120,   62,   75,  121,   75,  122,  128,  124,  112,  171,
+      215,   65,   66,  129,  123,  160,   67,  125,  216,  145,
+      126,  146,   68,   87,  168,   88,   88,   88,   88,   88,
+       88,   89,   89,  136,  132,  133,  208,  171,  152,  142,
+      137,  152,  233,   90,  134,  161,   63,  135,   91,   58,
+      172,   58,   58,  209,   92,   93,  143,  143,  143,  143,
+      143,  143,  143,  143,  222,   90,  153,  233,  161,  169,
+
+      155,   91,  223,  217,  159,  218,  156,  597,  172,   92,
+      160,  596,   93,   87,  210,   89,   89,   89,   89,   89,
+       89,   89,   89,  155,  596,  201,  204,  159,  424,  211,
+      234,  156,  202,   90,  597,  160,  205,  206,   91,  236,
+      157,  168,  157,  302,   92,  158,  158,  158,  158,  158,
+      158,  158,  158,  234,  225,   90,  240,  245,  246,  232,
+      593,   91,  236,  241,  424,  233,  260,  261,  302,   92,
+       83,   83,   83,   83,   83,   83,   83,   83,  313,  176,
+      451,  177,  232,  178,  220,  314,  169,  179,  150,  151,
+      233,  180,  593,  151,  181,  182,  183,  184,  185,  143,
+
+      143,  143,  143,  143,  143,  143,  143,  570,  226,  392,
+      150,  151,  393,  229,  588,  229,  151,  227,  230,  230,
+      230,  230,  230,  230,  230,  230,  158,  158,  158,  158,
+      158,  158,  158,  158,  158,  158,  158,  158,  158,  158,
+      158,  158,  237,  300,  303,  301,  352,  354,  238,  352,
+      588,  302,  358,  235,  358,  358,  585,  235,  353,  358,
+      392,  358,  358,  392,  585,  237,  300,  303,  301,  589,
+      354,  423,  424,  238,  423,  235,  302,  455,  581,  424,
+      235,  230,  230,  230,  230,  230,  230,  230,  230,  230,
+      230,  230,  230,  230,  230,  230,  230,  426,  424,  433,
+
+      427,  433,  433,  423,  424,  359,  423,  426,  151,  424,
+      426,  455,  151,  421,  454,  455,  433,  454,  433,  433,
+      454,  455,  455,  454,  425,  455,  424,  455,  424,  479,
+      151,  508,  400,  424,  424,  151,  424,  494,  424,  455,
+      455,  424,  455,  455,  455,  455,  477,  424,  496,  455,
+      584,  585,  455,  584,  587,  588,  425,  587,  579,  541,
+      452,  510,  592,  593,  578,  592,  532,  456,  576,  463,
+      521,  534,  543,  456,  551,  549,  564,  523,  574,  557,
+      572,  559,  573,  566,  571,  569,  568,  577,  575,  464,
+      595,  596,  567,  595,  565,  563,  562,  561,  560,  580,
+
+      558,  582,  556,  555,  590,   59,   59,  554,   59,   59,
+       59,   59,   61,   61,   61,   61,   61,   61,   61,   73,
+       73,   73,   73,   73,   73,   73,  102,  102,  102,  154,
+      154,  553,  154,  154,  154,  154,  162,  162,  167,  167,
+      167,  167,  167,  167,  167,  170,  170,  170,  170,  170,
+      170,  170,  231,  552,  550,  231,  231,  231,  288,  288,
+      288,  288,  288,  288,  288,  294,  294,  294,  294,  294,
+      294,  294,  346,  346,  346,  346,  346,  346,  346,  388,
+      388,  388,  388,  388,  388,  388,  390,  390,  390,  390,
+      390,  390,  390,  422,  422,  422,  422,  422,  422,  422,
+
+      449,  449,  453,  453,  453,  453,  453,  453,  453,  457,
+      457,  457,  457,  457,  457,  457,  475,  475,  475,  475,
+      583,  583,  583,  583,  583,  583,  583,  586,  586,  586,
+      586,  586,  586,  586,  591,  591,  591,  591,  591,  591,
+      591,  594,  594,  594,  594,  594,  594,  594,  548,  547,
+      546,  545,  544,  542,  540,  539,  538,  537,  536,  535,
+      533,  531,  530,  529,  528,  527,  526,  525,  524,  522,
+      520,  519,  518,  517,  516,  515,  514,  513,  512,  511,
+      509,  507,  506,  505,  504,  503,  502,  501,  500,  499,
+      498,  497,  495,  493,  474,  492,  491,  490,  489,  488,
+
+      487,  486,  485,  484,  483,  482,  481,  480,  458,  455,
+      478,  476,  474,  473,  472,  471,  470,  469,  468,  467,
+      466,  465,  462,  461,  460,  459,  458,  424,  450,  448,
+      447,  446,  445,  444,  443,  442,  441,  440,  439,  438,
+      437,  436,  435,  434,  432,  431,  430,  429,  428,  391,
+      389,  420,  419,  418,  417,  416,  415,  414,  413,  412,
+      411,  410,  409,  408,  407,  406,  405,  404,  403,  402,
+      401,  399,  398,  397,  396,  353,  395,  394,  391,  347,
+      389,  387,  386,  385,  384,  383,  382,  381,  380,  379,
+      378,  377,  376,  375,  374,  373,  372,  371,  370,  369,
+
+      368,  367,  366,  365,  364,  363,  362,  361,  360,  357,
+      356,  355,  351,  350,  349,  295,  348,  347,  345,  344,
+      289,  343,  342,  341,  340,  339,  338,  337,  336,  335,
+      334,  333,  332,  331,  330,  329,  328,  327,  326,  325,
+      324,  323,  322,  321,  320,  319,  318,  317,  316,  315,
+      312,  311,  310,  309,  308,  307,  306,  305,  304,  299,
+      298,  297,  296,  295,  293,  292,  291,  290,  289,  287,
+      286,  285,  284,  283,  282,  281,  280,  279,  278,  277,
+      276,  275,  274,  273,  272,  271,  270,  269,  268,  267,
+      266,  265,  264,  263,  262,  259,  258,  257,  256,  255,
+
+      254,  253,  252,  251,  250,  249,  248,  247,  244,  243,
+      242,  597,  597,  239,  153,  228,  224,  221,  219,  214,
+      213,  212,  207,  203,  200,  199,  198,  197,  196,  195,
+      194,  193,  192,  191,  190,  189,  188,  187,  186,  175,
+      174,  173,  166,  165,  164,  163,  149,  597,  148,  147,
+      144,  597,  140,  139,  138,  131,  130,  127,  115,  109,
+      108,  107,  104,  103,   99,   94,   76,   60,  597,    3,
+      597,  597,  597,  597,  597,  597,  597,  597,  597,  597,
+      597,  597,  597,  597,  597,  597,  597,  597,  597,  597,
+      597,  597,  597,  597,  597,  597,  597,  597,  597,  597,
+
+      597,  597,  597,  597,  597,  597,  597,  597,  597,  597,
+      597,  597,  597,  597,  597,  597,  597,  597,  597,  597,
+      597,  597,  597,  597,  597,  597,  597,  597,  597,  597,
+      597,  597,  597,  597,  597,  597,  597,  597,  597,  597,
+      597,  597,  597,  597,  597,  597,  597,  597,  597,  597,
+      597,  597,  597
     } ;
 
-static yyconst flex_int16_t yy_chk[1032] =
+static yyconst flex_int16_t yy_chk[1054] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -853,111 +864,113 @@ static yyconst flex_int16_t yy_chk[1032] =
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    5,    8,    5,    5,    9,   10,   10,
-       11,   12,   16,  573,   19,   18,   19,   19,   19,   19,
+       11,   12,   16,   73,   19,   18,   19,   19,   19,   19,
 
        19,   19,   19,   19,   25,   27,   27,   20,   16,   18,
-       18,   11,   20,   32,   38,   41,   39,   32,   39,   55,
-      572,   42,   41,   25,   20,   25,   25,   44,   41,    8,
-       42,   46,   12,   43,   38,   43,   50,   44,   46,   73,
-       44,    9,    9,   50,   43,   58,    9,   58,   58,   61,
-      132,   84,    9,   21,   84,   21,   21,   21,   21,   21,
-       21,   21,   21,  105,   49,   49,   66,  132,   66,   55,
-      106,  174,  174,   21,   49,   91,   88,   49,   21,   84,
-       73,   91,   88,   88,   21,   21,   64,   64,   64,   64,
-       64,   64,   64,   64,   61,   21,  128,  137,   91,   88,
-
-       92,   21,  138,  128,  138,  137,   91,   88,  105,   21,
-       88,  106,   21,   22,  130,   22,   22,   22,   22,   22,
-       22,   22,   22,   92,  130,  130,  133,  144,  570,  165,
-      155,  158,  569,   22,  160,  144,  165,  154,   22,  169,
-       90,  133,   90,  154,   22,   90,   90,   90,   90,   90,
-       90,   90,   90,  155,  146,   22,  158,  160,  565,  161,
-      154,   22,  166,  189,  189,  161,  564,  230,  154,   22,
-       83,   83,   83,   83,   83,   83,   83,   83,  246,  111,
-      169,  111,  161,  111,  142,  246,  232,  111,   83,   83,
-      161,  111,  230,   83,  111,  111,  111,  111,  111,  142,
-
-      142,  142,  142,  142,  142,  142,  142,  166,  146,  232,
-       83,   83,  496,  149,  562,  149,   83,  146,  149,  149,
-      149,  149,  149,  149,  149,  149,  156,  156,  156,  156,
-      156,  156,  156,  156,  157,  157,  157,  157,  157,  157,
-      157,  157,  227,  227,  227,  227,  227,  227,  227,  227,
-      236,  298,  561,  157,  559,  300,  496,  157,  228,  228,
-      228,  228,  228,  228,  228,  228,  235,  296,  345,  419,
-      296,  345,  235,  236,  449,  157,  298,  228,  300,  296,
-      157,  228,  305,  387,  305,  305,  387,  444,  353,  235,
-      353,  353,  388,  388,  468,  388,  484,  235,  389,  228,
-
-      395,  389,  395,  395,  228,  417,  417,  420,  417,  470,
-      420,  421,  421,  426,  421,  426,  426,  447,  447,  498,
-      447,  419,  507,  486,  444,  509,  449,  525,  517,  555,
-      519,  532,  534,  468,  527,  305,  387,  541,  545,  539,
-      547,  550,  552,  554,  556,  388,  470,  560,  484,  557,
-      557,  553,  557,  558,  558,  507,  558,  551,  417,  517,
-      420,  353,  486,  519,  421,  527,  549,  546,  525,  509,
-      447,  498,  532,  534,  539,  547,  567,  567,  541,  567,
-      544,  545,  543,  540,  538,  552,  426,  568,  568,  536,
-      568,  535,  533,  550,  531,  554,  556,  530,  529,  560,
-
-      576,  576,  528,  576,  576,  576,  576,  577,  577,  577,
-      577,  577,  577,  577,  578,  578,  578,  578,  578,  578,
-      578,  579,  579,  579,  580,  580,  526,  580,  580,  580,
-      580,  581,  581,  582,  582,  582,  582,  582,  582,  582,
-      583,  583,  583,  583,  583,  583,  583,  584,  524,  523,
-      584,  584,  584,  585,  585,  585,  585,  585,  585,  585,
-      586,  586,  586,  586,  586,  586,  586,  587,  587,  587,
-      587,  587,  587,  587,  588,  588,  588,  588,  588,  588,
-      588,  589,  589,  589,  589,  589,  589,  589,  590,  590,
-      590,  590,  590,  590,  590,  591,  591,  592,  592,  592,
-
-      592,  592,  592,  592,  593,  593,  593,  593,  593,  593,
-      593,  594,  594,  594,  594,  595,  595,  595,  595,  595,
-      595,  595,  596,  596,  596,  596,  596,  596,  596,  597,
-      597,  597,  597,  597,  597,  597,  598,  598,  598,  598,
-      598,  598,  598,  521,  520,  518,  516,  513,  512,  511,
-      510,  508,  506,  504,  503,  502,  501,  500,  499,  497,
-      495,  494,  492,  491,  490,  489,  488,  487,  485,  483,
-      482,  481,  476,  475,  474,  473,  472,  471,  469,  467,
-      466,  464,  463,  462,  461,  459,  458,  457,  456,  455,
-      454,  453,  452,  450,  446,  445,  443,  442,  436,  435,
-
-      433,  432,  431,  430,  429,  428,  427,  425,  424,  423,
-      422,  416,  415,  413,  412,  410,  409,  407,  406,  405,
-      404,  403,  402,  401,  400,  399,  398,  396,  394,  393,
-      392,  390,  385,  383,  382,  381,  380,  379,  372,  371,
-      367,  366,  365,  364,  363,  362,  361,  360,  359,  358,
-      357,  356,  355,  354,  352,  351,  349,  348,  347,  346,
-      344,  342,  341,  340,  338,  337,  335,  334,  333,  332,
-      331,  330,  328,  327,  326,  325,  322,  321,  320,  319,
-      316,  315,  314,  313,  312,  311,  310,  309,  308,  307,
-      306,  303,  302,  295,  294,  293,  291,  290,  289,  288,
-
-      287,  285,  284,  283,  281,  280,  279,  277,  276,  275,
-      274,  273,  272,  271,  270,  269,  267,  265,  264,  263,
-      260,  259,  258,  257,  254,  252,  251,  250,  249,  248,
-      247,  245,  244,  243,  242,  241,  239,  238,  237,  229,
-      226,  225,  224,  223,  222,  221,  220,  219,  218,  217,
-      216,  215,  214,  213,  212,  211,  210,  209,  208,  207,
-      206,  205,  204,  203,  202,  201,  199,  198,  196,  195,
-      194,  193,  192,  191,  190,  188,  187,  186,  185,  183,
-      182,  181,  180,  179,  178,  177,  176,  175,  173,  172,
-      171,  168,  164,  151,  147,  145,  143,  139,  136,  135,
-
-      134,  131,  129,  126,  125,  124,  123,  122,  121,  120,
-      119,  118,  117,  116,  115,  114,  113,  112,  110,  107,
-      104,  103,  101,   97,   82,   75,   68,   67,   65,   63,
-       53,   52,   51,   48,   47,   45,   40,   37,   35,   33,
-       31,   30,   26,   23,   15,    7,    3,  575,  575,  575,
-      575,  575,  575,  575,  575,  575,  575,  575,  575,  575,
-      575,  575,  575,  575,  575,  575,  575,  575,  575,  575,
-      575,  575,  575,  575,  575,  575,  575,  575,  575,  575,
-      575,  575,  575,  575,  575,  575,  575,  575,  575,  575,
-      575,  575,  575,  575,  575,  575,  575,  575,  575,  575,
-
-      575,  575,  575,  575,  575,  575,  575,  575,  575,  575,
-      575,  575,  575,  575,  575,  575,  575,  575,  575,  575,
-      575,  575,  575,  575,  575,  575,  575,  575,  575,  575,
-      575
+       18,   11,   20,   32,   39,   41,   39,   32,   38,   55,
+      159,   42,   41,   25,   20,   25,   25,   38,   41,    8,
+       42,   61,   12,   43,   73,   43,   46,   44,   38,  106,
+      138,    9,    9,   46,   43,  159,    9,   44,  138,   66,
+       44,   66,    9,   21,  105,   21,   21,   21,   21,   21,
+       21,   21,   21,   50,   49,   49,  133,  170,   84,   55,
+       50,   84,  232,   21,   49,   92,   61,   49,   21,   58,
+      106,   58,   58,  133,   21,   21,   64,   64,   64,   64,
+       64,   64,   64,   64,  145,   21,   84,  232,   92,  105,
+
+       88,   21,  145,  139,   91,  139,   88,   88,  170,   21,
+       91,  595,   21,   22,  134,   22,   22,   22,   22,   22,
+       22,   22,   22,   88,  594,  129,  131,   91,  425,  134,
+      156,   88,  129,   22,   88,   91,  131,  131,   22,  161,
+       90,  167,   90,  301,   22,   90,   90,   90,   90,   90,
+       90,   90,   90,  156,  147,   22,  166,  176,  176,  155,
+      592,   22,  161,  166,  564,  155,  191,  191,  301,   22,
+       83,   83,   83,   83,   83,   83,   83,   83,  249,  112,
+      425,  112,  155,  112,  143,  249,  167,  112,   83,   83,
+      155,  112,  591,   83,  112,  112,  112,  112,  112,  143,
+
+      143,  143,  143,  143,  143,  143,  143,  564,  147,  349,
+       83,   83,  349,  150,  587,  150,   83,  147,  150,  150,
+      150,  150,  150,  150,  150,  150,  157,  157,  157,  157,
+      157,  157,  157,  157,  158,  158,  158,  158,  158,  158,
+      158,  158,  162,  234,  238,  237,  299,  303,  162,  299,
+      586,  237,  309,  158,  309,  309,  584,  158,  299,  358,
+      392,  358,  358,  392,  583,  162,  234,  238,  237,  581,
+      303,  393,  393,  162,  393,  158,  237,  456,  576,  494,
+      158,  229,  229,  229,  229,  229,  229,  229,  229,  230,
+      230,  230,  230,  230,  230,  230,  230,  394,  477,  401,
+
+      394,  401,  401,  423,  423,  309,  423,  426,  230,  451,
+      426,  479,  230,  392,  427,  427,  433,  427,  433,  433,
+      454,  454,  496,  454,  393,  510,  508,  523,  532,  456,
+      230,  494,  358,  521,  541,  230,  570,  477,  549,  534,
+      551,  557,  559,  543,  572,  566,  451,  575,  479,  577,
+      579,  579,  582,  579,  580,  580,  423,  580,  574,  532,
+      426,  496,  589,  589,  573,  589,  521,  427,  571,  433,
+      508,  523,  534,  454,  543,  541,  557,  510,  569,  549,
+      566,  551,  568,  559,  565,  563,  562,  572,  570,  433,
+      590,  590,  561,  590,  558,  556,  554,  553,  552,  575,
+
+      550,  577,  548,  547,  582,  598,  598,  546,  598,  598,
+      598,  598,  599,  599,  599,  599,  599,  599,  599,  600,
+      600,  600,  600,  600,  600,  600,  601,  601,  601,  602,
+      602,  545,  602,  602,  602,  602,  603,  603,  604,  604,
+      604,  604,  604,  604,  604,  605,  605,  605,  605,  605,
+      605,  605,  606,  544,  542,  606,  606,  606,  607,  607,
+      607,  607,  607,  607,  607,  608,  608,  608,  608,  608,
+      608,  608,  609,  609,  609,  609,  609,  609,  609,  610,
+      610,  610,  610,  610,  610,  610,  611,  611,  611,  611,
+      611,  611,  611,  612,  612,  612,  612,  612,  612,  612,
+
+      613,  613,  614,  614,  614,  614,  614,  614,  614,  615,
+      615,  615,  615,  615,  615,  615,  616,  616,  616,  616,
+      617,  617,  617,  617,  617,  617,  617,  618,  618,  618,
+      618,  618,  618,  618,  619,  619,  619,  619,  619,  619,
+      619,  620,  620,  620,  620,  620,  620,  620,  540,  539,
+      538,  536,  535,  533,  531,  528,  527,  526,  525,  524,
+      522,  520,  517,  516,  515,  514,  513,  512,  511,  509,
+      507,  506,  504,  503,  502,  501,  500,  499,  498,  497,
+      495,  493,  492,  491,  489,  486,  485,  484,  483,  482,
+      481,  480,  478,  476,  475,  473,  472,  471,  470,  468,
+
+      467,  466,  465,  464,  463,  462,  460,  459,  457,  453,
+      452,  450,  449,  443,  442,  440,  439,  438,  437,  436,
+      435,  434,  432,  431,  430,  429,  428,  422,  421,  419,
+      418,  416,  415,  413,  412,  411,  410,  409,  408,  407,
+      406,  405,  404,  402,  400,  399,  398,  397,  395,  390,
+      388,  387,  386,  385,  384,  377,  376,  372,  371,  370,
+      369,  368,  367,  366,  365,  364,  363,  362,  361,  360,
+      359,  357,  356,  355,  353,  352,  351,  350,  348,  346,
+      345,  344,  342,  341,  339,  338,  337,  336,  335,  334,
+      332,  331,  330,  329,  326,  325,  324,  323,  320,  319,
+
+      318,  317,  316,  315,  314,  313,  312,  311,  310,  308,
+      306,  305,  298,  297,  296,  294,  293,  292,  291,  290,
+      288,  287,  286,  284,  283,  282,  280,  279,  278,  277,
+      276,  275,  274,  273,  272,  270,  268,  267,  266,  263,
+      262,  261,  260,  257,  255,  254,  253,  252,  251,  250,
+      248,  247,  246,  245,  244,  243,  241,  240,  239,  231,
+      228,  227,  226,  225,  224,  223,  222,  221,  220,  219,
+      218,  217,  216,  215,  214,  213,  212,  211,  210,  209,
+      208,  207,  206,  205,  204,  203,  201,  200,  198,  197,
+      196,  195,  194,  193,  192,  190,  189,  188,  187,  185,
+
+      184,  183,  182,  181,  180,  179,  178,  177,  175,  174,
+      173,  172,  169,  165,  152,  148,  146,  144,  140,  137,
+      136,  135,  132,  130,  127,  126,  125,  124,  123,  122,
+      121,  120,  119,  118,  117,  116,  115,  114,  113,  111,
+      110,  107,  104,  103,  101,   97,   82,   75,   68,   67,
+       65,   63,   53,   52,   51,   48,   47,   45,   40,   37,
+       35,   33,   31,   30,   26,   23,   15,    7,    3,  597,
+      597,  597,  597,  597,  597,  597,  597,  597,  597,  597,
+      597,  597,  597,  597,  597,  597,  597,  597,  597,  597,
+      597,  597,  597,  597,  597,  597,  597,  597,  597,  597,
+
+      597,  597,  597,  597,  597,  597,  597,  597,  597,  597,
+      597,  597,  597,  597,  597,  597,  597,  597,  597,  597,
+      597,  597,  597,  597,  597,  597,  597,  597,  597,  597,
+      597,  597,  597,  597,  597,  597,  597,  597,  597,  597,
+      597,  597,  597,  597,  597,  597,  597,  597,  597,  597,
+      597,  597,  597
     } ;
 
 extern int yy_flex_debug;
@@ -1011,6 +1024,7 @@ char *yytext;
 #line 32 "giscanner/scannerlexer.l"
 #include <ctype.h>
 #include <stdio.h>
+#include <string.h>
 #ifndef _WIN32
 #include <limits.h>
 #endif
@@ -1038,7 +1052,7 @@ static void process_linemarks (GISourceScanner *scanner);
 static int check_identifier (GISourceScanner *scanner, const char *);
 static int parse_ignored_macro (void);
 static void print_error (GISourceScanner *scanner);
-#line 1042 "scannerlexer.c"
+#line 1056 "scannerlexer.c"
 
 #define INITIAL 0
 
@@ -1218,10 +1232,10 @@ YY_DECL
        register char *yy_cp, *yy_bp;
        register int yy_act;
     
-#line 72 "giscanner/scannerlexer.l"
+#line 73 "giscanner/scannerlexer.l"
 
 
-#line 1225 "scannerlexer.c"
+#line 1239 "scannerlexer.c"
 
        if ( !(yy_init) )
                {
@@ -1279,14 +1293,14 @@ yy_match:
                        while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
                                {
                                yy_current_state = (int) yy_def[yy_current_state];
-                               if ( yy_current_state >= 576 )
+                               if ( yy_current_state >= 598 )
                                        yy_c = yy_meta[(unsigned int) yy_c];
                                }
                        yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
                        *(yy_state_ptr)++ = yy_current_state;
                        ++yy_cp;
                        }
-               while ( yy_base[yy_current_state] != 948 );
+               while ( yy_base[yy_current_state] != 970 );
 
 yy_find_action:
                yy_current_state = *--(yy_state_ptr);
@@ -1316,7 +1330,7 @@ do_action:        /* This label is used only to access EOF actions. */
 case 1:
 /* rule 1 can match eol */
 YY_RULE_SETUP
-#line 74 "giscanner/scannerlexer.l"
+#line 75 "giscanner/scannerlexer.l"
 { strncpy(linebuf, yytext+1, sizeof(linebuf)); /* save the next line */
                                                linebuf[sizeof(linebuf)-1]='\0';
                                                /* printf("%4d:%s\n",lineno,linebuf); */
@@ -1327,734 +1341,749 @@ YY_RULE_SETUP
 case 2:
 /* rule 2 can match eol */
 YY_RULE_SETUP
-#line 80 "giscanner/scannerlexer.l"
+#line 81 "giscanner/scannerlexer.l"
 { ++lineno; }
        YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 82 "giscanner/scannerlexer.l"
+#line 83 "giscanner/scannerlexer.l"
 { /* Ignore whitespace. */ }
        YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 84 "giscanner/scannerlexer.l"
+#line 85 "giscanner/scannerlexer.l"
 { parse_comment(scanner); }
        YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 85 "giscanner/scannerlexer.l"
+#line 86 "giscanner/scannerlexer.l"
 { parse_trigraph(scanner); }
        YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 86 "giscanner/scannerlexer.l"
+#line 87 "giscanner/scannerlexer.l"
 { /* Ignore C++ style comments. */ }
        YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 88 "giscanner/scannerlexer.l"
+#line 89 "giscanner/scannerlexer.l"
 { yyless (yyleng - 1); return FUNCTION_MACRO; }
        YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 89 "giscanner/scannerlexer.l"
+#line 90 "giscanner/scannerlexer.l"
 { return OBJECT_MACRO; }
        YY_BREAK
 case 9:
 /* rule 9 can match eol */
 YY_RULE_SETUP
-#line 90 "giscanner/scannerlexer.l"
+#line 91 "giscanner/scannerlexer.l"
 { return IFDEF_GI_SCANNER; }
        YY_BREAK
 case 10:
 /* rule 10 can match eol */
 YY_RULE_SETUP
-#line 91 "giscanner/scannerlexer.l"
+#line 92 "giscanner/scannerlexer.l"
 { return IFNDEF_GI_SCANNER; }
        YY_BREAK
 case 11:
 /* rule 11 can match eol */
 YY_RULE_SETUP
-#line 92 "giscanner/scannerlexer.l"
+#line 93 "giscanner/scannerlexer.l"
 { return IFNDEF_COND; }
        YY_BREAK
 case 12:
 /* rule 12 can match eol */
 YY_RULE_SETUP
-#line 93 "giscanner/scannerlexer.l"
+#line 94 "giscanner/scannerlexer.l"
 { return IFDEF_COND; }
        YY_BREAK
 case 13:
 /* rule 13 can match eol */
 YY_RULE_SETUP
-#line 94 "giscanner/scannerlexer.l"
+#line 95 "giscanner/scannerlexer.l"
 { return IF_COND; }
        YY_BREAK
 case 14:
 /* rule 14 can match eol */
 YY_RULE_SETUP
-#line 95 "giscanner/scannerlexer.l"
+#line 96 "giscanner/scannerlexer.l"
 { return ELIF_COND; }
        YY_BREAK
 case 15:
 /* rule 15 can match eol */
 YY_RULE_SETUP
-#line 96 "giscanner/scannerlexer.l"
+#line 97 "giscanner/scannerlexer.l"
 { return ELSE_COND; }
        YY_BREAK
 case 16:
 /* rule 16 can match eol */
 YY_RULE_SETUP
-#line 97 "giscanner/scannerlexer.l"
+#line 98 "giscanner/scannerlexer.l"
 { return ENDIF_COND; }
        YY_BREAK
 case 17:
 /* rule 17 can match eol */
 YY_RULE_SETUP
-#line 98 "giscanner/scannerlexer.l"
+#line 99 "giscanner/scannerlexer.l"
 { /* Ignore pragma. */ }
        YY_BREAK
 case 18:
 /* rule 18 can match eol */
 YY_RULE_SETUP
-#line 100 "giscanner/scannerlexer.l"
+#line 101 "giscanner/scannerlexer.l"
 { process_linemarks(scanner); }
        YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 101 "giscanner/scannerlexer.l"
+#line 102 "giscanner/scannerlexer.l"
 { }
        YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 102 "giscanner/scannerlexer.l"
+#line 103 "giscanner/scannerlexer.l"
 { return '{'; }
        YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 103 "giscanner/scannerlexer.l"
+#line 104 "giscanner/scannerlexer.l"
 { return '{'; }
        YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 104 "giscanner/scannerlexer.l"
+#line 105 "giscanner/scannerlexer.l"
 { return '}'; }
        YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 105 "giscanner/scannerlexer.l"
+#line 106 "giscanner/scannerlexer.l"
 { return '}'; }
        YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 106 "giscanner/scannerlexer.l"
+#line 107 "giscanner/scannerlexer.l"
 { return '['; }
        YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 107 "giscanner/scannerlexer.l"
+#line 108 "giscanner/scannerlexer.l"
 { return '['; }
        YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 108 "giscanner/scannerlexer.l"
+#line 109 "giscanner/scannerlexer.l"
 { return ']'; }
        YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 109 "giscanner/scannerlexer.l"
+#line 110 "giscanner/scannerlexer.l"
 { return ']'; }
        YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 110 "giscanner/scannerlexer.l"
+#line 111 "giscanner/scannerlexer.l"
 { return '('; }
        YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 111 "giscanner/scannerlexer.l"
+#line 112 "giscanner/scannerlexer.l"
 { return ')'; }
        YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 112 "giscanner/scannerlexer.l"
+#line 113 "giscanner/scannerlexer.l"
 { return ';'; }
        YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 113 "giscanner/scannerlexer.l"
+#line 114 "giscanner/scannerlexer.l"
 { return ':'; }
        YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 114 "giscanner/scannerlexer.l"
+#line 115 "giscanner/scannerlexer.l"
 { return ELLIPSIS; }
        YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 115 "giscanner/scannerlexer.l"
+#line 116 "giscanner/scannerlexer.l"
 { return '?'; }
        YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 116 "giscanner/scannerlexer.l"
+#line 117 "giscanner/scannerlexer.l"
 { return '.'; }
        YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 117 "giscanner/scannerlexer.l"
+#line 118 "giscanner/scannerlexer.l"
 { return '+'; }
        YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 118 "giscanner/scannerlexer.l"
+#line 119 "giscanner/scannerlexer.l"
 { return '-'; }
        YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 119 "giscanner/scannerlexer.l"
+#line 120 "giscanner/scannerlexer.l"
 { return '*'; }
        YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 120 "giscanner/scannerlexer.l"
+#line 121 "giscanner/scannerlexer.l"
 { return '/'; }
        YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 121 "giscanner/scannerlexer.l"
+#line 122 "giscanner/scannerlexer.l"
 { return '%'; }
        YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 122 "giscanner/scannerlexer.l"
+#line 123 "giscanner/scannerlexer.l"
 { return '^'; }
        YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 123 "giscanner/scannerlexer.l"
+#line 124 "giscanner/scannerlexer.l"
 { return '&'; }
        YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 124 "giscanner/scannerlexer.l"
+#line 125 "giscanner/scannerlexer.l"
 { return '|'; }
        YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 125 "giscanner/scannerlexer.l"
+#line 126 "giscanner/scannerlexer.l"
 { return '~'; }
        YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 126 "giscanner/scannerlexer.l"
+#line 127 "giscanner/scannerlexer.l"
 { return '!'; }
        YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 127 "giscanner/scannerlexer.l"
+#line 128 "giscanner/scannerlexer.l"
 { return '='; }
        YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 128 "giscanner/scannerlexer.l"
+#line 129 "giscanner/scannerlexer.l"
 { return '<'; }
        YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 129 "giscanner/scannerlexer.l"
+#line 130 "giscanner/scannerlexer.l"
 { return '>'; }
        YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 130 "giscanner/scannerlexer.l"
+#line 131 "giscanner/scannerlexer.l"
 { return ADDEQ; }
        YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 131 "giscanner/scannerlexer.l"
+#line 132 "giscanner/scannerlexer.l"
 { return SUBEQ; }
        YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 132 "giscanner/scannerlexer.l"
+#line 133 "giscanner/scannerlexer.l"
 { return MULEQ; }
        YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 133 "giscanner/scannerlexer.l"
+#line 134 "giscanner/scannerlexer.l"
 { return DIVEQ; }
        YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 134 "giscanner/scannerlexer.l"
+#line 135 "giscanner/scannerlexer.l"
 { return MODEQ; }
        YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 135 "giscanner/scannerlexer.l"
+#line 136 "giscanner/scannerlexer.l"
 { return XOREQ; }
        YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 136 "giscanner/scannerlexer.l"
+#line 137 "giscanner/scannerlexer.l"
 { return ANDEQ; }
        YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 137 "giscanner/scannerlexer.l"
+#line 138 "giscanner/scannerlexer.l"
 { return OREQ; }
        YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 138 "giscanner/scannerlexer.l"
+#line 139 "giscanner/scannerlexer.l"
 { return SL; }
        YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 139 "giscanner/scannerlexer.l"
+#line 140 "giscanner/scannerlexer.l"
 { return SR; }
        YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 140 "giscanner/scannerlexer.l"
+#line 141 "giscanner/scannerlexer.l"
 { return SLEQ; }
        YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 141 "giscanner/scannerlexer.l"
+#line 142 "giscanner/scannerlexer.l"
 { return SREQ; }
        YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 142 "giscanner/scannerlexer.l"
+#line 143 "giscanner/scannerlexer.l"
 { return EQ; }
        YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 143 "giscanner/scannerlexer.l"
+#line 144 "giscanner/scannerlexer.l"
 { return NOTEQ; }
        YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 144 "giscanner/scannerlexer.l"
+#line 145 "giscanner/scannerlexer.l"
 { return LTEQ; }
        YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 145 "giscanner/scannerlexer.l"
+#line 146 "giscanner/scannerlexer.l"
 { return GTEQ; }
        YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 146 "giscanner/scannerlexer.l"
+#line 147 "giscanner/scannerlexer.l"
 { return ANDAND; }
        YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 147 "giscanner/scannerlexer.l"
+#line 148 "giscanner/scannerlexer.l"
 { return OROR; }
        YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 148 "giscanner/scannerlexer.l"
+#line 149 "giscanner/scannerlexer.l"
 { return PLUSPLUS; }
        YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 149 "giscanner/scannerlexer.l"
+#line 150 "giscanner/scannerlexer.l"
 { return MINUSMINUS; }
        YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 150 "giscanner/scannerlexer.l"
+#line 151 "giscanner/scannerlexer.l"
 { return ','; }
        YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 151 "giscanner/scannerlexer.l"
+#line 152 "giscanner/scannerlexer.l"
 { return ARROW; }
        YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 153 "giscanner/scannerlexer.l"
+#line 154 "giscanner/scannerlexer.l"
 { if (!parse_ignored_macro()) REJECT; }
        YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 154 "giscanner/scannerlexer.l"
+#line 155 "giscanner/scannerlexer.l"
 { if (!parse_ignored_macro()) REJECT; }
        YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 155 "giscanner/scannerlexer.l"
+#line 156 "giscanner/scannerlexer.l"
 { if (!parse_ignored_macro()) REJECT; }
        YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 156 "giscanner/scannerlexer.l"
+#line 157 "giscanner/scannerlexer.l"
 { if (!parse_ignored_macro()) REJECT; }
        YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 157 "giscanner/scannerlexer.l"
+#line 158 "giscanner/scannerlexer.l"
 { if (!parse_ignored_macro()) REJECT; }
        YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 158 "giscanner/scannerlexer.l"
+#line 159 "giscanner/scannerlexer.l"
 { if (!parse_ignored_macro()) REJECT; }
        YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 159 "giscanner/scannerlexer.l"
-{ return CONST; }
+#line 160 "giscanner/scannerlexer.l"
+{ if (!parse_ignored_macro()) REJECT; }
        YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 160 "giscanner/scannerlexer.l"
-{ return EXTENSION; }
+#line 161 "giscanner/scannerlexer.l"
+{ return CONST; }
        YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 161 "giscanner/scannerlexer.l"
-{ return INLINE; }
+#line 162 "giscanner/scannerlexer.l"
+{ return EXTENSION; }
        YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 162 "giscanner/scannerlexer.l"
+#line 163 "giscanner/scannerlexer.l"
 { return INLINE; }
        YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 163 "giscanner/scannerlexer.l"
-{ if (!parse_ignored_macro()) REJECT; }
+#line 164 "giscanner/scannerlexer.l"
+{ return INLINE; }
        YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 164 "giscanner/scannerlexer.l"
-{ return SIGNED; }
+#line 165 "giscanner/scannerlexer.l"
+{ if (!parse_ignored_macro()) REJECT; }
        YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 165 "giscanner/scannerlexer.l"
-{ return RESTRICT; }
+#line 166 "giscanner/scannerlexer.l"
+{ /* Ignore */ }
        YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 166 "giscanner/scannerlexer.l"
-{ if (!parse_ignored_macro()) REJECT; }
+#line 167 "giscanner/scannerlexer.l"
+{ return SIGNED; }
        YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 167 "giscanner/scannerlexer.l"
-{ return VOLATILE; }
+#line 168 "giscanner/scannerlexer.l"
+{ return RESTRICT; }
        YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 168 "giscanner/scannerlexer.l"
-{ return VOLATILE; }
+#line 169 "giscanner/scannerlexer.l"
+{ return RESTRICT; }
        YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 169 "giscanner/scannerlexer.l"
-{ return BOOL; }
+#line 170 "giscanner/scannerlexer.l"
+{ if (!parse_ignored_macro()) REJECT; }
        YY_BREAK
 case 87:
 YY_RULE_SETUP
 #line 171 "giscanner/scannerlexer.l"
-{ return INTL_CONST; }
+{ return VOLATILE; }
        YY_BREAK
 case 88:
 YY_RULE_SETUP
 #line 172 "giscanner/scannerlexer.l"
-{ return INTUL_CONST; }
+{ return VOLATILE; }
        YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 174 "giscanner/scannerlexer.l"
-{ return BOOLEAN; }
+#line 173 "giscanner/scannerlexer.l"
+{ return BOOL; }
        YY_BREAK
 case 90:
 YY_RULE_SETUP
 #line 175 "giscanner/scannerlexer.l"
-{ return BOOLEAN; }
+{ return INTL_CONST; }
        YY_BREAK
 case 91:
 YY_RULE_SETUP
 #line 176 "giscanner/scannerlexer.l"
-{ return BOOLEAN; }
+{ return INTUL_CONST; }
        YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 177 "giscanner/scannerlexer.l"
+#line 178 "giscanner/scannerlexer.l"
 { return BOOLEAN; }
        YY_BREAK
 case 93:
 YY_RULE_SETUP
 #line 179 "giscanner/scannerlexer.l"
-{ if (scanner->macro_scan) return check_identifier(scanner, yytext); else REJECT; }
+{ return BOOLEAN; }
        YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 181 "giscanner/scannerlexer.l"
-{ if (!parse_ignored_macro()) REJECT; }
+#line 180 "giscanner/scannerlexer.l"
+{ return BOOLEAN; }
        YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 182 "giscanner/scannerlexer.l"
-{ return AUTO; }
+#line 181 "giscanner/scannerlexer.l"
+{ return BOOLEAN; }
        YY_BREAK
 case 96:
 YY_RULE_SETUP
 #line 183 "giscanner/scannerlexer.l"
-{ return BREAK; }
+{ if (scanner->macro_scan) return check_identifier(scanner, yytext); else REJECT; }
        YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 184 "giscanner/scannerlexer.l"
-{ return CASE; }
+#line 185 "giscanner/scannerlexer.l"
+{ if (!parse_ignored_macro()) REJECT; }
        YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 185 "giscanner/scannerlexer.l"
-{ return CHAR; }
+#line 186 "giscanner/scannerlexer.l"
+{ return AUTO; }
        YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 186 "giscanner/scannerlexer.l"
-{ return CONST; }
+#line 187 "giscanner/scannerlexer.l"
+{ return BREAK; }
        YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 187 "giscanner/scannerlexer.l"
-{ return CONTINUE; }
+#line 188 "giscanner/scannerlexer.l"
+{ return CASE; }
        YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 188 "giscanner/scannerlexer.l"
-{ return DEFAULT; }
+#line 189 "giscanner/scannerlexer.l"
+{ return CHAR; }
        YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 189 "giscanner/scannerlexer.l"
-{ return DO; }
+#line 190 "giscanner/scannerlexer.l"
+{ return CONST; }
        YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 190 "giscanner/scannerlexer.l"
-{ return DOUBLE; }
+#line 191 "giscanner/scannerlexer.l"
+{ return CONTINUE; }
        YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 191 "giscanner/scannerlexer.l"
-{ return ELSE; }
+#line 192 "giscanner/scannerlexer.l"
+{ return DEFAULT; }
        YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 192 "giscanner/scannerlexer.l"
-{ return ENUM; }
+#line 193 "giscanner/scannerlexer.l"
+{ return DO; }
        YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 193 "giscanner/scannerlexer.l"
-{ return EXTERN; }
+#line 194 "giscanner/scannerlexer.l"
+{ return DOUBLE; }
        YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 194 "giscanner/scannerlexer.l"
-{ return FLOAT; }
+#line 195 "giscanner/scannerlexer.l"
+{ return ELSE; }
        YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 195 "giscanner/scannerlexer.l"
-{ return FOR; }
+#line 196 "giscanner/scannerlexer.l"
+{ return ENUM; }
        YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 196 "giscanner/scannerlexer.l"
-{ return GOTO; }
+#line 197 "giscanner/scannerlexer.l"
+{ return EXTERN; }
        YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 197 "giscanner/scannerlexer.l"
-{ return IF; }
+#line 198 "giscanner/scannerlexer.l"
+{ return FLOAT; }
        YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 198 "giscanner/scannerlexer.l"
-{ return INLINE; }
+#line 199 "giscanner/scannerlexer.l"
+{ return FOR; }
        YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 199 "giscanner/scannerlexer.l"
-{ return INT; }
+#line 200 "giscanner/scannerlexer.l"
+{ return GOTO; }
        YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 200 "giscanner/scannerlexer.l"
-{ return INT; }
+#line 201 "giscanner/scannerlexer.l"
+{ return IF; }
        YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 201 "giscanner/scannerlexer.l"
-{ return INT; }
+#line 202 "giscanner/scannerlexer.l"
+{ return INLINE; }
        YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 202 "giscanner/scannerlexer.l"
+#line 203 "giscanner/scannerlexer.l"
 { return INT; }
        YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 203 "giscanner/scannerlexer.l"
+#line 204 "giscanner/scannerlexer.l"
 { return INT; }
        YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 204 "giscanner/scannerlexer.l"
-{ return LONG; }
+#line 205 "giscanner/scannerlexer.l"
+{ return INT; }
        YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 205 "giscanner/scannerlexer.l"
-{ return REGISTER; }
+#line 206 "giscanner/scannerlexer.l"
+{ return INT; }
        YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 206 "giscanner/scannerlexer.l"
-{ return RESTRICT; }
+#line 207 "giscanner/scannerlexer.l"
+{ return INT; }
        YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 207 "giscanner/scannerlexer.l"
-{ return RETURN; }
+#line 208 "giscanner/scannerlexer.l"
+{ return LONG; }
        YY_BREAK
 case 121:
 YY_RULE_SETUP
-#line 208 "giscanner/scannerlexer.l"
-{ return SHORT; }
+#line 209 "giscanner/scannerlexer.l"
+{ return REGISTER; }
        YY_BREAK
 case 122:
 YY_RULE_SETUP
-#line 209 "giscanner/scannerlexer.l"
-{ return SIGNED; }
+#line 210 "giscanner/scannerlexer.l"
+{ return RESTRICT; }
        YY_BREAK
 case 123:
 YY_RULE_SETUP
-#line 210 "giscanner/scannerlexer.l"
-{ return SIZEOF; }
+#line 211 "giscanner/scannerlexer.l"
+{ return RETURN; }
        YY_BREAK
 case 124:
 YY_RULE_SETUP
-#line 211 "giscanner/scannerlexer.l"
-{ return STATIC; }
+#line 212 "giscanner/scannerlexer.l"
+{ return SHORT; }
        YY_BREAK
 case 125:
 YY_RULE_SETUP
-#line 212 "giscanner/scannerlexer.l"
-{ return STRUCT; }
+#line 213 "giscanner/scannerlexer.l"
+{ return SIGNED; }
        YY_BREAK
 case 126:
 YY_RULE_SETUP
-#line 213 "giscanner/scannerlexer.l"
-{ return SWITCH; }
+#line 214 "giscanner/scannerlexer.l"
+{ return SIZEOF; }
        YY_BREAK
 case 127:
 YY_RULE_SETUP
-#line 214 "giscanner/scannerlexer.l"
-{ return TYPEDEF; }
+#line 215 "giscanner/scannerlexer.l"
+{ return STATIC; }
        YY_BREAK
 case 128:
 YY_RULE_SETUP
-#line 215 "giscanner/scannerlexer.l"
-{ return UNION; }
+#line 216 "giscanner/scannerlexer.l"
+{ return STRUCT; }
        YY_BREAK
 case 129:
 YY_RULE_SETUP
-#line 216 "giscanner/scannerlexer.l"
-{ return UNSIGNED; }
+#line 217 "giscanner/scannerlexer.l"
+{ return SWITCH; }
        YY_BREAK
 case 130:
 YY_RULE_SETUP
-#line 217 "giscanner/scannerlexer.l"
-{ return VOID; }
+#line 218 "giscanner/scannerlexer.l"
+{ return TYPEDEF; }
        YY_BREAK
 case 131:
 YY_RULE_SETUP
-#line 218 "giscanner/scannerlexer.l"
-{ return VOLATILE; }
+#line 219 "giscanner/scannerlexer.l"
+{ return UNION; }
        YY_BREAK
 case 132:
 YY_RULE_SETUP
-#line 219 "giscanner/scannerlexer.l"
-{ return WHILE; }
+#line 220 "giscanner/scannerlexer.l"
+{ return UNSIGNED; }
        YY_BREAK
 case 133:
 YY_RULE_SETUP
 #line 221 "giscanner/scannerlexer.l"
-{ return check_identifier(scanner, yytext); }
+{ return VOID; }
        YY_BREAK
 case 134:
 YY_RULE_SETUP
-#line 223 "giscanner/scannerlexer.l"
-{ return INTEGER; }
+#line 222 "giscanner/scannerlexer.l"
+{ return VOLATILE; }
        YY_BREAK
 case 135:
 YY_RULE_SETUP
-#line 224 "giscanner/scannerlexer.l"
-{ return INTEGER; }
+#line 223 "giscanner/scannerlexer.l"
+{ return WHILE; }
        YY_BREAK
 case 136:
 YY_RULE_SETUP
 #line 225 "giscanner/scannerlexer.l"
-{ return INTEGER; }
+{ return check_identifier(scanner, yytext); }
        YY_BREAK
 case 137:
 YY_RULE_SETUP
 #line 227 "giscanner/scannerlexer.l"
-{ return FLOATING; }
+{ return INTEGER; }
        YY_BREAK
 case 138:
 YY_RULE_SETUP
 #line 228 "giscanner/scannerlexer.l"
-{ return FLOATING; }
+{ return INTEGER; }
        YY_BREAK
 case 139:
-/* rule 139 can match eol */
 YY_RULE_SETUP
-#line 230 "giscanner/scannerlexer.l"
-{ return CHARACTER; }
+#line 229 "giscanner/scannerlexer.l"
+{ return INTEGER; }
        YY_BREAK
 case 140:
-/* rule 140 can match eol */
 YY_RULE_SETUP
 #line 231 "giscanner/scannerlexer.l"
-{ return CHARACTER; }
+{ return FLOATING; }
        YY_BREAK
 case 141:
-/* rule 141 can match eol */
 YY_RULE_SETUP
-#line 233 "giscanner/scannerlexer.l"
-{ return STRING; }
+#line 232 "giscanner/scannerlexer.l"
+{ return FLOATING; }
        YY_BREAK
 case 142:
 /* rule 142 can match eol */
 YY_RULE_SETUP
 #line 234 "giscanner/scannerlexer.l"
-{ return STRING; }
+{ return CHARACTER; }
        YY_BREAK
 case 143:
+/* rule 143 can match eol */
 YY_RULE_SETUP
-#line 236 "giscanner/scannerlexer.l"
-{ print_error(scanner); }
+#line 235 "giscanner/scannerlexer.l"
+{ return CHARACTER; }
        YY_BREAK
 case 144:
+/* rule 144 can match eol */
+YY_RULE_SETUP
+#line 237 "giscanner/scannerlexer.l"
+{ return STRING; }
+       YY_BREAK
+case 145:
+/* rule 145 can match eol */
 YY_RULE_SETUP
 #line 238 "giscanner/scannerlexer.l"
+{ return STRING; }
+       YY_BREAK
+case 146:
+YY_RULE_SETUP
+#line 240 "giscanner/scannerlexer.l"
+{ print_error(scanner); }
+       YY_BREAK
+case 147:
+YY_RULE_SETUP
+#line 242 "giscanner/scannerlexer.l"
 ECHO;
        YY_BREAK
-#line 2058 "scannerlexer.c"
+#line 2087 "scannerlexer.c"
                        case YY_STATE_EOF(INITIAL):
                                yyterminate();
 
@@ -2315,7 +2344,7 @@ static int yy_get_next_buffer (void)
                while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
                        {
                        yy_current_state = (int) yy_def[yy_current_state];
-                       if ( yy_current_state >= 576 )
+                       if ( yy_current_state >= 598 )
                                yy_c = yy_meta[(unsigned int) yy_c];
                        }
                yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2338,11 +2367,11 @@ static int yy_get_next_buffer (void)
        while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
                {
                yy_current_state = (int) yy_def[yy_current_state];
-               if ( yy_current_state >= 576 )
+               if ( yy_current_state >= 598 )
                        yy_c = yy_meta[(unsigned int) yy_c];
                }
        yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-       yy_is_jam = (yy_current_state == 575);
+       yy_is_jam = (yy_current_state == 597);
        if ( ! yy_is_jam )
                *(yy_state_ptr)++ = yy_current_state;
 
@@ -2985,7 +3014,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 238 "giscanner/scannerlexer.l"
+#line 242 "giscanner/scannerlexer.l"
 
 
 
index 580e800..439bf4e 100644 (file)
@@ -599,7 +599,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 INTROSPECTION_SCANNER = \
-    env PATH=.libs:$(PATH) \
+    env PATH=".libs:$(PATH)" \
         LPATH=.libs \
         CC="$(CC)" \
         PYTHONPATH=$(top_builddir):$(top_srcdir) \
@@ -616,7 +616,7 @@ INTROSPECTION_SCANNER_ARGS = \
     --add-include-path=$(top_builddir)
 
 INTROSPECTION_COMPILER = \
-    env PATH=.libs:$(PATH) \
+    env PATH=".libs:$(PATH)" \
         $(top_builddir)/g-ir-compiler$(EXEEXT)
 
 INTROSPECTION_COMPILER_ARGS = \
@@ -626,7 +626,7 @@ INTROSPECTION_COMPILER_ARGS = \
     --includedir=$(top_builddir)
 
 INTROSPECTION_DOCTOOL = \
-    env PATH=.libs:$(PATH) \
+    env PATH=".libs:$(PATH)" \
         LPATH=.libs \
         PYTHONPATH=$(top_builddir):$(top_srcdir) \
         UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
index 266df42..7eea691 100644 (file)
@@ -600,7 +600,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 INTROSPECTION_SCANNER = \
-    env PATH=.libs:$(PATH) \
+    env PATH=".libs:$(PATH)" \
         LPATH=.libs \
         CC="$(CC)" \
         PYTHONPATH=$(top_builddir):$(top_srcdir) \
@@ -617,7 +617,7 @@ INTROSPECTION_SCANNER_ARGS = \
     --add-include-path=$(top_builddir)
 
 INTROSPECTION_COMPILER = \
-    env PATH=.libs:$(PATH) \
+    env PATH=".libs:$(PATH)" \
         $(top_builddir)/g-ir-compiler$(EXEEXT)
 
 INTROSPECTION_COMPILER_ARGS = \
@@ -627,7 +627,7 @@ INTROSPECTION_COMPILER_ARGS = \
     --includedir=$(top_builddir)
 
 INTROSPECTION_DOCTOOL = \
-    env PATH=.libs:$(PATH) \
+    env PATH=".libs:$(PATH)" \
         LPATH=.libs \
         PYTHONPATH=$(top_builddir):$(top_srcdir) \
         UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
index d43d2ee..d502c46 100644 (file)
@@ -702,7 +702,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 INTROSPECTION_SCANNER = \
-    env PATH=.libs:$(PATH) \
+    env PATH=".libs:$(PATH)" \
         LPATH=.libs \
         CC="$(CC)" \
         PYTHONPATH=$(top_builddir):$(top_srcdir) \
@@ -716,7 +716,7 @@ INTROSPECTION_SCANNER_ARGS = --verbose -I$(top_srcdir) \
        --add-include-path=$(builddir) \
        --add-include-path=$(top_builddir) --warn-all
 INTROSPECTION_COMPILER = \
-    env PATH=.libs:$(PATH) \
+    env PATH=".libs:$(PATH)" \
         $(top_builddir)/g-ir-compiler$(EXEEXT)
 
 INTROSPECTION_COMPILER_ARGS = \
@@ -726,7 +726,7 @@ INTROSPECTION_COMPILER_ARGS = \
     --includedir=$(top_builddir)
 
 INTROSPECTION_DOCTOOL = \
-    env PATH=.libs:$(PATH) \
+    env PATH=".libs:$(PATH)" \
         LPATH=.libs \
         PYTHONPATH=$(top_builddir):$(top_srcdir) \
         UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
@@ -1,25 +1,14 @@
 <?xml version="1.0"?>
-<page id="Regress.AnAnonymousUnion.None"
+<page id="Regress.ANNOTATION_CALCULATED_DEFINE"
       type="topic"
       style="default"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="default" type="guide"/>
   </info>
-  <title>Regress.AnAnonymousUnion.None</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <title>Regress.ANNOTATION_CALCULATED_DEFINE</title>
+
+
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE.page b/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE.page
new file mode 100644 (file)
index 0000000..c8887ff
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.ANNOTATION_CALCULATED_LARGE"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.ANNOTATION_CALCULATED_LARGE</title>
+  <p>Constant to define a calculated large value</p>
+  <p>Since 1.4</p>
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page b/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page
new file mode 100644 (file)
index 0000000..08eda31
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.ANNOTATION_CALCULATED_LARGE_DIV"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.ANNOTATION_CALCULATED_LARGE_DIV</title>
+  <p>Constant to define a calculated large value</p>
+
+</page>
index e131f6f..f9a50a1 100644 (file)
@@ -6,20 +6,9 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.ATestError</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
index 9490e4a..097c37b 100644 (file)
@@ -6,20 +6,9 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="default" type="guide"/>
   </info>
   <title>Regress.AliasedTestBoxed</title>
-  
-  
-  
-    <p>Typedef TestBoxed to test caller-allocates correctness</p>
-  
-  
-  
-  
-  
-  
-  
+  <p>Typedef TestBoxed to test caller-allocates correctness</p>
+
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion-None.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion-None.page
new file mode 100644 (file)
index 0000000..bc24e5d
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.AnAnonymousUnion-None"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.AnAnonymousUnion" group="field" type="guide"/>
+  </info>
+  <title>Regress.AnAnonymousUnion->None</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion-x.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion-x.page
new file mode 100644 (file)
index 0000000..458ce06
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.AnAnonymousUnion-x"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.AnAnonymousUnion" group="field" type="guide"/>
+  </info>
+  <title>Regress.AnAnonymousUnion->x</title>
+
+
+</page>
index f9323c6..aa4ed24 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.AnAnonymousUnion"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.AnAnonymousUnion</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 4e19ef9..7964b3b 100644 (file)
@@ -1,25 +1,14 @@
 <?xml version="1.0"?>
 <page id="Regress.AnnotationBitfield"
-      type="topic"
-      style="default"
+      type="guide"
+      style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.AnnotationBitfield</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
index 9a652d8..d1f7d10 100644 (file)
@@ -1,25 +1,28 @@
 <?xml version="1.0"?>
 <page id="Regress.AnnotationCallback"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
-  </info>
+    <link xref="index" group="callback" type="guide"/>
+    </info>
   <title>Regress.AnnotationCallback</title>
-  
-  
-  
-    <p>This is a callback.</p>
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-csrc">
+const gint* AnnotationCallback (const gint* in);
+  </code></synopsis>
+  <p>This is a callback.</p>
+
+<terms>
+<item>
+<title><code>in</code></title>
+  <p>array of ints</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+  <p>array of ints</p>
+</item>
+</terms>
+
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields-arr.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields-arr.page
new file mode 100644 (file)
index 0000000..71a9afb
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.AnnotationFields-arr"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.AnnotationFields" group="field" type="guide"/>
+  </info>
+  <title>Regress.AnnotationFields->arr</title>
+  <p>an array of length @len</p>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields-field1.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields-field1.page
new file mode 100644 (file)
index 0000000..36204ad
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.AnnotationFields-field1"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.AnnotationFields" group="field" type="guide"/>
+  </info>
+  <title>Regress.AnnotationFields->field1</title>
+  <p>Some documentation</p>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields-len.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields-len.page
new file mode 100644 (file)
index 0000000..e56ec4f
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.AnnotationFields-len"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.AnnotationFields" group="field" type="guide"/>
+  </info>
+  <title>Regress.AnnotationFields->len</title>
+  <p>the length of array</p>
+
+</page>
index 74c6eab..50f9bc6 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.AnnotationFields"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.AnnotationFields</title>
-  
-  
-  
-    <p>This is a struct for testing field documentation and annotations</p>
-  
-  
-  
-  
-  
-  
-  
+  <p>This is a struct for testing field documentation and annotations</p>
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index db77a11..3feafad 100644 (file)
@@ -1,25 +1,38 @@
 <?xml version="1.0"?>
 <page id="Regress.AnnotationForeachFunc"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
-  </info>
+    <link xref="index" group="callback" type="guide"/>
+    </info>
   <title>Regress.AnnotationForeachFunc</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-csrc">
+void AnnotationForeachFunc (RegressAnnotationObject* object,
+                            const char* item,
+                            gpointer user_data);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>object</code></title>
+
+</item>
+<item>
+<title><code>item</code></title>
+
+</item>
+<item>
+<title><code>user_data</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index 79844c6..275feff 100644 (file)
@@ -1,25 +1,28 @@
 <?xml version="1.0"?>
 <page id="Regress.AnnotationListCallback"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
-  </info>
+    <link xref="index" group="callback" type="guide"/>
+    </info>
   <title>Regress.AnnotationListCallback</title>
-  
-  
-  
-    <p>This is a callback taking a list.</p>
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-csrc">
+GList* AnnotationListCallback (GList* in);
+  </code></synopsis>
+  <p>This is a callback taking a list.</p>
+
+<terms>
+<item>
+<title><code>in</code></title>
+  <p>list of strings</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+  <p>list of strings</p>
+</item>
+</terms>
+
 </page>
index 17c8029..e2e5880 100644 (file)
@@ -1,26 +1,29 @@
 <?xml version="1.0"?>
 <page id="Regress.AnnotationNotifyFunc"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
-  </info>
+    <link xref="index" group="callback" type="guide"/>
+    </info>
   <title>Regress.AnnotationNotifyFunc</title>
-  
-  
-  
-    <p>This is a callback with a 'closure' argument that is not named
+  <synopsis><code mime="text/x-csrc">
+void AnnotationNotifyFunc (gpointer data);
+  </code></synopsis>
+  <p>This is a callback with a 'closure' argument that is not named
 'user_data' and hence has to be annotated.</p>
-  
-  
-  
-  
-  
-  
-  
+
+<terms>
+<item>
+<title><code>data</code></title>
+  <p>The user data</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index 64e30a6..8f63763 100644 (file)
@@ -6,39 +6,29 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="signal" type="guide"/>
     <title type="link" role="topic">attribute-signal</title>
-
   </info>
   <title>Regress.AnnotationObject::attribute-signal</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gchar* attribute-signal (gchar* arg1,
                          gchar* arg2);
-</code></synopsis>
+  </code></synopsis>
+  <p>This signal tests a signal with attributes.</p>
 
-  
-    <p>This signal tests a signal with attributes.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>arg1</code></title>
-<p>a value</p>
+  <p>a value</p>
 </item>
 <item>
 <title><code>arg2</code></title>
-<p>another value</p>
+  <p>another value</p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>the return value</p>
+  <p>the return value</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 48acac5..f42b7d3 100644 (file)
@@ -6,23 +6,15 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="signal" type="guide"/>
     <title type="link" role="topic">doc-empty-arg-parsing</title>
-
   </info>
   <title>Regress.AnnotationObject::doc-empty-arg-parsing</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void doc-empty-arg-parsing (gpointer arg1);
-</code></synopsis>
+  </code></synopsis>
+  <p>This signal tests an empty document argument (<code>arg1</code>)</p>
 
-  
-    <p>This signal tests an empty document argument (<code>arg1</code>)</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>arg1</code></title>
@@ -34,6 +26,4 @@ void doc-empty-arg-parsing (gpointer arg1);
 </item>
 </terms>
 
-  
-  
 </page>
index bd640b5..075d072 100644 (file)
@@ -6,21 +6,10 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="property" type="guide"/>
     <title type="link" role="topic">function-property</title>
-
   </info>
   <title>Regress.AnnotationObject:function-property</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
index 29ad584..2893385 100644 (file)
@@ -6,28 +6,20 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="signal" type="guide"/>
     <title type="link" role="topic">list-signal</title>
-
   </info>
   <title>Regress.AnnotationObject::list-signal</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void list-signal (gpointer list);
-</code></synopsis>
-
-  
-    <p>This is a signal which takes a list of strings, but it's not
+  </code></synopsis>
+  <p>This is a signal which takes a list of strings, but it's not
 known by GObject as it's only marked as G_TYPE_POINTER</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>list</code></title>
-<p>a list of strings</p>
+  <p>a list of strings</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ known by GObject as it's only marked as G_TYPE_POINTER</p>
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-parent_instance.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-parent_instance.page
new file mode 100644 (file)
index 0000000..97f17cd
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.AnnotationObject-parent_instance"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.AnnotationObject" group="field" type="guide"/>
+  </info>
+  <title>Regress.AnnotationObject->parent_instance</title>
+
+
+</page>
index 70b80ae..23ae488 100644 (file)
@@ -6,22 +6,10 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="property" type="guide"/>
     <title type="link" role="topic">string-property</title>
-
   </info>
   <title>Regress.AnnotationObject:string-property</title>
-  
-  
-  
-    <p>This is a property which is a string</p>
-  
-  
-    <p>Since 1.0</p>
-  
-  
-  
-  
-  
+  <p>This is a property which is a string</p>
+  <p>Since 1.0</p>
 </page>
index e25d2bb..88317ee 100644 (file)
@@ -6,29 +6,20 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="signal" type="guide"/>
     <title type="link" role="topic">string-signal</title>
-
   </info>
   <title>Regress.AnnotationObject::string-signal</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void string-signal (gpointer string);
-</code></synopsis>
-
-  
-    <p>This is a signal which has a broken signal handler,
+  </code></synopsis>
+  <p>This is a signal which has a broken signal handler,
 it says it's pointer but it's actually a string.</p>
-  
-  
-    <p>Since 1.0</p>
-  
-  
+  <p>Since 1.0</p>
 <terms>
 <item>
 <title><code>string</code></title>
-<p>a string</p>
+  <p>a string</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -36,6 +27,4 @@ it says it's pointer but it's actually a string.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 446729b..d4914db 100644 (file)
@@ -6,23 +6,11 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="property" type="guide"/>
     <title type="link" role="topic">tab-property</title>
-
   </info>
   <title>Regress.AnnotationObject:tab-property</title>
-  
-  
-  
-    <p>This is a property annotation intentionally indented with a mix
+  <p>This is a property annotation intentionally indented with a mix
 of tabs and strings to test the tab handling capabilities of the scanner.</p>
-  
-  
-    <p>Since 1.2</p>
-  
-  
-  
-  
-  
+  <p>Since 1.2</p>
 </page>
index 1d553fd..8fac991 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>somearg</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_object_allow_none</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GObject* regress_annotation_object_allow_none (RegressAnnotationObject* object,
                                                const gchar* somearg);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>somearg</code></title>
@@ -48,10 +40,8 @@ GObject* regress_annotation_object_allow_none (RegressAnnotationObject* object,
 </item>
 <item>
 <title><code>Returns</code></title>
-<p><code>NULL</code> always</p>
+  <p><code>NULL</code> always</p>
 </item>
 </terms>
 
-  
-  
 </page>
index fc1758b..f8b9393 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>toown</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_object_calleeowns</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gint regress_annotation_object_calleeowns (RegressAnnotationObject* object,
                                            GObject** toown);
-</code></synopsis>
+  </code></synopsis>
+  <p>This is a test for out arguments; GObject defaults to transfer</p>
 
-  
-    <p>This is a test for out arguments; GObject defaults to transfer</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>toown</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>an int</p>
+  <p>an int</p>
 </item>
 </terms>
 
-  
-  
 </page>
index f168030..36d6b60 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>toown2</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_object_calleesowns</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gint regress_annotation_object_calleesowns (RegressAnnotationObject* object,
                                             GObject** toown1,
                                             GObject** toown2);
-</code></synopsis>
+  </code></synopsis>
+  <p>This is a test for out arguments, one transferred, other not</p>
 
-  
-    <p>This is a test for out arguments, one transferred, other not</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>toown1</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>toown2</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>an int</p>
+  <p>an int</p>
 </item>
 </terms>
 
-  
-  
 </page>
index eaf0040..38a7d66 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>nums</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_object_compute_sum</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_annotation_object_compute_sum (RegressAnnotationObject* object,
                                             int* nums);
-</code></synopsis>
+  </code></synopsis>
+  <p>Test taking a zero-terminated array</p>
 
-  
-    <p>Test taking a zero-terminated array</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>nums</code></title>
-<p>Sequence of numbers</p>
+  <p>Sequence of numbers</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -52,6 +44,4 @@ void regress_annotation_object_compute_sum (RegressAnnotationObject* object,
 </item>
 </terms>
 
-  
-  
 </page>
index 91ebe4b..38c0bcb 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>n_nums</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_object_compute_sum_n</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_annotation_object_compute_sum_n (RegressAnnotationObject* object,
                                               int* nums,
                                               int n_nums);
-</code></synopsis>
+  </code></synopsis>
+  <p>Test taking an array with length parameter</p>
 
-  
-    <p>Test taking an array with length parameter</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>nums</code></title>
-<p>Sequence of
+  <p>Sequence of
   numbers that are zero-terminated</p>
 </item>
 <item>
 <title><code>n_nums</code></title>
-<p>Length of number array</p>
+  <p>Length of number array</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -62,6 +54,4 @@ void regress_annotation_object_compute_sum_n (RegressAnnotationObject* object,
 </item>
 </terms>
 
-  
-  
 </page>
index 7f5b0cf..09be2a0 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>n_nums</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_object_compute_sum_nz</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_annotation_object_compute_sum_nz (RegressAnnotationObject* object,
                                                int* nums,
                                                int n_nums);
-</code></synopsis>
+  </code></synopsis>
+  <p>Test taking a zero-terminated array with length parameter</p>
 
-  
-    <p>Test taking a zero-terminated array with length parameter</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
-<p>a <link xref="Regress.AnnotationObject"/></p>
+  <p>a <link xref="Regress.AnnotationObject"/></p>
 </item>
 <item>
 <title><code>nums</code></title>
-<p>Sequence of numbers that
+  <p>Sequence of numbers that
 are zero-terminated</p>
 </item>
 <item>
 <title><code>n_nums</code></title>
-<p>Length of number array</p>
+  <p>Length of number array</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -62,6 +54,4 @@ are zero-terminated</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 6ad744b..e485b87 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>object</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_object_create_object</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GObject* regress_annotation_object_create_object (RegressAnnotationObject* object);
-</code></synopsis>
+  </code></synopsis>
+  <p>Test returning a caller-owned object</p>
 
-  
-    <p>Test returning a caller-owned object</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>The object</p>
+  <p>The object</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 4d651ca..a70e335 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>object</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_object_do_not_use</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GObject* regress_annotation_object_do_not_use (RegressAnnotationObject* object);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p><code>NULL</code> always</p>
+  <p><code>NULL</code> always</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 809ebd2..a21e323 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>object</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_object_extra_annos</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_annotation_object_extra_annos (RegressAnnotationObject* object);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
@@ -43,6 +35,4 @@ void regress_annotation_object_extra_annos (RegressAnnotationObject* object);
 </item>
 </terms>
 
-  
-  
 </page>
index f74ca97..4dd7967 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>user_data</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_object_foreach</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_annotation_object_foreach (RegressAnnotationObject* object,
                                         RegressAnnotationForeachFunc func,
                                         gpointer user_data);
-</code></synopsis>
+  </code></synopsis>
+  <p>Test taking a call-scoped callback</p>
 
-  
-    <p>Test taking a call-scoped callback</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
-<p>a <link xref="Regress.AnnotationObject"/></p>
+  <p>a <link xref="Regress.AnnotationObject"/></p>
 </item>
 <item>
 <title><code>func</code></title>
-<p>Callback to invoke</p>
+  <p>Callback to invoke</p>
 </item>
 <item>
 <title><code>user_data</code></title>
-<p>Callback user data</p>
+  <p>Callback user data</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -61,6 +53,4 @@ void regress_annotation_object_foreach (RegressAnnotationObject* object,
 </item>
 </terms>
 
-  
-  
 </page>
index 6cc123b..514b23d 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>object</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_object_get_hash</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GHashTable* regress_annotation_object_get_hash (RegressAnnotationObject* object);
-</code></synopsis>
-
-  
-    <p>This is a test for returning a hash table mapping strings to
+  </code></synopsis>
+  <p>This is a test for returning a hash table mapping strings to
 objects.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>object</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>hash table</p>
+  <p>hash table</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 3021ce5..e01d092 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>object</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_object_get_objects</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GSList* regress_annotation_object_get_objects (RegressAnnotationObject* object);
-</code></synopsis>
-
-  
-    <p>This is a test for returning a list of objects.
+  </code></synopsis>
+  <p>This is a test for returning a list of objects.
 The list itself should be freed, but not the internal objects,
 intentionally similar example to gtk_container_get_children</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>object</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>list of objects</p>
+  <p>list of objects</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 62087b0..739a119 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>object</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_object_get_strings</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GList* regress_annotation_object_get_strings (RegressAnnotationObject* object);
-</code></synopsis>
-
-  
-    <p>This is a test for returning a list of strings, where
+  </code></synopsis>
+  <p>This is a test for returning a list of strings, where
 each string needs to be freed.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>object</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>list of strings</p>
+  <p>list of strings</p>
 </item>
 </terms>
 
-  
-  
 </page>
index f1696c0..dae414e 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>object</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_object_hidden_self</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_annotation_object_hidden_self (gpointer object);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
-<p>A <link xref="Regress.AnnotationObject"/></p>
+  <p>A <link xref="Regress.AnnotationObject"/></p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -43,6 +35,4 @@ void regress_annotation_object_hidden_self (gpointer object);
 </item>
 </terms>
 
-  
-  
 </page>
index ef1f430..a741e9a 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>inarg</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_object_in</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gint regress_annotation_object_in (RegressAnnotationObject* object,
                                    int* inarg);
-</code></synopsis>
+  </code></synopsis>
+  <p>This is a test for in arguments</p>
 
-  
-    <p>This is a test for in arguments</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>inarg</code></title>
-<p>This is an argument test</p>
+  <p>This is an argument test</p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>an int</p>
+  <p>an int</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 0e95829..b9cbfe8 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>inoutarg</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_object_inout</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gint regress_annotation_object_inout (RegressAnnotationObject* object,
                                       int* inoutarg);
-</code></synopsis>
+  </code></synopsis>
+  <p>This is a test for out arguments</p>
 
-  
-    <p>This is a test for out arguments</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>inoutarg</code></title>
-<p>This is an argument test</p>
+  <p>This is an argument test</p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>an int</p>
+  <p>an int</p>
 </item>
 </terms>
 
-  
-  
 </page>
index cae38e5..f4f9638 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>inoutarg</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_object_inout2</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gint regress_annotation_object_inout2 (RegressAnnotationObject* object,
                                        int* inoutarg);
-</code></synopsis>
+  </code></synopsis>
+  <p>This is a second test for out arguments</p>
 
-  
-    <p>This is a second test for out arguments</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>inoutarg</code></title>
-<p>This is an argument test</p>
+  <p>This is an argument test</p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>an int</p>
+  <p>an int</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 8ca35f3..d000434 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>inoutarg</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_object_inout3</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gint regress_annotation_object_inout3 (RegressAnnotationObject* object,
                                        int* inoutarg);
-</code></synopsis>
+  </code></synopsis>
+  <p>This is a 3th test for out arguments</p>
 
-  
-    <p>This is a 3th test for out arguments</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>inoutarg</code></title>
-<p>This is an argument test</p>
+  <p>This is an argument test</p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>an int</p>
+  <p>an int</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 8f0e187..1558a2b 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>object</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_object_method</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gint regress_annotation_object_method (RegressAnnotationObject* object);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>an int</p>
+  <p>an int</p>
 </item>
 </terms>
 
-  
-  
 </page>
index de87deb..7cc6002 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>object</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_object_notrans</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GObject* regress_annotation_object_notrans (RegressAnnotationObject* object);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>An object, not referenced</p>
+  <p>An object, not referenced</p>
 </item>
 </terms>
 
-  
-  
 </page>
index d244433..90f4bcf 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>outarg</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_object_out</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gint regress_annotation_object_out (RegressAnnotationObject* object,
                                     int* outarg);
-</code></synopsis>
+  </code></synopsis>
+  <p>This is a test for out arguments</p>
 
-  
-    <p>This is a test for out arguments</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>outarg</code></title>
-<p>This is an argument test</p>
+  <p>This is an argument test</p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>an int</p>
+  <p>an int</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 80d4339..2851d7e 100644 (file)
@@ -6,19 +6,11 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.AnnotationObject</title>
-  
-  
-  
-    <p>This is an object used to test annotations.</p>
-  
-  
-  
-  
+  <p>This is an object used to test annotations.</p>
+
   <synopsis>
     <title>Hierarchy</title>
     <tree>
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-csrc"
          groups="method" style="linklist">
@@ -40,7 +35,7 @@
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-csrc"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
index 2fa9f09..928e980 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>argv</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_object_parse_args</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_annotation_object_parse_args (RegressAnnotationObject* object,
                                            int* argc,
                                            char*** argv);
-</code></synopsis>
+  </code></synopsis>
+  <p>Test taking a zero-terminated array with length parameter</p>
 
-  
-    <p>Test taking a zero-terminated array with length parameter</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
-<p>a <link xref="Regress.AnnotationObject"/></p>
+  <p>a <link xref="Regress.AnnotationObject"/></p>
 </item>
 <item>
 <title><code>argc</code></title>
-<p>Length of the argument vector</p>
+  <p>Length of the argument vector</p>
 </item>
 <item>
 <title><code>argv</code></title>
-<p>Argument vector</p>
+  <p>Argument vector</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -61,6 +53,4 @@ void regress_annotation_object_parse_args (RegressAnnotationObject* object,
 </item>
 </terms>
 
-  
-  
 </page>
index a52c0ff..dd49cf0 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>length</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_object_set_data</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_annotation_object_set_data (RegressAnnotationObject* object,
                                          guchar* data,
                                          gsize length);
-</code></synopsis>
+  </code></synopsis>
+  <p>Test taking a guchar * with a length.</p>
 
-  
-    <p>Test taking a guchar * with a length.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
-<p>a <link xref="Regress.AnnotationObject"/></p>
+  <p>a <link xref="Regress.AnnotationObject"/></p>
 </item>
 <item>
 <title><code>data</code></title>
-<p>The data</p>
+  <p>The data</p>
 </item>
 <item>
 <title><code>length</code></title>
-<p>Length of the data</p>
+  <p>Length of the data</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -61,6 +53,4 @@ void regress_annotation_object_set_data (RegressAnnotationObject* object,
 </item>
 </terms>
 
-  
-  
 </page>
index dd72420..345be7f 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>length</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_object_set_data2</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_annotation_object_set_data2 (RegressAnnotationObject* object,
                                           gint8* data,
                                           gsize length);
-</code></synopsis>
+  </code></synopsis>
+  <p>Test taking a gchar * with a length.</p>
 
-  
-    <p>Test taking a gchar * with a length.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
-<p>a <link xref="Regress.AnnotationObject"/></p>
+  <p>a <link xref="Regress.AnnotationObject"/></p>
 </item>
 <item>
 <title><code>data</code></title>
-<p>The data</p>
+  <p>The data</p>
 </item>
 <item>
 <title><code>length</code></title>
-<p>Length of the data</p>
+  <p>Length of the data</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -61,6 +53,4 @@ void regress_annotation_object_set_data2 (RegressAnnotationObject* object,
 </item>
 </terms>
 
-  
-  
 </page>
index 86666ef..ce904c6 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>length</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_object_set_data3</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_annotation_object_set_data3 (RegressAnnotationObject* object,
                                           guint8* data,
                                           gsize length);
-</code></synopsis>
-
-  
-    <p>Test taking a gchar * with a length, overriding the array element
+  </code></synopsis>
+  <p>Test taking a gchar * with a length, overriding the array element
 type.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>object</code></title>
-<p>a <link xref="Regress.AnnotationObject"/></p>
+  <p>a <link xref="Regress.AnnotationObject"/></p>
 </item>
 <item>
 <title><code>data</code></title>
-<p>The data</p>
+  <p>The data</p>
 </item>
 <item>
 <title><code>length</code></title>
-<p>Length of the data</p>
+  <p>Length of the data</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -62,6 +54,4 @@ type.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index a70d477..6fec0d7 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>str_out</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_object_string_out</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gboolean regress_annotation_object_string_out (RegressAnnotationObject* object,
                                                char** str_out);
-</code></synopsis>
+  </code></synopsis>
+  <p>Test returning a string as an out parameter</p>
 
-  
-    <p>Test returning a string as an out parameter</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
-<p>a <link xref="Regress.AnnotationObject"/></p>
+  <p>a <link xref="Regress.AnnotationObject"/></p>
 </item>
 <item>
 <title><code>str_out</code></title>
-<p>string return value</p>
+  <p>string return value</p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>some boolean</p>
+  <p>some boolean</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 3228007..4ef5cb7 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>bytes</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_object_use_buffer</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_annotation_object_use_buffer (RegressAnnotationObject* object,
                                            guchar* bytes);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>bytes</code></title>
@@ -52,6 +44,4 @@ void regress_annotation_object_use_buffer (RegressAnnotationObject* object,
 </item>
 </terms>
 
-  
-  
 </page>
index 76402aa..6052118 100644 (file)
@@ -6,13 +6,12 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>void</api:type>
       </api:returns>
-      <api:name>regress_annotation_object_watch</api:name>
+      <api:name>regress_annotation_object_watch_full</api:name>
       <api:arg>
         <api:type>RegressAnnotationObject*</api:type>
         <api:name>object</api:name>
         <api:type>gpointer</api:type>
         <api:name>user_data</api:name>
       </api:arg>
+      <api:arg>
+        <api:type>GDestroyNotify</api:type>
+        <api:name>destroy</api:name>
+      </api:arg>
     </api:function>
-
   </info>
-  <title>regress_annotation_object_watch</title>
-  
-<synopsis><code mime="text/x-csrc">
-void regress_annotation_object_watch (RegressAnnotationObject* object,
-                                      RegressAnnotationForeachFunc func,
-                                      gpointer user_data);
-</code></synopsis>
+  <title>regress_annotation_object_watch_full</title>
+  <synopsis><code mime="text/x-csrc">
+void regress_annotation_object_watch_full (RegressAnnotationObject* object,
+                                           RegressAnnotationForeachFunc func,
+                                           gpointer user_data,
+                                           GDestroyNotify destroy);
+  </code></synopsis>
+  <p>Test overriding via the "Rename To" annotation.</p>
 
-  
-    <p>This is here just for the sake of being overriden by its
-<link xref="Regress.watch_full"/>.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
-<p>A <link xref="Regress.AnnotationObject"/></p>
+  <p>A <link xref="Regress.AnnotationObject"/></p>
 </item>
 <item>
 <title><code>func</code></title>
-<p>The callback</p>
+  <p>The callback</p>
 </item>
 <item>
 <title><code>user_data</code></title>
-<p>The callback data</p>
+  <p>The callback data</p>
+</item>
+<item>
+<title><code>destroy</code></title>
+  <p>Destroy notification</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -62,6 +62,4 @@ void regress_annotation_object_watch (RegressAnnotationObject* object,
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page
deleted file mode 100644 (file)
index 1fe2080..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.AnnotationObject.watch_full"
-      type="topic"
-      style="method"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-    <link xref="Regress.AnnotationObject" group="method" type="guide"/>
-    <api:function>
-      <api:returns>
-        <api:type>void</api:type>
-      </api:returns>
-      <api:name>regress_annotation_object_watch_full</api:name>
-      <api:arg>
-        <api:type>RegressAnnotationObject*</api:type>
-        <api:name>object</api:name>
-      </api:arg>
-      <api:arg>
-        <api:type>RegressAnnotationForeachFunc</api:type>
-        <api:name>func</api:name>
-      </api:arg>
-      <api:arg>
-        <api:type>gpointer</api:type>
-        <api:name>user_data</api:name>
-      </api:arg>
-      <api:arg>
-        <api:type>GDestroyNotify</api:type>
-        <api:name>destroy</api:name>
-      </api:arg>
-    </api:function>
-
-  </info>
-  <title>regress_annotation_object_watch_full</title>
-  
-<synopsis><code mime="text/x-csrc">
-void regress_annotation_object_watch_full (RegressAnnotationObject* object,
-                                           RegressAnnotationForeachFunc func,
-                                           gpointer user_data,
-                                           GDestroyNotify destroy);
-</code></synopsis>
-
-  
-    <p>Test overriding via the "Rename To" annotation.</p>
-  
-  
-  
-  
-<terms>
-<item>
-<title><code>object</code></title>
-<p>A <link xref="Regress.AnnotationObject"/></p>
-</item>
-<item>
-<title><code>func</code></title>
-<p>The callback</p>
-</item>
-<item>
-<title><code>user_data</code></title>
-<p>The callback data</p>
-</item>
-<item>
-<title><code>destroy</code></title>
-<p>Destroy notification</p>
-</item>
-<item>
-<title><code>Returns</code></title>
-
-</item>
-</terms>
-
-  
-  
-</page>
index ef9436e..5b21ead 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>data</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_object_with_voidp</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_annotation_object_with_voidp (RegressAnnotationObject* object,
                                            void* data);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
@@ -44,7 +36,7 @@ void regress_annotation_object_with_voidp (RegressAnnotationObject* object,
 </item>
 <item>
 <title><code>data</code></title>
-<p>Opaque pointer handle</p>
+  <p>Opaque pointer handle</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -52,6 +44,4 @@ void regress_annotation_object_with_voidp (RegressAnnotationObject* object,
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObjectClass-parent_class.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObjectClass-parent_class.page
new file mode 100644 (file)
index 0000000..2b52122
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.AnnotationObjectClass-parent_class"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.AnnotationObjectClass" group="field" type="guide"/>
+  </info>
+  <title>Regress.AnnotationObjectClass->parent_class</title>
+
+
+</page>
index 28b8a71..faa43dc 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.AnnotationObjectClass"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.AnnotationObjectClass</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationStruct-objects.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationStruct-objects.page
new file mode 100644 (file)
index 0000000..f1498fc
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.AnnotationStruct-objects"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.AnnotationStruct" group="field" type="guide"/>
+  </info>
+  <title>Regress.AnnotationStruct->objects</title>
+
+
+</page>
index 341362a..d3af464 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.AnnotationStruct"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.AnnotationStruct</title>
-  
-  
-  
-    <p>This is a test of an array of object in an field of a struct.</p>
-  
-  
-  
-  
-  
-  
-  
+  <p>This is a test of an array of object in an field of a struct.</p>
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
@@ -1,25 +1,14 @@
 <?xml version="1.0"?>
-<page id="Regress.AnAnonymousUnion.None"
+<page id="Regress.BOOL_CONSTANT"
       type="topic"
       style="default"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="default" type="guide"/>
   </info>
-  <title>Regress.AnAnonymousUnion.None</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <title>Regress.BOOL_CONSTANT</title>
+
+
 </page>
@@ -1,25 +1,14 @@
 <?xml version="1.0"?>
-<page id="Regress.AnAnonymousUnion.None"
+<page id="Regress.DOUBLE_CONSTANT"
       type="topic"
       style="default"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="default" type="guide"/>
   </info>
-  <title>Regress.AnAnonymousUnion.None</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <title>Regress.DOUBLE_CONSTANT</title>
+
+
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page b/tests/scanner/Regress-1.0-C-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page
new file mode 100644 (file)
index 0000000..09b1561
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FOO_DEFINE_SHOULD_BE_EXPOSED"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.FOO_DEFINE_SHOULD_BE_EXPOSED</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FOO_PIE_IS_TASTY.page b/tests/scanner/Regress-1.0-C-expected/Regress.FOO_PIE_IS_TASTY.page
new file mode 100644 (file)
index 0000000..132f508
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FOO_PIE_IS_TASTY"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.FOO_PIE_IS_TASTY</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FOO_SUCCESS_INT.page b/tests/scanner/Regress-1.0-C-expected/Regress.FOO_SUCCESS_INT.page
new file mode 100644 (file)
index 0000000..58650ec
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FOO_SUCCESS_INT"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.FOO_SUCCESS_INT</title>
+
+
+</page>
index 39ebf9c..adc4f20 100644 (file)
@@ -6,20 +6,9 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.FooASingle</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
index 717b501..98056a5 100644 (file)
@@ -6,20 +6,9 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.FooAddressType</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect-x.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect-x.page
new file mode 100644 (file)
index 0000000..b444125
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooBRect-x"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooBRect" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooBRect->x</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect-y.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect-y.page
new file mode 100644 (file)
index 0000000..8d7b0f1
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooBRect-y"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooBRect" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooBRect->y</title>
+
+
+</page>
index 38eae39..854ef78 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooBRect" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>b2</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_brect_add</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_foo_brect_add (RegressFooBRect* b1,
                             RegressFooBRect* b2);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>b1</code></title>
@@ -52,6 +44,4 @@ void regress_foo_brect_add (RegressFooBRect* b1,
 </item>
 </terms>
 
-  
-  
 </page>
index 3ca2281..0a7caf0 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooBRect" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>y</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_brect_new</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressFooBRect* regress_foo_brect_new (double x,
                                         double y);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>x</code></title>
@@ -52,6 +44,4 @@ RegressFooBRect* regress_foo_brect_new (double x,
 </item>
 </terms>
 
-  
-  
 </page>
index abd6b03..2f6a48d 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.FooBRect"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooBRect</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion-rect.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion-rect.page
new file mode 100644 (file)
index 0000000..1c7cead
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooBUnion-rect"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooBUnion" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooBUnion->rect</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion-type.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion-type.page
new file mode 100644 (file)
index 0000000..6fdd489
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooBUnion-type"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooBUnion" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooBUnion->type</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion-v.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion-v.page
new file mode 100644 (file)
index 0000000..0a39062
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooBUnion-v"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooBUnion" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooBUnion->v</title>
+
+
+</page>
index 1ee353f..3ff48f7 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooBUnion" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>bunion</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_bunion_get_contained_type</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 int regress_foo_bunion_get_contained_type (RegressFooBUnion* bunion);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>bunion</code></title>
@@ -43,6 +35,4 @@ int regress_foo_bunion_get_contained_type (RegressFooBUnion* bunion);
 </item>
 </terms>
 
-  
-  
 </page>
index b760f20..ca979f7 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooBUnion" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_bunion_new</api:name>
     </api:function>
-
   </info>
   <title>regress_foo_bunion_new</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressFooBUnion* regress_foo_bunion_new (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ RegressFooBUnion* regress_foo_bunion_new (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 8644d96..2398703 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.FooBUnion"
-      type="topic"
-      style="default"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooBUnion</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 7483641..b999962 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooBoxed" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>boxed</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_boxed_method</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_foo_boxed_method (RegressFooBoxed* boxed);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>boxed</code></title>
@@ -43,6 +35,4 @@ void regress_foo_boxed_method (RegressFooBoxed* boxed);
 </item>
 </terms>
 
-  
-  
 </page>
index 3e3e4f9..7a92963 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooBoxed" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_boxed_new</api:name>
     </api:function>
-
   </info>
   <title>regress_foo_boxed_new</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressFooBoxed* regress_foo_boxed_new (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ RegressFooBoxed* regress_foo_boxed_new (void);
 </item>
 </terms>
 
-  
-  
 </page>
index e711c3e..82b56c8 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.FooBoxed"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooBoxed</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 267ddcb..4eb0b4d 100644 (file)
@@ -6,19 +6,11 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooBuffer</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
   <synopsis>
     <title>Hierarchy</title>
     <tree>
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-csrc"
          groups="method" style="linklist">
@@ -43,7 +38,7 @@
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-csrc"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
index 6f6469d..594c564 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooBuffer" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>buffer</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_buffer_some_method</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_foo_buffer_some_method (RegressFooBuffer* buffer);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>buffer</code></title>
@@ -43,6 +35,4 @@ void regress_foo_buffer_some_method (RegressFooBuffer* buffer);
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBufferClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBufferClass.page
new file mode 100644 (file)
index 0000000..dd411f7
--- /dev/null
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<page id="Regress.FooBufferClass"
+      type="guide"
+      style="class"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="class" type="guide"/>
+  </info>
+  <title>Regress.FooBufferClass</title>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
+</page>
index 52feda2..67ea939 100644 (file)
@@ -1,25 +1,38 @@
 <?xml version="1.0"?>
 <page id="Regress.FooCallback"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
-  </info>
+    <link xref="index" group="callback" type="guide"/>
+    </info>
   <title>Regress.FooCallback</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-csrc">
+gboolean FooCallback (RegressFooObject* regress_foo,
+                      gboolean b,
+                      gpointer data);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>regress_foo</code></title>
+
+</item>
+<item>
+<title><code>b</code></title>
+
+</item>
+<item>
+<title><code>data</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index 8694337..3335ed5 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooDBusData" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>dbusdata</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_dbus_data_method</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_foo_dbus_data_method (RegressFooDBusData* dbusdata);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>dbusdata</code></title>
@@ -43,6 +35,4 @@ void regress_foo_dbus_data_method (RegressFooDBusData* dbusdata);
 </item>
 </terms>
 
-  
-  
 </page>
index 09050e7..8c8016a 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.FooDBusData"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooDBusData</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 80f6c3b..0427ba6 100644 (file)
@@ -6,20 +6,9 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.FooEnumFullname</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
index b3c71a6..803a5e7 100644 (file)
@@ -6,20 +6,9 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.FooEnumNoType</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
index 6ecf2dd..43ac529 100644 (file)
@@ -6,8 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.FooEnumType" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>int</api:type>
         <api:name>regress_foo_enum</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_enum_type_method</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 int regress_foo_enum_type_method (RegressFooEnumType regress_foo_enum);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>regress_foo_enum</code></title>
@@ -43,6 +35,4 @@ int regress_foo_enum_type_method (RegressFooEnumType regress_foo_enum);
 </item>
 </terms>
 
-  
-  
 </page>
index 6dd3491..52aaf30 100644 (file)
@@ -6,20 +6,9 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.FooEnumType</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
index aa0c6c1..96a0003 100644 (file)
@@ -6,8 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.FooEnumType" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>RegressFooEnumType</api:type>
         <api:name>x</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_enum_type_returnv</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressFooEnumType regress_foo_enum_type_returnv (int x);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>x</code></title>
@@ -43,6 +35,4 @@ RegressFooEnumType regress_foo_enum_type_returnv (int x);
 </item>
 </terms>
 
-  
-  
 </page>
index 79bb9d2..6848fb2 100644 (file)
@@ -6,20 +6,9 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.FooError</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
index dde46fb..fb8559c 100644 (file)
@@ -6,28 +6,20 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.FooError" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>GQuark</api:type>
       </api:returns>
       <api:name>regress_foo_error_quark</api:name>
     </api:function>
-
   </info>
   <title>regress_foo_error_quark</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GQuark regress_foo_error_quark (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ GQuark regress_foo_error_quark (void);
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent-any.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent-any.page
new file mode 100644 (file)
index 0000000..aab09bd
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooEvent-any"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooEvent" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooEvent->any</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent-expose.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent-expose.page
new file mode 100644 (file)
index 0000000..58dc674
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooEvent-expose"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooEvent" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooEvent->expose</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent-type.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent-type.page
new file mode 100644 (file)
index 0000000..d9ea332
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooEvent-type"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooEvent" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooEvent->type</title>
+
+
+</page>
index ce36830..98f2344 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.FooEvent"
-      type="topic"
-      style="default"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooEvent</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEventAny-send_event.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEventAny-send_event.page
new file mode 100644 (file)
index 0000000..045be53
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooEventAny-send_event"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooEventAny" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooEventAny->send_event</title>
+
+
+</page>
index 0e3a555..d98a36d 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.FooEventAny"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooEventAny</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose-count.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose-count.page
new file mode 100644 (file)
index 0000000..f9e410c
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooEventExpose-count"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooEventExpose" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooEventExpose->count</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose-send_event.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose-send_event.page
new file mode 100644 (file)
index 0000000..d06c23a
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooEventExpose-send_event"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooEventExpose" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooEventExpose->send_event</title>
+
+
+</page>
index 27c4c4a..e538b2b 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.FooEventExpose"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooEventExpose</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 53539d4..f45f4bc 100644 (file)
@@ -1,25 +1,14 @@
 <?xml version="1.0"?>
 <page id="Regress.FooFlagsNoType"
-      type="topic"
-      style="default"
+      type="guide"
+      style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.FooFlagsNoType</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
index 2b4afeb..3714e53 100644 (file)
@@ -1,25 +1,14 @@
 <?xml version="1.0"?>
 <page id="Regress.FooFlagsType"
-      type="topic"
-      style="default"
+      type="guide"
+      style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.FooFlagsType</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct-regress_foo.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct-regress_foo.page
new file mode 100644 (file)
index 0000000..07c098c
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooForeignStruct-regress_foo"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooForeignStruct" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooForeignStruct->regress_foo</title>
+
+
+</page>
index 217a983..582e019 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooForeignStruct" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>original</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_foreign_struct_copy</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressFooForeignStruct* regress_foo_foreign_struct_copy (RegressFooForeignStruct* original);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>original</code></title>
@@ -43,6 +35,4 @@ RegressFooForeignStruct* regress_foo_foreign_struct_copy (RegressFooForeignStruc
 </item>
 </terms>
 
-  
-  
 </page>
index 7314c1d..5bb3d93 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooForeignStruct" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_foreign_struct_new</api:name>
     </api:function>
-
   </info>
   <title>regress_foo_foreign_struct_new</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressFooForeignStruct* regress_foo_foreign_struct_new (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ RegressFooForeignStruct* regress_foo_foreign_struct_new (void);
 </item>
 </terms>
 
-  
-  
 </page>
index ee3e5e7..357ca22 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.FooForeignStruct"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooForeignStruct</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index b3faca6..61f1681 100644 (file)
@@ -6,23 +6,15 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooInterface" group="vfunc" type="guide"/>
-
   </info>
   <title>Regress.FooInterface::do_regress_foo</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void do_regress_foo (RegressFooInterface* self,
                      int x);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -38,6 +30,4 @@ void do_regress_foo (RegressFooInterface* self,
 </item>
 </terms>
 
-  
-  
 </page>
index 7c44fd4..ef3ca53 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooInterface" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>x</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_interface_do_regress_foo</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_foo_interface_do_regress_foo (RegressFooInterface* iface,
                                            int x);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>iface</code></title>
@@ -52,6 +44,4 @@ void regress_foo_interface_do_regress_foo (RegressFooInterface* iface,
 </item>
 </terms>
 
-  
-  
 </page>
index 7ec29fe..266aac9 100644 (file)
@@ -1,34 +1,29 @@
 <?xml version="1.0"?>
 <page id="Regress.FooInterface"
       type="guide"
-      style="class"
+      style="interface"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="interface" type="guide"/>
   </info>
   <title>Regress.FooInterface</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
   <synopsis>
-    <title>Hierarchy</title>
-    <tree>
-      <item>
-        <code>Regress.FooInterface</code>
-      </item>
-    </tree>
+    <title>Prerequisites</title>
+    <p>FooInterface requires GObject.Object</p>
+  </synopsis>
+  <synopsis>
+    <title>Known Implementations</title>
+    <p>FooInterface is implemented by FooBuffer, FooObject and FooSubobject</p>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-csrc"
          groups="method" style="linklist">
@@ -37,7 +32,7 @@
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-csrc"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
index a3ad69a..b6fc598 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooInterface" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>x</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_interface_static_method</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_foo_interface_static_method (int x);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>x</code></title>
@@ -43,6 +35,4 @@ void regress_foo_interface_static_method (int x);
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface-do_regress_foo.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface-do_regress_foo.page
new file mode 100644 (file)
index 0000000..e105b4e
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooInterfaceIface-do_regress_foo"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooInterfaceIface" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooInterfaceIface->do_regress_foo</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface-parent_iface.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface-parent_iface.page
new file mode 100644 (file)
index 0000000..e7a7e3e
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooInterfaceIface-parent_iface"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooInterfaceIface" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooInterfaceIface->parent_iface</title>
+
+
+</page>
index 0b90042..3c8b881 100644 (file)
@@ -1,25 +1,33 @@
 <?xml version="1.0"?>
 <page id="Regress.FooInterfaceIface.do_regress_foo"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
-  </info>
+    <link xref="index" group="callback" type="guide"/>
+    </info>
   <title>Regress.FooInterfaceIface.do_regress_foo</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-csrc">
+void do_regress_foo (RegressFooInterface* self,
+                     int x);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index 53b09b4..26a98b5 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.FooInterfaceIface"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooInterfaceIface</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index ccfbcfa..f34361e 100644 (file)
@@ -6,21 +6,10 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="property" type="guide"/>
     <title type="link" role="topic">hidden</title>
-
   </info>
   <title>Regress.FooObject:hidden</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-parent_instance.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-parent_instance.page
new file mode 100644 (file)
index 0000000..d9cf9b8
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooObject-parent_instance"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooObject" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooObject->parent_instance</title>
+
+
+</page>
index f99f3c0..e390f39 100644 (file)
@@ -6,36 +6,28 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="vfunc" type="guide"/>
-
   </info>
   <title>Regress.FooObject::read_fn</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void read_fn (RegressFooObject* object,
               int offset,
               int length);
-</code></synopsis>
+  </code></synopsis>
+  <p>Read some stuff.</p>
 
-  
-    <p>Read some stuff.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
-<p>obj</p>
+  <p>obj</p>
 </item>
 <item>
 <title><code>offset</code></title>
-<p>offset</p>
+  <p>offset</p>
 </item>
 <item>
 <title><code>length</code></title>
-<p>length</p>
+  <p>length</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -43,6 +35,4 @@ void read_fn (RegressFooObject* object,
 </item>
 </terms>
 
-  
-  
 </page>
index 3a8c131..d718206 100644 (file)
@@ -6,24 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="signal" type="guide"/>
     <title type="link" role="topic">signal</title>
-
   </info>
   <title>Regress.FooObject::signal</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gchar* signal (GObject object,
                gpointer p0);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
@@ -39,6 +31,4 @@ gchar* signal (GObject object,
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-some_int.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-some_int.page
new file mode 100644 (file)
index 0000000..b45dca8
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooObject-some_int"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooObject" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooObject->some_int</title>
+
+
+</page>
index b0ed3c7..49bf07c 100644 (file)
@@ -6,21 +6,10 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="property" type="guide"/>
     <title type="link" role="topic">string</title>
-
   </info>
   <title>Regress.FooObject:string</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
index 3e3f04e..133178d 100644 (file)
@@ -6,23 +6,15 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="vfunc" type="guide"/>
-
   </info>
   <title>Regress.FooObject::virtual_method</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gboolean virtual_method (RegressFooObject* object,
                          int first_param);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
@@ -38,6 +30,4 @@ gboolean virtual_method (RegressFooObject* object,
 </item>
 </terms>
 
-  
-  
 </page>
index 801f59a..b9f46af 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>obj</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_object_a_global_method</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_foo_object_a_global_method (UtilityObject* obj);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>obj</code></title>
@@ -43,6 +35,4 @@ void regress_foo_object_a_global_method (UtilityObject* obj);
 </item>
 </terms>
 
-  
-  
 </page>
index 82bbc26..99efa0f 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>x</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_object_append_new_stack_layer</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressFooOtherObject* regress_foo_object_append_new_stack_layer (RegressFooObject* obj,
                                                                   int x);
-</code></synopsis>
+  </code></synopsis>
+  <p>This shouldn't be scanned as a constructor.</p>
 
-  
-    <p>This shouldn't be scanned as a constructor.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>obj</code></title>
@@ -52,6 +44,4 @@ RegressFooOtherObject* regress_foo_object_append_new_stack_layer (RegressFooObje
 </item>
 </terms>
 
-  
-  
 </page>
index 6419ed7..e279ca8 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>object</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_object_dup_name</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 char* regress_foo_object_dup_name (RegressFooObject* object);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
@@ -43,6 +35,4 @@ char* regress_foo_object_dup_name (RegressFooObject* object);
 </item>
 </terms>
 
-  
-  
 </page>
index 77c8dc8..b3f3a8e 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>object</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_object_external_type</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 UtilityObject* regress_foo_object_external_type (RegressFooObject* object);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
-<p>a <link xref="Regress.FooObject"/></p>
+  <p>a <link xref="Regress.FooObject"/></p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p><code>NULL</code> always</p>
+  <p><code>NULL</code> always</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 04c38a2..7e7a809 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_object_get_default</api:name>
     </api:function>
-
   </info>
   <title>regress_foo_object_get_default</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressFooObject* regress_foo_object_get_default (void);
-</code></synopsis>
-
-  
-    <p>This function is intended to match clutter_stage_get_default which
+  </code></synopsis>
+  <p>This function is intended to match clutter_stage_get_default which
 uses a C sugar return type.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>The global <link xref="Regress.FooSubobject"/></p>
+  <p>The global <link xref="Regress.FooSubobject"/></p>
 </item>
 </terms>
 
-  
-  
 </page>
index 68b305b..e5b9827 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>object</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_object_get_name</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 const char* regress_foo_object_get_name (RegressFooObject* object);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
@@ -43,6 +35,4 @@ const char* regress_foo_object_get_name (RegressFooObject* object);
 </item>
 </terms>
 
-  
-  
 </page>
index 0cb58ae..0bfa338 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>glyph</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_object_handle_glyph</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_foo_object_handle_glyph (RegressFooObject* object,
                                       UtilityGlyph glyph);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
@@ -52,6 +44,4 @@ void regress_foo_object_handle_glyph (RegressFooObject* object,
 </item>
 </terms>
 
-  
-  
 </page>
index f643665..fa62ffd 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>time</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_object_is_it_time_yet</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_foo_object_is_it_time_yet (RegressFooObject* object,
                                         time_t time);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
@@ -52,6 +44,4 @@ void regress_foo_object_is_it_time_yet (RegressFooObject* object,
 </item>
 </terms>
 
-  
-  
 </page>
index 75b0e07..e5b6329 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_object_new</api:name>
     </api:function>
-
   </info>
   <title>regress_foo_object_new</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressFooObject* regress_foo_object_new (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ RegressFooObject* regress_foo_object_new (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 069a421..e733fb8 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_object_new_as_super</api:name>
     </api:function>
-
   </info>
   <title>regress_foo_object_new_as_super</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GObject* regress_foo_object_new_as_super (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ GObject* regress_foo_object_new_as_super (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 312e93c..364ad35 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>target</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_object_new_cookie</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressFooObjectCookie regress_foo_object_new_cookie (RegressFooObject* object,
                                                       const char* target);
-</code></synopsis>
+  </code></synopsis>
+  <p>Not sure why this test is here...</p>
 
-  
-    <p>Not sure why this test is here...</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
@@ -52,6 +44,4 @@ RegressFooObjectCookie regress_foo_object_new_cookie (RegressFooObject* object,
 </item>
 </terms>
 
-  
-  
 </page>
index fff026c..0fae891 100644 (file)
@@ -6,19 +6,11 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooObject</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
   <synopsis>
     <title>Hierarchy</title>
     <tree>
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-csrc"
          groups="method" style="linklist">
@@ -40,7 +35,7 @@
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-csrc"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
index d641502..6336041 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>length</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_object_read</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_foo_object_read (RegressFooObject* object,
                               int offset,
                               int length);
-</code></synopsis>
+  </code></synopsis>
+  <p>Read some stuff.</p>
 
-  
-    <p>Read some stuff.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
-<p>obj</p>
+  <p>obj</p>
 </item>
 <item>
 <title><code>offset</code></title>
-<p>offset</p>
+  <p>offset</p>
 </item>
 <item>
 <title><code>length</code></title>
-<p>length</p>
+  <p>length</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -61,6 +53,4 @@ void regress_foo_object_read (RegressFooObject* object,
 </item>
 </terms>
 
-  
-  
 </page>
index aea1afd..413631f 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>object</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_object_skipped_method</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_foo_object_skipped_method (RegressFooObject* object);
-</code></synopsis>
+  </code></synopsis>
+  <p>This is only useful from C.</p>
 
-  
-    <p>This is only useful from C.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
-<p>obj</p>
+  <p>obj</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -43,6 +35,4 @@ void regress_foo_object_skipped_method (RegressFooObject* object);
 </item>
 </terms>
 
-  
-  
 </page>
index 9b157bb..bdd23ba 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_object_static_meth</api:name>
     </api:function>
-
   </info>
   <title>regress_foo_object_static_meth</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 int regress_foo_object_static_meth (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ int regress_foo_object_static_meth (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 92d7543..b8f88f8 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:arg>
       <api:varargs/>
     </api:function>
-
   </info>
   <title>regress_foo_object_take_all</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_foo_object_take_all (RegressFooObject* object,
                                   int x,
                                   ...);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
@@ -58,6 +50,4 @@ void regress_foo_object_take_all (RegressFooObject* object,
 </item>
 </terms>
 
-  
-  
 </page>
index eea3c15..dc00f08 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>some_type</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_object_various</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_foo_object_various (RegressFooObject* object,
                                  void* data,
                                  GType some_type);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
@@ -61,6 +53,4 @@ void regress_foo_object_various (RegressFooObject* object,
 </item>
 </terms>
 
-  
-  
 </page>
index 3f04cb4..2d4e41c 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>first_param</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_object_virtual_method</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gboolean regress_foo_object_virtual_method (RegressFooObject* object,
                                             int first_param);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
@@ -52,6 +44,4 @@ gboolean regress_foo_object_virtual_method (RegressFooObject* object,
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-_reserved.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-_reserved.page
new file mode 100644 (file)
index 0000000..34d688e
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooObjectClass-_reserved"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooObjectClass" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooObjectClass->_reserved</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-parent_class.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-parent_class.page
new file mode 100644 (file)
index 0000000..0338849
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooObjectClass-parent_class"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooObjectClass" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooObjectClass->parent_class</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-read_fn.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-read_fn.page
new file mode 100644 (file)
index 0000000..52ff58a
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooObjectClass-read_fn"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooObjectClass" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooObjectClass->read_fn</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-virtual_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-virtual_method.page
new file mode 100644 (file)
index 0000000..6edab47
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooObjectClass-virtual_method"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooObjectClass" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooObjectClass->virtual_method</title>
+
+
+</page>
index 9d52838..ea57e84 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.FooObjectClass"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooObjectClass</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 39078bf..05f3ffc 100644 (file)
@@ -1,25 +1,38 @@
 <?xml version="1.0"?>
 <page id="Regress.FooObjectClass.read_fn"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
-  </info>
+    <link xref="index" group="callback" type="guide"/>
+    </info>
   <title>Regress.FooObjectClass.read_fn</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-csrc">
+void read_fn (RegressFooObject* object,
+              int offset,
+              int length);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>object</code></title>
+  <p>obj</p>
+</item>
+<item>
+<title><code>offset</code></title>
+  <p>offset</p>
+</item>
+<item>
+<title><code>length</code></title>
+  <p>length</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index 2882c6d..9c05faa 100644 (file)
@@ -1,25 +1,33 @@
 <?xml version="1.0"?>
 <page id="Regress.FooObjectClass.virtual_method"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
-  </info>
+    <link xref="index" group="callback" type="guide"/>
+    </info>
   <title>Regress.FooObjectClass.virtual_method</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-csrc">
+gboolean virtual_method (RegressFooObject* object,
+                         int first_param);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>object</code></title>
+
+</item>
+<item>
+<title><code>first_param</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index 44a63ab..fecc554 100644 (file)
@@ -6,20 +6,9 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="default" type="guide"/>
   </info>
   <title>Regress.FooObjectCookie</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
index 491d023..b61c3fe 100644 (file)
@@ -6,19 +6,11 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooOtherObject</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
   <synopsis>
     <title>Hierarchy</title>
     <tree>
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-csrc"
          groups="method" style="linklist">
@@ -40,7 +35,7 @@
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-csrc"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooOtherObjectClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooOtherObjectClass.page
new file mode 100644 (file)
index 0000000..7b15b42
--- /dev/null
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<page id="Regress.FooOtherObjectClass"
+      type="guide"
+      style="class"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="class" type="guide"/>
+  </info>
+  <title>Regress.FooOtherObjectClass</title>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-height.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-height.page
new file mode 100644 (file)
index 0000000..f1da68f
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooRectangle-height"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooRectangle" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooRectangle->height</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-width.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-width.page
new file mode 100644 (file)
index 0000000..dd55384
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooRectangle-width"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooRectangle" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooRectangle->width</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-x.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-x.page
new file mode 100644 (file)
index 0000000..2c4377b
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooRectangle-x"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooRectangle" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooRectangle->x</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-y.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-y.page
new file mode 100644 (file)
index 0000000..8b4a9a3
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooRectangle-y"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooRectangle" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooRectangle->y</title>
+
+
+</page>
index 84a46bb..df8fee5 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooRectangle" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>r2</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_rectangle_add</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_foo_rectangle_add (RegressFooRectangle* r1,
                                 const RegressFooRectangle* r2);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>r1</code></title>
-<p>add to this rect</p>
+  <p>add to this rect</p>
 </item>
 <item>
 <title><code>r2</code></title>
-<p>source rectangle</p>
+  <p>source rectangle</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -52,6 +44,4 @@ void regress_foo_rectangle_add (RegressFooRectangle* r1,
 </item>
 </terms>
 
-  
-  
 </page>
index b9f16ea..b296c40 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooRectangle" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>height</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_rectangle_new</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressFooRectangle* regress_foo_rectangle_new (int x,
                                                 int y,
                                                 int width,
                                                 int height);
-</code></synopsis>
-
-  
-    <p>This is a C convenience constructor; we have to (skip)
+  </code></synopsis>
+  <p>This is a C convenience constructor; we have to (skip)
 it because it's not a boxed type.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>x</code></title>
@@ -71,6 +63,4 @@ it because it's not a boxed type.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index d485de0..7562ec6 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.FooRectangle"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooRectangle</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 0d50e70..bc86268 100644 (file)
@@ -6,21 +6,10 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.FooSkippable</title>
-  
-  
-  
-    <p>Some type that is only interesting from C and should not be
+  <p>Some type that is only interesting from C and should not be
 exposed to language bindings.</p>
-  
-  
-  
-  
-  
-  
-  
+
 </page>
index 961d19c..83cae47 100644 (file)
@@ -6,20 +6,9 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.FooStackLayer</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooStruct-member.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooStruct-member.page
new file mode 100644 (file)
index 0000000..655d65d
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooStruct-member"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooStruct" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooStruct->member</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooStruct-priv.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooStruct-priv.page
new file mode 100644 (file)
index 0000000..a0d9891
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooStruct-priv"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooStruct" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooStruct->priv</title>
+
+
+</page>
index 65b4f26..a0e9b54 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.FooStruct"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooStruct</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooStructPrivate.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooStructPrivate.page
new file mode 100644 (file)
index 0000000..6d460be
--- /dev/null
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<page id="Regress.FooStructPrivate"
+      type="guide"
+      style="class"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="class" type="guide"/>
+  </info>
+  <title>Regress.FooStructPrivate</title>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
+</page>
index 6af09fd..b5a6e78 100644 (file)
@@ -6,23 +6,15 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooSubInterface" group="signal" type="guide"/>
     <title type="link" role="topic">destroy-event</title>
-
   </info>
   <title>Regress.FooSubInterface::destroy-event</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void destroy-event (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -30,6 +22,4 @@ void destroy-event (void);
 </item>
 </terms>
 
-  
-  
 </page>
index eb08ec7..04b51de 100644 (file)
@@ -6,22 +6,14 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooSubInterface" group="vfunc" type="guide"/>
-
   </info>
   <title>Regress.FooSubInterface::destroy_event</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void destroy_event (RegressFooSubInterface* self);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -33,6 +25,4 @@ void destroy_event (RegressFooSubInterface* self);
 </item>
 </terms>
 
-  
-  
 </page>
index 56bdfed..c268c83 100644 (file)
@@ -6,22 +6,14 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooSubInterface" group="vfunc" type="guide"/>
-
   </info>
   <title>Regress.FooSubInterface::do_bar</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void do_bar (RegressFooSubInterface* self);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -33,6 +25,4 @@ void do_bar (RegressFooSubInterface* self);
 </item>
 </terms>
 
-  
-  
 </page>
index ac59643..7324fde 100644 (file)
@@ -6,24 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooSubInterface" group="vfunc" type="guide"/>
-
   </info>
   <title>Regress.FooSubInterface::do_baz</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void do_baz (RegressFooSubInterface* self,
              GCallback callback,
              gpointer user_data);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -43,6 +35,4 @@ void do_baz (RegressFooSubInterface* self,
 </item>
 </terms>
 
-  
-  
 </page>
index 6d7d970..bb7ec6e 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooSubInterface" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_sub_interface_do_bar</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_foo_sub_interface_do_bar (RegressFooSubInterface* self);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -43,6 +35,4 @@ void regress_foo_sub_interface_do_bar (RegressFooSubInterface* self);
 </item>
 </terms>
 
-  
-  
 </page>
index bab0d68..f4c4d21 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooSubInterface" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>user_data</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_sub_interface_do_baz</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_foo_sub_interface_do_baz (RegressFooSubInterface* self,
                                        GCallback callback,
                                        gpointer user_data);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -61,6 +53,4 @@ void regress_foo_sub_interface_do_baz (RegressFooSubInterface* self,
 </item>
 </terms>
 
-  
-  
 </page>
index 9b25845..e91decb 100644 (file)
@@ -1,34 +1,29 @@
 <?xml version="1.0"?>
 <page id="Regress.FooSubInterface"
       type="guide"
-      style="class"
+      style="interface"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="interface" type="guide"/>
   </info>
   <title>Regress.FooSubInterface</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
   <synopsis>
-    <title>Hierarchy</title>
-    <tree>
-      <item>
-        <code>Regress.FooSubInterface</code>
-      </item>
-    </tree>
+    <title>Prerequisites</title>
+    <p>FooSubInterface requires Regress.FooInterface</p>
+  </synopsis>
+  <synopsis>
+    <title>Known Implementations</title>
+    <p>None</p>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-csrc"
          groups="method" style="linklist">
@@ -37,7 +32,7 @@
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-csrc"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-destroy_event.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-destroy_event.page
new file mode 100644 (file)
index 0000000..37a09ba
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooSubInterfaceIface-destroy_event"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooSubInterfaceIface" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooSubInterfaceIface->destroy_event</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-do_bar.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-do_bar.page
new file mode 100644 (file)
index 0000000..2e00c95
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooSubInterfaceIface-do_bar"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooSubInterfaceIface" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooSubInterfaceIface->do_bar</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-do_baz.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-do_baz.page
new file mode 100644 (file)
index 0000000..98644fb
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooSubInterfaceIface-do_baz"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooSubInterfaceIface" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooSubInterfaceIface->do_baz</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-parent_iface.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-parent_iface.page
new file mode 100644 (file)
index 0000000..d7626b6
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooSubInterfaceIface-parent_iface"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooSubInterfaceIface" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooSubInterfaceIface->parent_iface</title>
+
+
+</page>
index 9513683..416cacf 100644 (file)
@@ -1,25 +1,28 @@
 <?xml version="1.0"?>
 <page id="Regress.FooSubInterfaceIface.destroy_event"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
-  </info>
+    <link xref="index" group="callback" type="guide"/>
+    </info>
   <title>Regress.FooSubInterfaceIface.destroy_event</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-csrc">
+void destroy_event (RegressFooSubInterface* self);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index ec46cdd..5dd05da 100644 (file)
@@ -1,25 +1,28 @@
 <?xml version="1.0"?>
 <page id="Regress.FooSubInterfaceIface.do_bar"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
-  </info>
+    <link xref="index" group="callback" type="guide"/>
+    </info>
   <title>Regress.FooSubInterfaceIface.do_bar</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-csrc">
+void do_bar (RegressFooSubInterface* self);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index d0f5804..5ad8c56 100644 (file)
@@ -1,25 +1,38 @@
 <?xml version="1.0"?>
 <page id="Regress.FooSubInterfaceIface.do_baz"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
-  </info>
+    <link xref="index" group="callback" type="guide"/>
+    </info>
   <title>Regress.FooSubInterfaceIface.do_baz</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-csrc">
+void do_baz (RegressFooSubInterface* self,
+             GCallback callback,
+             gpointer user_data);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>user_data</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index f8643cf..50b4d12 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.FooSubInterfaceIface"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooSubInterfaceIface</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject-parent_instance.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject-parent_instance.page
new file mode 100644 (file)
index 0000000..33994c7
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooSubobject-parent_instance"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooSubobject" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooSubobject->parent_instance</title>
+
+
+</page>
index c4adff6..6d13005 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooSubobject" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_subobject_new</api:name>
     </api:function>
-
   </info>
   <title>regress_foo_subobject_new</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressFooSubobject* regress_foo_subobject_new (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ RegressFooSubobject* regress_foo_subobject_new (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 6a70ef7..951f11c 100644 (file)
@@ -6,19 +6,11 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooSubobject</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
   <synopsis>
     <title>Hierarchy</title>
     <tree>
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-csrc"
          groups="method" style="linklist">
@@ -43,7 +38,7 @@
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-csrc"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobjectClass-parent_class.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobjectClass-parent_class.page
new file mode 100644 (file)
index 0000000..cf86502
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooSubobjectClass-parent_class"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooSubobjectClass" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooSubobjectClass->parent_class</title>
+
+
+</page>
index 499599c..426fe2f 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.FooSubobjectClass"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooSubobjectClass</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-data.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-data.page
new file mode 100644 (file)
index 0000000..cc40f8f
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooThingWithArray-data"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooThingWithArray" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooThingWithArray->data</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-lines.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-lines.page
new file mode 100644 (file)
index 0000000..6db4319
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooThingWithArray-lines"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooThingWithArray" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooThingWithArray->lines</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-x.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-x.page
new file mode 100644 (file)
index 0000000..c13779f
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooThingWithArray-x"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooThingWithArray" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooThingWithArray->x</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-y.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-y.page
new file mode 100644 (file)
index 0000000..df8f251
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooThingWithArray-y"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooThingWithArray" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooThingWithArray->y</title>
+
+
+</page>
index 6033817..22f3d64 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.FooThingWithArray"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooThingWithArray</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooUnion-regress_foo.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooUnion-regress_foo.page
new file mode 100644 (file)
index 0000000..6c180dd
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooUnion-regress_foo"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooUnion" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooUnion->regress_foo</title>
+
+
+</page>
index 9746f17..ebb0b1c 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.FooUnion"
-      type="topic"
-      style="default"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooUnion</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooUtilityStruct-bar.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooUtilityStruct-bar.page
new file mode 100644 (file)
index 0000000..26d131c
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooUtilityStruct-bar"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooUtilityStruct" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooUtilityStruct->bar</title>
+
+
+</page>
index d281ffb..d956c4d 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.FooUtilityStruct"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooUtilityStruct</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index a57ea4d..083a99f 100644 (file)
@@ -1,25 +1,33 @@
 <?xml version="1.0"?>
 <page id="Regress.FooVarargsCallback"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
-  </info>
+    <link xref="index" group="callback" type="guide"/>
+    </info>
   <title>Regress.FooVarargsCallback</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-csrc">
+void FooVarargsCallback (const char* param,
+                         ...);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>param</code></title>
+
+</item>
+<item>
+<title><code>...</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index c389ef0..19bee42 100644 (file)
@@ -6,20 +6,9 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="default" type="guide"/>
   </info>
   <title>Regress.FooXEvent</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.GI_SCANNER_ELSE.page b/tests/scanner/Regress-1.0-C-expected/Regress.GI_SCANNER_ELSE.page
new file mode 100644 (file)
index 0000000..e9876e0
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.GI_SCANNER_ELSE"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.GI_SCANNER_ELSE</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.GI_SCANNER_IFDEF.page b/tests/scanner/Regress-1.0-C-expected/Regress.GI_SCANNER_IFDEF.page
new file mode 100644 (file)
index 0000000..bfef183
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.GI_SCANNER_IFDEF"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.GI_SCANNER_IFDEF</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANT.page
new file mode 100644 (file)
index 0000000..8c16dd2
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.GUINT64_CONSTANT"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.GUINT64_CONSTANT</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANTA.page b/tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANTA.page
new file mode 100644 (file)
index 0000000..3b0d6f1
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.GUINT64_CONSTANTA"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.GUINT64_CONSTANTA</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.G_GINT64_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.G_GINT64_CONSTANT.page
new file mode 100644 (file)
index 0000000..cdce607
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.G_GINT64_CONSTANT"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.G_GINT64_CONSTANT</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.INT_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.INT_CONSTANT.page
new file mode 100644 (file)
index 0000000..e0512ab
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.INT_CONSTANT"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.INT_CONSTANT</title>
+
+
+</page>
index b8710cf..b8324f8 100644 (file)
@@ -6,20 +6,9 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="default" type="guide"/>
   </info>
   <title>Regress.IntSet</title>
-  
-  
-  
-    <p>Compatibility typedef, like telepathy-glib's TpIntSet</p>
-  
-  
-  
-  
-  
-  
-  
+  <p>Compatibility typedef, like telepathy-glib's TpIntSet</p>
+
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.Intset.page b/tests/scanner/Regress-1.0-C-expected/Regress.Intset.page
new file mode 100644 (file)
index 0000000..69d8300
--- /dev/null
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<page id="Regress.Intset"
+      type="guide"
+      style="class"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="class" type="guide"/>
+  </info>
+  <title>Regress.Intset</title>
+  <p>Like telepathy-glib's TpIntset.</p>
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.LONG_STRING_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.LONG_STRING_CONSTANT.page
new file mode 100644 (file)
index 0000000..85fe96e
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.LONG_STRING_CONSTANT"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.LONG_STRING_CONSTANT</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema-attributes.page b/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema-attributes.page
new file mode 100644 (file)
index 0000000..db51500
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<page id="Regress.LikeGnomeKeyringPasswordSchema-attributes"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.LikeGnomeKeyringPasswordSchema"
+      group="field"
+      type="guide"/>
+  </info>
+  <title>Regress.LikeGnomeKeyringPasswordSchema->attributes</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy.page b/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy.page
new file mode 100644 (file)
index 0000000..3bfbac1
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<page id="Regress.LikeGnomeKeyringPasswordSchema-dummy"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.LikeGnomeKeyringPasswordSchema"
+      group="field"
+      type="guide"/>
+  </info>
+  <title>Regress.LikeGnomeKeyringPasswordSchema->dummy</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy2.page b/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy2.page
new file mode 100644 (file)
index 0000000..408ab29
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<page id="Regress.LikeGnomeKeyringPasswordSchema-dummy2"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.LikeGnomeKeyringPasswordSchema"
+      group="field"
+      type="guide"/>
+  </info>
+  <title>Regress.LikeGnomeKeyringPasswordSchema->dummy2</title>
+
+
+</page>
index 242fad0..33b117c 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.LikeGnomeKeyringPasswordSchema"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.LikeGnomeKeyringPasswordSchema</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem-name.page b/tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem-name.page
new file mode 100644 (file)
index 0000000..dbc8998
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.LikeXklConfigItem-name"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.LikeXklConfigItem" group="field" type="guide"/>
+  </info>
+  <title>Regress.LikeXklConfigItem->name</title>
+
+
+</page>
index 3b14aae..e073de0 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.LikeXklConfigItem"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.LikeXklConfigItem</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 0a4aecb..e5137c4 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.LikeXklConfigItem" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>name</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_like_xkl_config_item_set_name</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_like_xkl_config_item_set_name (RegressLikeXklConfigItem* self,
                                             const char* name);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -52,6 +44,4 @@ void regress_like_xkl_config_item_set_name (RegressLikeXklConfigItem* self,
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.MAXUINT64.page b/tests/scanner/Regress-1.0-C-expected/Regress.MAXUINT64.page
new file mode 100644 (file)
index 0000000..91d7ce5
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.MAXUINT64"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.MAXUINT64</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.MININT64.page b/tests/scanner/Regress-1.0-C-expected/Regress.MININT64.page
new file mode 100644 (file)
index 0000000..1531540
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.MININT64"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.MININT64</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.Mixed_Case_Constant.page b/tests/scanner/Regress-1.0-C-expected/Regress.Mixed_Case_Constant.page
new file mode 100644 (file)
index 0000000..29e7314
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.Mixed_Case_Constant"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.Mixed_Case_Constant</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.NEGATIVE_INT_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.NEGATIVE_INT_CONSTANT.page
new file mode 100644 (file)
index 0000000..a0aad76
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.NEGATIVE_INT_CONSTANT"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.NEGATIVE_INT_CONSTANT</title>
+
+
+</page>
index f66aee4..1acd4d2 100644 (file)
@@ -6,20 +6,9 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="default" type="guide"/>
   </info>
   <title>Regress.PtrArrayAlias</title>
-  
-  
-  
-    <p>Typedef'd GPtrArray for some reason</p>
-  
-  
-  
-  
-  
-  
-  
+  <p>Typedef'd GPtrArray for some reason</p>
+
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.STRING_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.STRING_CONSTANT.page
new file mode 100644 (file)
index 0000000..be1d6e1
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.STRING_CONSTANT"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.STRING_CONSTANT</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure-v.page b/tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure-v.page
new file mode 100644 (file)
index 0000000..3b55d6c
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.SkippedStructure-v"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.SkippedStructure" group="field" type="guide"/>
+  </info>
+  <title>Regress.SkippedStructure->v</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure-x.page b/tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure-x.page
new file mode 100644 (file)
index 0000000..a7b5ac9
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.SkippedStructure-x"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.SkippedStructure" group="field" type="guide"/>
+  </info>
+  <title>Regress.SkippedStructure->x</title>
+
+
+</page>
index ad13eea..1ff59e1 100644 (file)
@@ -1,26 +1,36 @@
 <?xml version="1.0"?>
 <page id="Regress.SkippedStructure"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.SkippedStructure</title>
-  
-  
-  
-    <p>This should be skipped, and moreover, all function which
+  <p>This should be skipped, and moreover, all function which
 use it should be.</p>
-  
-  
-  
-  
-  
-  
-  
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 384ffb8..a504645 100644 (file)
@@ -6,20 +6,9 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.TestABCError</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
index 7ed5152..ab2b773 100644 (file)
@@ -6,28 +6,20 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.TestABCError" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>GQuark</api:type>
       </api:returns>
       <api:name>regress_test_abc_error_quark</api:name>
     </api:function>
-
   </info>
   <title>regress_test_abc_error_quark</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GQuark regress_test_abc_error_quark (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ GQuark regress_test_abc_error_quark (void);
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed-nested_a.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed-nested_a.page
new file mode 100644 (file)
index 0000000..d394f4d
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestBoxed-nested_a"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestBoxed" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestBoxed->nested_a</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed-priv.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed-priv.page
new file mode 100644 (file)
index 0000000..3084c21
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestBoxed-priv"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestBoxed" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestBoxed->priv</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed-some_int8.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed-some_int8.page
new file mode 100644 (file)
index 0000000..36f6632
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestBoxed-some_int8"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestBoxed" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestBoxed->some_int8</title>
+
+
+</page>
index 4027391..53d2074 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestBoxed" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>boxed</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_boxed_copy</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressTestBoxed* regress_test_boxed_copy (RegressTestBoxed* boxed);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>boxed</code></title>
@@ -43,6 +35,4 @@ RegressTestBoxed* regress_test_boxed_copy (RegressTestBoxed* boxed);
 </item>
 </terms>
 
-  
-  
 </page>
index 26206b6..0af199b 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestBoxed" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>other</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_boxed_equals</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gboolean regress_test_boxed_equals (RegressTestBoxed* boxed,
                                     RegressTestBoxed* other);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>boxed</code></title>
@@ -52,6 +44,4 @@ gboolean regress_test_boxed_equals (RegressTestBoxed* boxed,
 </item>
 </terms>
 
-  
-  
 </page>
index 5e05794..f9f57ea 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestBoxed" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_boxed_new</api:name>
     </api:function>
-
   </info>
   <title>regress_test_boxed_new</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressTestBoxed* regress_test_boxed_new (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ RegressTestBoxed* regress_test_boxed_new (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 2bc8192..9341856 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestBoxed" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>i</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_boxed_new_alternative_constructor1</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressTestBoxed* regress_test_boxed_new_alternative_constructor1 (int i);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>i</code></title>
@@ -43,6 +35,4 @@ RegressTestBoxed* regress_test_boxed_new_alternative_constructor1 (int i);
 </item>
 </terms>
 
-  
-  
 </page>
index e43127e..39ea62b 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestBoxed" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>j</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_boxed_new_alternative_constructor2</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressTestBoxed* regress_test_boxed_new_alternative_constructor2 (int i,
                                                                    int j);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>i</code></title>
@@ -52,6 +44,4 @@ RegressTestBoxed* regress_test_boxed_new_alternative_constructor2 (int i,
 </item>
 </terms>
 
-  
-  
 </page>
index ac75d2c..6cd8084 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestBoxed" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>s</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_boxed_new_alternative_constructor3</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressTestBoxed* regress_test_boxed_new_alternative_constructor3 (char* s);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>s</code></title>
@@ -43,6 +35,4 @@ RegressTestBoxed* regress_test_boxed_new_alternative_constructor3 (char* s);
 </item>
 </terms>
 
-  
-  
 </page>
index d667532..1805f5a 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.TestBoxed"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestBoxed</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB-some_int8.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB-some_int8.page
new file mode 100644 (file)
index 0000000..c7666c7
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestBoxedB-some_int8"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestBoxedB" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestBoxedB->some_int8</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB-some_long.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB-some_long.page
new file mode 100644 (file)
index 0000000..a5f4a34
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestBoxedB-some_long"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestBoxedB" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestBoxedB->some_long</title>
+
+
+</page>
index df0da11..bc33c57 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestBoxedB" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>boxed</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_boxed_b_copy</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressTestBoxedB* regress_test_boxed_b_copy (RegressTestBoxedB* boxed);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>boxed</code></title>
@@ -43,6 +35,4 @@ RegressTestBoxedB* regress_test_boxed_b_copy (RegressTestBoxedB* boxed);
 </item>
 </terms>
 
-  
-  
 </page>
index 7a0bc2b..f5d2210 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestBoxedB" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>some_long</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_boxed_b_new</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressTestBoxedB* regress_test_boxed_b_new (gint8 some_int8,
                                              glong some_long);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>some_int8</code></title>
@@ -52,6 +44,4 @@ RegressTestBoxedB* regress_test_boxed_b_new (gint8 some_int8,
 </item>
 </terms>
 
-  
-  
 </page>
index 856d7da..fe1a6d6 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.TestBoxedB"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestBoxedB</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC-another_thing.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC-another_thing.page
new file mode 100644 (file)
index 0000000..a5d7c2b
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestBoxedC-another_thing"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestBoxedC" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestBoxedC->another_thing</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC-refcount.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC-refcount.page
new file mode 100644 (file)
index 0000000..0f755dd
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestBoxedC-refcount"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestBoxedC" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestBoxedC->refcount</title>
+
+
+</page>
index 4657b52..4b8e300 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestBoxedC" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_boxed_c_new</api:name>
     </api:function>
-
   </info>
   <title>regress_test_boxed_c_new</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressTestBoxedC* regress_test_boxed_c_new (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ RegressTestBoxedC* regress_test_boxed_c_new (void);
 </item>
 </terms>
 
-  
-  
 </page>
index c890545..aabd9b2 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.TestBoxedC"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestBoxedC</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index ed99996..ac9e71b 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestBoxedD" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>boxed</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_boxed_d_copy</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressTestBoxedD* regress_test_boxed_d_copy (RegressTestBoxedD* boxed);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>boxed</code></title>
@@ -43,6 +35,4 @@ RegressTestBoxedD* regress_test_boxed_d_copy (RegressTestBoxedD* boxed);
 </item>
 </terms>
 
-  
-  
 </page>
index 4622fcd..4aa4e44 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestBoxedD" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>boxed</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_boxed_d_free</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_boxed_d_free (RegressTestBoxedD* boxed);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>boxed</code></title>
@@ -43,6 +35,4 @@ void regress_test_boxed_d_free (RegressTestBoxedD* boxed);
 </item>
 </terms>
 
-  
-  
 </page>
index bbd78ab..dc98da2 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestBoxedD" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>boxed</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_boxed_d_get_magic</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 int regress_test_boxed_d_get_magic (RegressTestBoxedD* boxed);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>boxed</code></title>
@@ -43,6 +35,4 @@ int regress_test_boxed_d_get_magic (RegressTestBoxedD* boxed);
 </item>
 </terms>
 
-  
-  
 </page>
index 5034562..2a5bd4b 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestBoxedD" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>a_int</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_boxed_d_new</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressTestBoxedD* regress_test_boxed_d_new (const char* a_string,
                                              int a_int);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>a_string</code></title>
@@ -52,6 +44,4 @@ RegressTestBoxedD* regress_test_boxed_d_new (const char* a_string,
 </item>
 </terms>
 
-  
-  
 </page>
index b5110c2..c194f35 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.TestBoxedD"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestBoxedD</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedPrivate.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedPrivate.page
new file mode 100644 (file)
index 0000000..8523949
--- /dev/null
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<page id="Regress.TestBoxedPrivate"
+      type="guide"
+      style="class"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="class" type="guide"/>
+  </info>
+  <title>Regress.TestBoxedPrivate</title>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
+</page>
index bed84d5..d75adc9 100644 (file)
@@ -1,25 +1,24 @@
 <?xml version="1.0"?>
 <page id="Regress.TestCallback"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
-  </info>
+    <link xref="index" group="callback" type="guide"/>
+    </info>
   <title>Regress.TestCallback</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-csrc">
+int TestCallback (void);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index 7d3f7b8..ef49dd2 100644 (file)
@@ -1,25 +1,43 @@
 <?xml version="1.0"?>
 <page id="Regress.TestCallbackArray"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
-  </info>
+    <link xref="index" group="callback" type="guide"/>
+    </info>
   <title>Regress.TestCallbackArray</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-csrc">
+int TestCallbackArray (int* one,
+                       gsize one_length,
+                       utf8* two,
+                       int two_length);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>one</code></title>
+
+</item>
+<item>
+<title><code>one_length</code></title>
+
+</item>
+<item>
+<title><code>two</code></title>
+
+</item>
+<item>
+<title><code>two_length</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index 0b8fca1..013755e 100644 (file)
@@ -1,25 +1,38 @@
 <?xml version="1.0"?>
 <page id="Regress.TestCallbackFull"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
-  </info>
+    <link xref="index" group="callback" type="guide"/>
+    </info>
   <title>Regress.TestCallbackFull</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-csrc">
+int TestCallbackFull (int foo,
+                      double bar,
+                      char* path);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>foo</code></title>
+  <p>the investment rate</p>
+</item>
+<item>
+<title><code>bar</code></title>
+  <p>how much money</p>
+</item>
+<item>
+<title><code>path</code></title>
+  <p>Path to file</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index 804382f..e05c876 100644 (file)
@@ -1,25 +1,28 @@
 <?xml version="1.0"?>
 <page id="Regress.TestCallbackGError"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
-  </info>
+    <link xref="index" group="callback" type="guide"/>
+    </info>
   <title>Regress.TestCallbackGError</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-csrc">
+void TestCallbackGError (const GError* error);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>error</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index 06ebb70..b0140ac 100644 (file)
@@ -1,25 +1,28 @@
 <?xml version="1.0"?>
 <page id="Regress.TestCallbackHashtable"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
-  </info>
+    <link xref="index" group="callback" type="guide"/>
+    </info>
   <title>Regress.TestCallbackHashtable</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-csrc">
+void TestCallbackHashtable (GHashTable* data);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>data</code></title>
+  <p>a hash table; will be modified</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index 28b21ea..2599a8a 100644 (file)
@@ -1,25 +1,28 @@
 <?xml version="1.0"?>
 <page id="Regress.TestCallbackOwnedGError"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
-  </info>
+    <link xref="index" group="callback" type="guide"/>
+    </info>
   <title>Regress.TestCallbackOwnedGError</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-csrc">
+void TestCallbackOwnedGError (GError* error);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>error</code></title>
+  <p>GError instance; must be freed by the callback</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index 286c830..c646ae8 100644 (file)
@@ -1,25 +1,28 @@
 <?xml version="1.0"?>
 <page id="Regress.TestCallbackUserData"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
-  </info>
+    <link xref="index" group="callback" type="guide"/>
+    </info>
   <title>Regress.TestCallbackUserData</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-csrc">
+int TestCallbackUserData (gpointer user_data);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>user_data</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index b485450..734dc79 100644 (file)
@@ -6,20 +6,9 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.TestDEFError</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
index a672d7e..38be2b3 100644 (file)
@@ -6,20 +6,9 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.TestEnum</title>
-  
-  
-  
-    <p>By purpose, not all members have documentation</p>
-  
-  
-  
-  
-  
-  
-  
+  <p>By purpose, not all members have documentation</p>
+
 </page>
index 542ba60..0b2d8f7 100644 (file)
@@ -6,8 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.TestEnum" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>const gchar*</api:type>
         <api:name>e</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_enum_param</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 const gchar* regress_test_enum_param (RegressTestEnum e);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>e</code></title>
@@ -43,6 +35,4 @@ const gchar* regress_test_enum_param (RegressTestEnum e);
 </item>
 </terms>
 
-  
-  
 </page>
index cffae73..1294242 100644 (file)
@@ -6,20 +6,9 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.TestEnumNoGEnum</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
index 81a9aa9..c5e7ccf 100644 (file)
@@ -6,20 +6,9 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.TestEnumUnsigned</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
index 97f829b..0b51365 100644 (file)
@@ -6,20 +6,9 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.TestError</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
index 9140ac5..97774c1 100644 (file)
@@ -6,28 +6,20 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.TestError" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>GQuark</api:type>
       </api:returns>
       <api:name>regress_test_error_quark</api:name>
     </api:function>
-
   </info>
   <title>regress_test_error_quark</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GQuark regress_test_error_quark (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ GQuark regress_test_error_quark (void);
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestExternallyDefinedCallback.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestExternallyDefinedCallback.page
new file mode 100644 (file)
index 0000000..6514a35
--- /dev/null
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<page id="Regress.TestExternallyDefinedCallback"
+      type="topic"
+      style="callback"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="callback" type="guide"/>
+    </info>
+  <title>Regress.TestExternallyDefinedCallback</title>
+  <synopsis><code mime="text/x-csrc">
+void TestExternallyDefinedCallback (RegressTestObj* obj,
+                                    int someint);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+<item>
+<title><code>someint</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
index d5bfeeb..54c679a 100644 (file)
@@ -1,25 +1,14 @@
 <?xml version="1.0"?>
 <page id="Regress.TestFlags"
-      type="topic"
-      style="default"
+      type="guide"
+      style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.TestFlags</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating-parent_instance.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating-parent_instance.page
new file mode 100644 (file)
index 0000000..c546875
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestFloating-parent_instance"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestFloating" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestFloating->parent_instance</title>
+
+
+</page>
index 5f4a3a5..400e34a 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestFloating" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_floating_new</api:name>
     </api:function>
-
   </info>
   <title>regress_test_floating_new</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressTestFloating* regress_test_floating_new (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>A new floating <link xref="Regress.TestFloating"/></p>
+  <p>A new floating <link xref="Regress.TestFloating"/></p>
 </item>
 </terms>
 
-  
-  
 </page>
index 1189912..3f8b267 100644 (file)
@@ -6,19 +6,11 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestFloating</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
   <synopsis>
     <title>Hierarchy</title>
     <tree>
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-csrc"
          groups="method" style="linklist">
@@ -43,7 +38,7 @@
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-csrc"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFloatingClass-parent_class.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloatingClass-parent_class.page
new file mode 100644 (file)
index 0000000..9196604
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestFloatingClass-parent_class"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestFloatingClass" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestFloatingClass->parent_class</title>
+
+
+</page>
index e7d5236..234bf1f 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.TestFloatingClass"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestFloatingClass</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-copy.page
new file mode 100644 (file)
index 0000000..d4435c6
--- /dev/null
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<page id="Regress.TestFundamentalObject-copy"
+      type="topic"
+      style="vfunc"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestFundamentalObject" group="vfunc" type="guide"/>
+  </info>
+  <title>Regress.TestFundamentalObject::copy</title>
+  <synopsis><code mime="text/x-csrc">
+RegressTestFundamentalObject* copy (const RegressTestFundamentalObject* obj);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-finalize.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-finalize.page
new file mode 100644 (file)
index 0000000..060684a
--- /dev/null
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<page id="Regress.TestFundamentalObject-finalize"
+      type="topic"
+      style="vfunc"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestFundamentalObject" group="vfunc" type="guide"/>
+  </info>
+  <title>Regress.TestFundamentalObject::finalize</title>
+  <synopsis><code mime="text/x-csrc">
+void finalize (RegressTestFundamentalObject* obj);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-flags.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-flags.page
new file mode 100644 (file)
index 0000000..875ba30
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestFundamentalObject-flags"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestFundamentalObject" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestFundamentalObject->flags</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-instance.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-instance.page
new file mode 100644 (file)
index 0000000..693df03
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestFundamentalObject-instance"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestFundamentalObject" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestFundamentalObject->instance</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-refcount.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-refcount.page
new file mode 100644 (file)
index 0000000..3413765
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestFundamentalObject-refcount"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestFundamentalObject" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestFundamentalObject->refcount</title>
+
+
+</page>
index 473f1af..4289f4f 100644 (file)
@@ -6,19 +6,11 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestFundamentalObject</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
   <synopsis>
     <title>Hierarchy</title>
     <tree>
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-csrc"
          groups="method" style="linklist">
@@ -37,7 +32,7 @@
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-csrc"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
index 3e63b1e..fada738 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestFundamentalObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>fundamental_object</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_fundamental_object_ref</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressTestFundamentalObject* regress_test_fundamental_object_ref (RegressTestFundamentalObject* fundamental_object);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>fundamental_object</code></title>
@@ -39,10 +31,8 @@ RegressTestFundamentalObject* regress_test_fundamental_object_ref (RegressTestFu
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>A new <link xref="Regress.TestFundamentalObject"/></p>
+  <p>A new <link xref="Regress.TestFundamentalObject"/></p>
 </item>
 </terms>
 
-  
-  
 </page>
index 6f5c16b..726b1d5 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestFundamentalObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>fundamental_object</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_fundamental_object_unref</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_fundamental_object_unref (RegressTestFundamentalObject* fundamental_object);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>fundamental_object</code></title>
@@ -43,6 +35,4 @@ void regress_test_fundamental_object_unref (RegressTestFundamentalObject* fundam
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass-copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass-copy.page
new file mode 100644 (file)
index 0000000..6b5178a
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestFundamentalObjectClass-copy"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestFundamentalObjectClass" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestFundamentalObjectClass->copy</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass-finalize.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass-finalize.page
new file mode 100644 (file)
index 0000000..a7fdff4
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestFundamentalObjectClass-finalize"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestFundamentalObjectClass" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestFundamentalObjectClass->finalize</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass-type_class.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass-type_class.page
new file mode 100644 (file)
index 0000000..57e088c
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestFundamentalObjectClass-type_class"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestFundamentalObjectClass" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestFundamentalObjectClass->type_class</title>
+
+
+</page>
index 443ce70..38aea87 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.TestFundamentalObjectClass"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestFundamentalObjectClass</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 73a3328..c6acc8f 100644 (file)
@@ -1,25 +1,28 @@
 <?xml version="1.0"?>
 <page id="Regress.TestFundamentalObjectCopyFunction"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
-  </info>
+    <link xref="index" group="callback" type="guide"/>
+    </info>
   <title>Regress.TestFundamentalObjectCopyFunction</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-csrc">
+RegressTestFundamentalObject* TestFundamentalObjectCopyFunction (const RegressTestFundamentalObject* obj);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index df0e8fb..ee150df 100644 (file)
@@ -1,25 +1,28 @@
 <?xml version="1.0"?>
 <page id="Regress.TestFundamentalObjectFinalizeFunction"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
-  </info>
+    <link xref="index" group="callback" type="guide"/>
+    </info>
   <title>Regress.TestFundamentalObjectFinalizeFunction</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-csrc">
+void TestFundamentalObjectFinalizeFunction (RegressTestFundamentalObject* obj);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject-data.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject-data.page
new file mode 100644 (file)
index 0000000..02269eb
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestFundamentalSubObject-data"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestFundamentalSubObject" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestFundamentalSubObject->data</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject-fundamental_object.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject-fundamental_object.page
new file mode 100644 (file)
index 0000000..27c5cf4
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestFundamentalSubObject-fundamental_object"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestFundamentalSubObject" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestFundamentalSubObject->fundamental_object</title>
+
+
+</page>
index a449540..13a4127 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestFundamentalSubObject"
       group="constructor"
       type="guide"/>
         <api:name>data</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_fundamental_sub_object_new</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressTestFundamentalSubObject* regress_test_fundamental_sub_object_new (const char* data);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>data</code></title>
@@ -45,6 +37,4 @@ RegressTestFundamentalSubObject* regress_test_fundamental_sub_object_new (const
 </item>
 </terms>
 
-  
-  
 </page>
index 6ed3608..d0a09c2 100644 (file)
@@ -6,19 +6,11 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestFundamentalSubObject</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
   <synopsis>
     <title>Hierarchy</title>
     <tree>
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-csrc"
          groups="method" style="linklist">
@@ -40,7 +35,7 @@
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-csrc"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObjectClass-fundamental_object_class.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObjectClass-fundamental_object_class.page
new file mode 100644 (file)
index 0000000..a9faf9a
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestFundamentalSubObjectClass-fundamental_object_class"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestFundamentalSubObjectClass" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestFundamentalSubObjectClass->fundamental_object_class</title>
+
+
+</page>
index 79e14d5..1947fa4 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.TestFundamentalSubObjectClass"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestFundamentalSubObjectClass</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable-parent_instance.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable-parent_instance.page
new file mode 100644 (file)
index 0000000..2295feb
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestInheritDrawable-parent_instance"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestInheritDrawable" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestInheritDrawable->parent_instance</title>
+
+
+</page>
index 24bd9c4..7d6bcde 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestInheritDrawable" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>x</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_inherit_drawable_do_foo</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_inherit_drawable_do_foo (RegressTestInheritDrawable* drawable,
                                            int x);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>drawable</code></title>
@@ -52,6 +44,4 @@ void regress_test_inherit_drawable_do_foo (RegressTestInheritDrawable* drawable,
 </item>
 </terms>
 
-  
-  
 </page>
index e90dcd1..1a62b79 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestInheritDrawable" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>x</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_inherit_drawable_do_foo_maybe_throw</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_inherit_drawable_do_foo_maybe_throw (RegressTestInheritDrawable* drawable,
                                                        int x);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>drawable</code></title>
@@ -52,6 +44,4 @@ void regress_test_inherit_drawable_do_foo_maybe_throw (RegressTestInheritDrawabl
 </item>
 </terms>
 
-  
-  
 </page>
index 9ab00c6..7a33019 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestInheritDrawable" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>y</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_inherit_drawable_get_origin</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_inherit_drawable_get_origin (RegressTestInheritDrawable* drawable,
                                                int* x,
                                                int* y);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>drawable</code></title>
@@ -61,6 +53,4 @@ void regress_test_inherit_drawable_get_origin (RegressTestInheritDrawable* drawa
 </item>
 </terms>
 
-  
-  
 </page>
index c9c778e..2e74a29 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestInheritDrawable" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>height</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_inherit_drawable_get_size</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_inherit_drawable_get_size (RegressTestInheritDrawable* drawable,
                                              guint* width,
                                              guint* height);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>drawable</code></title>
@@ -61,6 +53,4 @@ void regress_test_inherit_drawable_get_size (RegressTestInheritDrawable* drawabl
 </item>
 </terms>
 
-  
-  
 </page>
index 20ef3ff..fae7264 100644 (file)
@@ -6,19 +6,11 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestInheritDrawable</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
   <synopsis>
     <title>Hierarchy</title>
     <tree>
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-csrc"
          groups="method" style="linklist">
@@ -40,7 +35,7 @@
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-csrc"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawableClass-parent_class.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawableClass-parent_class.page
new file mode 100644 (file)
index 0000000..b14538c
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestInheritDrawableClass-parent_class"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestInheritDrawableClass" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestInheritDrawableClass->parent_class</title>
+
+
+</page>
index 2579f56..58369c4 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.TestInheritDrawableClass"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestInheritDrawableClass</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritPixmapObjectClass-parent_class.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritPixmapObjectClass-parent_class.page
new file mode 100644 (file)
index 0000000..bf056d8
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestInheritPixmapObjectClass-parent_class"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestInheritPixmapObjectClass" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestInheritPixmapObjectClass->parent_class</title>
+
+
+</page>
index 3cf69e8..b5e07b4 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.TestInheritPixmapObjectClass"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestInheritPixmapObjectClass</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 1c53fd4..19e4521 100644 (file)
@@ -1,34 +1,29 @@
 <?xml version="1.0"?>
 <page id="Regress.TestInterface"
       type="guide"
-      style="class"
+      style="interface"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="interface" type="guide"/>
   </info>
   <title>Regress.TestInterface</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
   <synopsis>
-    <title>Hierarchy</title>
-    <tree>
-      <item>
-        <code>Regress.TestInterface</code>
-      </item>
-    </tree>
+    <title>Prerequisites</title>
+    <p>TestInterface requires GObject.Object</p>
+  </synopsis>
+  <synopsis>
+    <title>Known Implementations</title>
+    <p>None</p>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-csrc"
          groups="method" style="linklist">
@@ -37,7 +32,7 @@
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-csrc"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInterfaceIface-base_iface.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInterfaceIface-base_iface.page
new file mode 100644 (file)
index 0000000..f9454e1
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestInterfaceIface-base_iface"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestInterfaceIface" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestInterfaceIface->base_iface</title>
+
+
+</page>
index a643e5d..ced653c 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.TestInterfaceIface"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestInterfaceIface</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 37b5dd3..936be81 100644 (file)
@@ -6,23 +6,15 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">all</title>
-
   </info>
   <title>Regress.TestObj::all</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void all (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -30,6 +22,4 @@ void all (void);
 </item>
 </terms>
 
-  
-  
 </page>
index f3447b5..fa78f22 100644 (file)
@@ -6,23 +6,15 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="vfunc" type="guide"/>
-
   </info>
   <title>Regress.TestObj::allow_none_vfunc</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void allow_none_vfunc (RegressTestObj* obj,
                        RegressTestObj* two);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>obj</code></title>
@@ -30,7 +22,7 @@ void allow_none_vfunc (RegressTestObj* obj,
 </item>
 <item>
 <title><code>two</code></title>
-<p>Another object</p>
+  <p>Another object</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -38,6 +30,4 @@ void allow_none_vfunc (RegressTestObj* obj,
 </item>
 </terms>
 
-  
-  
 </page>
index 4873a1c..c4ea79a 100644 (file)
@@ -6,21 +6,10 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="property" type="guide"/>
     <title type="link" role="topic">bare</title>
-
   </info>
   <title>Regress.TestObj:bare</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
index 460104b..61597b9 100644 (file)
@@ -6,21 +6,10 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="property" type="guide"/>
     <title type="link" role="topic">boxed</title>
-
   </info>
   <title>Regress.TestObj:boxed</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
index bef9537..bf23ce2 100644 (file)
@@ -6,23 +6,15 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">cleanup</title>
-
   </info>
   <title>Regress.TestObj::cleanup</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void cleanup (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -30,6 +22,4 @@ void cleanup (void);
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-complex_vfunc.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-complex_vfunc.page
new file mode 100644 (file)
index 0000000..50b9b0f
--- /dev/null
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj-complex_vfunc"
+      type="topic"
+      style="vfunc"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObj" group="vfunc" type="guide"/>
+  </info>
+  <title>Regress.TestObj::complex_vfunc</title>
+  <synopsis><code mime="text/x-csrc">
+void complex_vfunc (RegressTestObj* obj,
+                    int someint);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+<item>
+<title><code>someint</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
index bb907ab..0115614 100644 (file)
@@ -6,21 +6,10 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="property" type="guide"/>
     <title type="link" role="topic">double</title>
-
   </info>
   <title>Regress.TestObj:double</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
index 5600be6..e9e31d3 100644 (file)
@@ -6,23 +6,15 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">first</title>
-
   </info>
   <title>Regress.TestObj::first</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void first (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -30,6 +22,4 @@ void first (void);
 </item>
 </terms>
 
-  
-  
 </page>
index a981cf8..64ad436 100644 (file)
@@ -6,21 +6,10 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="property" type="guide"/>
     <title type="link" role="topic">float</title>
-
   </info>
   <title>Regress.TestObj:float</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-function_ptr.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-function_ptr.page
new file mode 100644 (file)
index 0000000..dca9a51
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj-function_ptr"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObj" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestObj->function_ptr</title>
+
+
+</page>
index 2fbf9d9..2b8adb7 100644 (file)
@@ -6,21 +6,10 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="property" type="guide"/>
     <title type="link" role="topic">gtype</title>
-
   </info>
   <title>Regress.TestObj:gtype</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
index 003425b..46c5046 100644 (file)
@@ -6,21 +6,10 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="property" type="guide"/>
     <title type="link" role="topic">hash-table-old</title>
-
   </info>
   <title>Regress.TestObj:hash-table-old</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
index f11e465..c90c44d 100644 (file)
@@ -6,21 +6,10 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="property" type="guide"/>
     <title type="link" role="topic">hash-table</title>
-
   </info>
   <title>Regress.TestObj:hash-table</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash_table.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash_table.page
new file mode 100644 (file)
index 0000000..40653a9
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj-hash_table"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObj" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestObj->hash_table</title>
+
+
+</page>
index 95a4902..3ba1d11 100644 (file)
@@ -6,21 +6,10 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="property" type="guide"/>
     <title type="link" role="topic">int</title>
-
   </info>
   <title>Regress.TestObj:int</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
index 680636d..29708fe 100644 (file)
@@ -6,21 +6,10 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="property" type="guide"/>
     <title type="link" role="topic">list-old</title>
-
   </info>
   <title>Regress.TestObj:list-old</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
index 7ea5130..4e1abc8 100644 (file)
@@ -6,21 +6,10 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="property" type="guide"/>
     <title type="link" role="topic">list</title>
-
   </info>
   <title>Regress.TestObj:list</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
index 4320365..7fb7eca 100644 (file)
@@ -6,33 +6,25 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="vfunc" type="guide"/>
-
   </info>
   <title>Regress.TestObj::matrix</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 int matrix (RegressTestObj* obj,
             const char* somestr);
-</code></synopsis>
-
-  
-    <p>This method is virtual.  Notably its name differs from the virtual
+  </code></synopsis>
+  <p>This method is virtual.  Notably its name differs from the virtual
 slot name, which makes it useful for testing bindings handle this
 case.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>obj</code></title>
-<p>A <link xref="Regress.TestObj"/></p>
+  <p>A <link xref="Regress.TestObj"/></p>
 </item>
 <item>
 <title><code>somestr</code></title>
-<p>Meaningless string</p>
+  <p>Meaningless string</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -40,6 +32,4 @@ case.</p>
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-parent_instance.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-parent_instance.page
new file mode 100644 (file)
index 0000000..52b356b
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj-parent_instance"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObj" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestObj->parent_instance</title>
+
+
+</page>
index 9ec983b..dcb254b 100644 (file)
@@ -6,32 +6,24 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">sig-with-array-len-prop</title>
-
   </info>
   <title>Regress.TestObj::sig-with-array-len-prop</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void sig-with-array-len-prop (guint* arr,
                               gint len);
-</code></synopsis>
+  </code></synopsis>
+  <p>This test signal similar to GSettings::change-event</p>
 
-  
-    <p>This test signal similar to GSettings::change-event</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>arr</code></title>
-<p>numbers, or <code>NULL</code></p>
+  <p>numbers, or <code>NULL</code></p>
 </item>
 <item>
 <title><code>len</code></title>
-<p>length of <code>arr</code>, or 0</p>
+  <p>length of <code>arr</code>, or 0</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -39,6 +31,4 @@ void sig-with-array-len-prop (guint* arr,
 </item>
 </terms>
 
-  
-  
 </page>
index 05b911c..190a191 100644 (file)
@@ -6,28 +6,20 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">sig-with-array-prop</title>
-
   </info>
   <title>Regress.TestObj::sig-with-array-prop</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void sig-with-array-prop (guint* arr);
-</code></synopsis>
-
-  
-    <p>This test signal is like TelepathyGlib's
+  </code></synopsis>
+  <p>This test signal is like TelepathyGlib's
  TpChannel:: group-members-changed-detailed:</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>arr</code></title>
-<p>numbers</p>
+  <p>numbers</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ void sig-with-array-prop (guint* arr);
 </item>
 </terms>
 
-  
-  
 </page>
index c2cb882..cf6147f 100644 (file)
@@ -6,27 +6,19 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">sig-with-foreign-struct</title>
-
   </info>
   <title>Regress.TestObj::sig-with-foreign-struct</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void sig-with-foreign-struct (cairo_t cr);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>cr</code></title>
-<p>A cairo context.</p>
+  <p>A cairo context.</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -34,6 +26,4 @@ void sig-with-foreign-struct (cairo_t cr);
 </item>
 </terms>
 
-  
-  
 </page>
index 9ddd536..c3cce66 100644 (file)
@@ -6,24 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">sig-with-hash-prop</title>
-
   </info>
   <title>Regress.TestObj::sig-with-hash-prop</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void sig-with-hash-prop (&lt;map&gt; hash);
-</code></synopsis>
-
-  
-    <p>This test signal is like TelepathyGlib's
+  </code></synopsis>
+  <p>This test signal is like TelepathyGlib's
  TpAccount::status-changed</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>hash</code></title>
@@ -35,6 +27,4 @@ void sig-with-hash-prop (&lt;map&gt; hash);
 </item>
 </terms>
 
-  
-  
 </page>
index d8a9037..900d7ea 100644 (file)
@@ -6,28 +6,20 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">sig-with-int64-prop</title>
-
   </info>
   <title>Regress.TestObj::sig-with-int64-prop</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gint64 sig-with-int64-prop (gint64 i);
-</code></synopsis>
-
-  
-    <p>You can use this with regress_test_obj_emit_sig_with_int64, or raise from
+  </code></synopsis>
+  <p>You can use this with regress_test_obj_emit_sig_with_int64, or raise from
 the introspection client langage.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>i</code></title>
-<p>an integer</p>
+  <p>an integer</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ the introspection client langage.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 7f041e2..b9be7d5 100644 (file)
@@ -6,27 +6,19 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">sig-with-intarray-ret</title>
-
   </info>
   <title>Regress.TestObj::sig-with-intarray-ret</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 None sig-with-intarray-ret (gint i);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>i</code></title>
-<p>an integer</p>
+  <p>an integer</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -34,6 +26,4 @@ None sig-with-intarray-ret (gint i);
 </item>
 </terms>
 
-  
-  
 </page>
index 9d69a6f..d8e9d5f 100644 (file)
@@ -6,28 +6,20 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">sig-with-obj</title>
-
   </info>
   <title>Regress.TestObj::sig-with-obj</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void sig-with-obj (GObject obj);
-</code></synopsis>
-
-  
-    <p>Test transfer none GObject as a param (tests refcounting).
+  </code></synopsis>
+  <p>Test transfer none GObject as a param (tests refcounting).
 Use with regress_test_obj_emit_sig_with_obj</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>obj</code></title>
-<p>A newly created RegressTestObj</p>
+  <p>A newly created RegressTestObj</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ Use with regress_test_obj_emit_sig_with_obj</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 919d38f..f2b2911 100644 (file)
@@ -6,27 +6,19 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">sig-with-strv</title>
-
   </info>
   <title>Regress.TestObj::sig-with-strv</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void sig-with-strv (utf8* strs);
-</code></synopsis>
+  </code></synopsis>
+  <p>Test GStrv as a param.</p>
 
-  
-    <p>Test GStrv as a param.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>strs</code></title>
-<p>strings</p>
+  <p>strings</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -34,6 +26,4 @@ void sig-with-strv (utf8* strs);
 </item>
 </terms>
 
-  
-  
 </page>
index 6ee6bda..3bb5b5e 100644 (file)
@@ -6,28 +6,20 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">sig-with-uint64-prop</title>
-
   </info>
   <title>Regress.TestObj::sig-with-uint64-prop</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 guint64 sig-with-uint64-prop (guint64 i);
-</code></synopsis>
-
-  
-    <p>You can use this with regress_test_obj_emit_sig_with_uint64, or raise from
+  </code></synopsis>
+  <p>You can use this with regress_test_obj_emit_sig_with_uint64, or raise from
 the introspection client langage.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>i</code></title>
-<p>an integer</p>
+  <p>an integer</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ the introspection client langage.</p>
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-some_double.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-some_double.page
new file mode 100644 (file)
index 0000000..ffd77f1
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj-some_double"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObj" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestObj->some_double</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-some_float.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-some_float.page
new file mode 100644 (file)
index 0000000..0c22a20
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj-some_float"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObj" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestObj->some_float</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-some_int8.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-some_int8.page
new file mode 100644 (file)
index 0000000..8836889
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj-some_int8"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObj" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestObj->some_int8</title>
+
+
+</page>
index 1ae4803..d548cb9 100644 (file)
@@ -6,21 +6,10 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="property" type="guide"/>
     <title type="link" role="topic">string</title>
-
   </info>
   <title>Regress.TestObj:string</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
index 1ffe66e..f4bf0ab 100644 (file)
@@ -6,23 +6,15 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">test-with-static-scope-arg</title>
-
   </info>
   <title>Regress.TestObj::test-with-static-scope-arg</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void test-with-static-scope-arg (RegressTestSimpleBoxedA object);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
@@ -34,6 +26,4 @@ void test-with-static-scope-arg (RegressTestSimpleBoxedA object);
 </item>
 </terms>
 
-  
-  
 </page>
index 15599c6..5ac080e 100644 (file)
@@ -6,23 +6,15 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">test</title>
-
   </info>
   <title>Regress.TestObj::test</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void test (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -30,6 +22,4 @@ void test (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 8efd161..bf3b58a 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_constructor</api:name>
     </api:function>
-
   </info>
   <title>regress_constructor</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressTestObj* regress_constructor (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ RegressTestObj* regress_constructor (void);
 </item>
 </terms>
 
-  
-  
 </page>
index bc4e762..da367ee 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>somestr</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_obj_do_matrix</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 int regress_test_obj_do_matrix (RegressTestObj* obj,
                                 const char* somestr);
-</code></synopsis>
-
-  
-    <p>This method is virtual.  Notably its name differs from the virtual
+  </code></synopsis>
+  <p>This method is virtual.  Notably its name differs from the virtual
 slot name, which makes it useful for testing bindings handle this
 case.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>obj</code></title>
-<p>A <link xref="Regress.TestObj"/></p>
+  <p>A <link xref="Regress.TestObj"/></p>
 </item>
 <item>
 <title><code>somestr</code></title>
-<p>Meaningless string</p>
+  <p>Meaningless string</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -54,6 +46,4 @@ case.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 1ba8436..38fa185 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>obj</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_obj_emit_sig_with_foreign_struct</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_obj_emit_sig_with_foreign_struct (RegressTestObj* obj);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>obj</code></title>
@@ -43,6 +35,4 @@ void regress_test_obj_emit_sig_with_foreign_struct (RegressTestObj* obj);
 </item>
 </terms>
 
-  
-  
 </page>
index 24f5826..97e1c9f 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>obj</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_obj_emit_sig_with_int64</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_obj_emit_sig_with_int64 (RegressTestObj* obj);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>obj</code></title>
@@ -43,6 +35,4 @@ void regress_test_obj_emit_sig_with_int64 (RegressTestObj* obj);
 </item>
 </terms>
 
-  
-  
 </page>
index e0d123e..195f4a0 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>obj</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_obj_emit_sig_with_obj</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_obj_emit_sig_with_obj (RegressTestObj* obj);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>obj</code></title>
@@ -43,6 +35,4 @@ void regress_test_obj_emit_sig_with_obj (RegressTestObj* obj);
 </item>
 </terms>
 
-  
-  
 </page>
index 0c2c68c..b5ed20d 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>obj</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_obj_emit_sig_with_uint64</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_obj_emit_sig_with_uint64 (RegressTestObj* obj);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>obj</code></title>
@@ -43,6 +35,4 @@ void regress_test_obj_emit_sig_with_uint64 (RegressTestObj* obj);
 </item>
 </terms>
 
-  
-  
 </page>
index 92bfa2d..3c59d28 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>obj</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_forced_method</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_forced_method (RegressTestObj* obj);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>obj</code></title>
-<p>A <link xref="Regress.TestObj"/></p>
+  <p>A <link xref="Regress.TestObj"/></p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -43,6 +35,4 @@ void regress_forced_method (RegressTestObj* obj);
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.function_ptr.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.function_ptr.page
new file mode 100644 (file)
index 0000000..3456540
--- /dev/null
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj.function_ptr"
+      type="topic"
+      style="callback"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="callback" type="guide"/>
+    </info>
+  <title>Regress.TestObj.function_ptr</title>
+  <synopsis><code mime="text/x-csrc">
+void function_ptr (void);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
index 7469238..673e7e0 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>obj</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_obj_instance_method</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 int regress_test_obj_instance_method (RegressTestObj* obj);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>obj</code></title>
@@ -43,6 +35,4 @@ int regress_test_obj_instance_method (RegressTestObj* obj);
 </item>
 </terms>
 
-  
-  
 </page>
index 668096a..ecf8e54 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_obj_instance_method_callback</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_obj_instance_method_callback (RegressTestObj* obj,
                                                 RegressTestCallback callback);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>obj</code></title>
@@ -52,6 +44,4 @@ void regress_test_obj_instance_method_callback (RegressTestObj* obj,
 </item>
 </terms>
 
-  
-  
 </page>
index e931f7d..1144f60 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>obj</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_obj_new</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressTestObj* regress_test_obj_new (RegressTestObj* obj);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>obj</code></title>
-<p>A <link xref="Regress.TestObj"/></p>
+  <p>A <link xref="Regress.TestObj"/></p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -43,6 +35,4 @@ RegressTestObj* regress_test_obj_new (RegressTestObj* obj);
 </item>
 </terms>
 
-  
-  
 </page>
index d2ec5f6..0fdb54c 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>notify</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_obj_new_callback</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressTestObj* regress_test_obj_new_callback (RegressTestCallbackUserData callback,
                                                gpointer user_data,
                                                GDestroyNotify notify);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -61,6 +53,4 @@ RegressTestObj* regress_test_obj_new_callback (RegressTestCallbackUserData callb
 </item>
 </terms>
 
-  
-  
 </page>
index a77e915..21dc2b4 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>x</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_obj_new_from_file</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressTestObj* regress_test_obj_new_from_file (const char* x);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>x</code></title>
@@ -43,6 +35,4 @@ RegressTestObj* regress_test_obj_new_from_file (const char* x);
 </item>
 </terms>
 
-  
-  
 </page>
index c86b4b2..c79e304 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>obj</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_obj_null_out</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_obj_null_out (RegressTestObj** obj);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>obj</code></title>
-<p>A <link xref="Regress.TestObj"/></p>
+  <p>A <link xref="Regress.TestObj"/></p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -43,6 +35,4 @@ void regress_test_obj_null_out (RegressTestObj** obj);
 </item>
 </terms>
 
-  
-  
 </page>
index 42f26db..8950858 100644 (file)
@@ -6,19 +6,11 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestObj</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
   <synopsis>
     <title>Hierarchy</title>
     <tree>
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-csrc"
          groups="method" style="linklist">
@@ -40,7 +35,7 @@
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-csrc"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
index 160b8d2..cfcdd65 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>bare</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_obj_set_bare</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_obj_set_bare (RegressTestObj* obj,
                                 GObject* bare);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>obj</code></title>
@@ -52,6 +44,4 @@ void regress_test_obj_set_bare (RegressTestObj* obj,
 </item>
 </terms>
 
-  
-  
 </page>
index 333d170..b8d64c7 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>num2</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_obj_skip_inout_param</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gboolean regress_test_obj_skip_inout_param (RegressTestObj* obj,
                                             gint a,
                                             gint* out_b,
@@ -59,53 +56,46 @@ gboolean regress_test_obj_skip_inout_param (RegressTestObj* obj,
                                             gint* out_sum,
                                             gint num1,
                                             gint num2);
-</code></synopsis>
+  </code></synopsis>
+  <p>Check that the out value is skipped</p>
 
-  
-    <p>Check that the out value is skipped</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>obj</code></title>
-<p>A <link xref="Regress.TestObj"/>.</p>
+  <p>A <link xref="Regress.TestObj"/>.</p>
 </item>
 <item>
 <title><code>a</code></title>
-<p>Parameter.</p>
+  <p>Parameter.</p>
 </item>
 <item>
 <title><code>out_b</code></title>
-<p>Return value.</p>
+  <p>Return value.</p>
 </item>
 <item>
 <title><code>c</code></title>
-<p>Other parameter.</p>
+  <p>Other parameter.</p>
 </item>
 <item>
 <title><code>inout_d</code></title>
-<p>Will be incremented.</p>
+  <p>Will be incremented.</p>
 </item>
 <item>
 <title><code>out_sum</code></title>
-<p>Return value.</p>
+  <p>Return value.</p>
 </item>
 <item>
 <title><code>num1</code></title>
-<p>Number.</p>
+  <p>Number.</p>
 </item>
 <item>
 <title><code>num2</code></title>
-<p>Number.</p>
+  <p>Number.</p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p><code>TRUE</code> if the call succeeds, <code>FALSE</code> if @error is set.</p>
+  <p><code>TRUE</code> if the call succeeds, <code>FALSE</code> if @error is set.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 1df6c18..fc4cdd5 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>num2</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_obj_skip_out_param</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gboolean regress_test_obj_skip_out_param (RegressTestObj* obj,
                                           gint a,
                                           gint* out_b,
@@ -59,53 +56,46 @@ gboolean regress_test_obj_skip_out_param (RegressTestObj* obj,
                                           gint* out_sum,
                                           gint num1,
                                           gint num2);
-</code></synopsis>
+  </code></synopsis>
+  <p>Check that the out value is skipped</p>
 
-  
-    <p>Check that the out value is skipped</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>obj</code></title>
-<p>A <link xref="Regress.TestObj"/>.</p>
+  <p>A <link xref="Regress.TestObj"/>.</p>
 </item>
 <item>
 <title><code>a</code></title>
-<p>Parameter.</p>
+  <p>Parameter.</p>
 </item>
 <item>
 <title><code>out_b</code></title>
-<p>Return value.</p>
+  <p>Return value.</p>
 </item>
 <item>
 <title><code>c</code></title>
-<p>Other parameter.</p>
+  <p>Other parameter.</p>
 </item>
 <item>
 <title><code>inout_d</code></title>
-<p>Will be incremented.</p>
+  <p>Will be incremented.</p>
 </item>
 <item>
 <title><code>out_sum</code></title>
-<p>Return value.</p>
+  <p>Return value.</p>
 </item>
 <item>
 <title><code>num1</code></title>
-<p>Number.</p>
+  <p>Number.</p>
 </item>
 <item>
 <title><code>num2</code></title>
-<p>Number.</p>
+  <p>Number.</p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p><code>TRUE</code> if the call succeeds, <code>FALSE</code> if @error is set.</p>
+  <p><code>TRUE</code> if the call succeeds, <code>FALSE</code> if @error is set.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index deca81b..a9a3448 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>num2</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_obj_skip_param</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gboolean regress_test_obj_skip_param (RegressTestObj* obj,
                                       gint a,
                                       gint* out_b,
@@ -59,53 +56,46 @@ gboolean regress_test_obj_skip_param (RegressTestObj* obj,
                                       gint* out_sum,
                                       gint num1,
                                       gint num2);
-</code></synopsis>
+  </code></synopsis>
+  <p>Check that a parameter is skipped</p>
 
-  
-    <p>Check that a parameter is skipped</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>obj</code></title>
-<p>A <link xref="Regress.TestObj"/>.</p>
+  <p>A <link xref="Regress.TestObj"/>.</p>
 </item>
 <item>
 <title><code>a</code></title>
-<p>Parameter.</p>
+  <p>Parameter.</p>
 </item>
 <item>
 <title><code>out_b</code></title>
-<p>Return value.</p>
+  <p>Return value.</p>
 </item>
 <item>
 <title><code>c</code></title>
-<p>Other parameter.</p>
+  <p>Other parameter.</p>
 </item>
 <item>
 <title><code>inout_d</code></title>
-<p>Will be incremented.</p>
+  <p>Will be incremented.</p>
 </item>
 <item>
 <title><code>out_sum</code></title>
-<p>Return value.</p>
+  <p>Return value.</p>
 </item>
 <item>
 <title><code>num1</code></title>
-<p>Number.</p>
+  <p>Number.</p>
 </item>
 <item>
 <title><code>num2</code></title>
-<p>Number.</p>
+  <p>Number.</p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p><code>TRUE</code> if the call succeeds, <code>FALSE</code> if @error is set.</p>
+  <p><code>TRUE</code> if the call succeeds, <code>FALSE</code> if @error is set.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 47402c9..6f69b9b 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>num2</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_obj_skip_return_val</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gboolean regress_test_obj_skip_return_val (RegressTestObj* obj,
                                            gint a,
                                            gint* out_b,
@@ -59,53 +56,46 @@ gboolean regress_test_obj_skip_return_val (RegressTestObj* obj,
                                            gint* out_sum,
                                            gint num1,
                                            gint num2);
-</code></synopsis>
+  </code></synopsis>
+  <p>Check that the return value is skipped</p>
 
-  
-    <p>Check that the return value is skipped</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>obj</code></title>
-<p>a <link xref="Regress.TestObj"/></p>
+  <p>a <link xref="Regress.TestObj"/></p>
 </item>
 <item>
 <title><code>a</code></title>
-<p>Parameter.</p>
+  <p>Parameter.</p>
 </item>
 <item>
 <title><code>out_b</code></title>
-<p>A return value.</p>
+  <p>A return value.</p>
 </item>
 <item>
 <title><code>c</code></title>
-<p>Other parameter.</p>
+  <p>Other parameter.</p>
 </item>
 <item>
 <title><code>inout_d</code></title>
-<p>Will be incremented.</p>
+  <p>Will be incremented.</p>
 </item>
 <item>
 <title><code>out_sum</code></title>
-<p>Return value.</p>
+  <p>Return value.</p>
 </item>
 <item>
 <title><code>num1</code></title>
-<p>Number.</p>
+  <p>Number.</p>
 </item>
 <item>
 <title><code>num2</code></title>
-<p>Number.</p>
+  <p>Number.</p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p><code>TRUE</code> if the call succeeds, <code>FALSE</code> if @error is set.</p>
+  <p><code>TRUE</code> if the call succeeds, <code>FALSE</code> if @error is set.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index b590de2..2961ec8 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>a</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_obj_skip_return_val_no_out</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gboolean regress_test_obj_skip_return_val_no_out (RegressTestObj* obj,
                                                   gint a);
-</code></synopsis>
-
-  
-    <p>Check that the return value is skipped. Succeed if a is nonzero, otherwise
+  </code></synopsis>
+  <p>Check that the return value is skipped. Succeed if a is nonzero, otherwise
 raise an error.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>obj</code></title>
-<p>a <link xref="Regress.TestObj"/></p>
+  <p>a <link xref="Regress.TestObj"/></p>
 </item>
 <item>
 <title><code>a</code></title>
-<p>Parameter.</p>
+  <p>Parameter.</p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p><code>TRUE</code> if the call succeeds, <code>FALSE</code> if @error is set.</p>
+  <p><code>TRUE</code> if the call succeeds, <code>FALSE</code> if @error is set.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 8e5c9b1..0f7a2bf 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>x</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_obj_static_method</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 double regress_test_obj_static_method (int x);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>x</code></title>
@@ -43,6 +35,4 @@ double regress_test_obj_static_method (int x);
 </item>
 </terms>
 
-  
-  
 </page>
index 8058ac0..d9a2bea 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_obj_static_method_callback</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_obj_static_method_callback (RegressTestCallback callback);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -43,6 +35,4 @@ void regress_test_obj_static_method_callback (RegressTestCallback callback);
 </item>
 </terms>
 
-  
-  
 </page>
index 3e2fb61..61ae71c 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>m</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_obj_torture_signature_0</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_obj_torture_signature_0 (RegressTestObj* obj,
                                            int x,
                                            double* y,
@@ -54,18 +51,13 @@ void regress_test_obj_torture_signature_0 (RegressTestObj* obj,
                                            const char* foo,
                                            int* q,
                                            guint m);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>obj</code></title>
-<p>A <link xref="Regress.TestObj"/></p>
+  <p>A <link xref="Regress.TestObj"/></p>
 </item>
 <item>
 <title><code>x</code></title>
@@ -97,6 +89,4 @@ void regress_test_obj_torture_signature_0 (RegressTestObj* obj,
 </item>
 </terms>
 
-  
-  
 </page>
index 37e1ad2..c3d85fa 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>m</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_obj_torture_signature_1</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gboolean regress_test_obj_torture_signature_1 (RegressTestObj* obj,
                                                int x,
                                                double* y,
@@ -54,18 +51,13 @@ gboolean regress_test_obj_torture_signature_1 (RegressTestObj* obj,
                                                const char* foo,
                                                int* q,
                                                guint m);
-</code></synopsis>
+  </code></synopsis>
+  <p>This function throws an error if m is odd.</p>
 
-  
-    <p>This function throws an error if m is odd.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>obj</code></title>
-<p>A <link xref="Regress.TestObj"/></p>
+  <p>A <link xref="Regress.TestObj"/></p>
 </item>
 <item>
 <title><code>x</code></title>
@@ -97,6 +89,4 @@ gboolean regress_test_obj_torture_signature_1 (RegressTestObj* obj,
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-_regress_reserved1.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-_regress_reserved1.page
new file mode 100644 (file)
index 0000000..724610e
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObjClass-_regress_reserved1"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObjClass" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestObjClass->_regress_reserved1</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-_regress_reserved2.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-_regress_reserved2.page
new file mode 100644 (file)
index 0000000..b865102
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObjClass-_regress_reserved2"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObjClass" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestObjClass->_regress_reserved2</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-allow_none_vfunc.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-allow_none_vfunc.page
new file mode 100644 (file)
index 0000000..5f5d375
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObjClass-allow_none_vfunc"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObjClass" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestObjClass->allow_none_vfunc</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-complex_vfunc.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-complex_vfunc.page
new file mode 100644 (file)
index 0000000..d658928
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObjClass-complex_vfunc"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObjClass" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestObjClass->complex_vfunc</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-matrix.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-matrix.page
new file mode 100644 (file)
index 0000000..d50f3d7
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObjClass-matrix"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObjClass" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestObjClass->matrix</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-parent_class.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-parent_class.page
new file mode 100644 (file)
index 0000000..905a767
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObjClass-parent_class"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObjClass" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestObjClass->parent_class</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-test_signal.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-test_signal.page
new file mode 100644 (file)
index 0000000..c8da9dc
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObjClass-test_signal"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObjClass" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestObjClass->test_signal</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-test_signal_with_static_scope_arg.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-test_signal_with_static_scope_arg.page
new file mode 100644 (file)
index 0000000..fdbc6a2
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObjClass-test_signal_with_static_scope_arg"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObjClass" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestObjClass->test_signal_with_static_scope_arg</title>
+
+
+</page>
index 3aec143..466f846 100644 (file)
@@ -1,25 +1,24 @@
 <?xml version="1.0"?>
 <page id="Regress.TestObjClass._regress_reserved1"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
-  </info>
+    <link xref="index" group="callback" type="guide"/>
+    </info>
   <title>Regress.TestObjClass._regress_reserved1</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-csrc">
+void _regress_reserved1 (void);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index 8bfc4d1..9b6aa75 100644 (file)
@@ -1,25 +1,24 @@
 <?xml version="1.0"?>
 <page id="Regress.TestObjClass._regress_reserved2"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
-  </info>
+    <link xref="index" group="callback" type="guide"/>
+    </info>
   <title>Regress.TestObjClass._regress_reserved2</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-csrc">
+void _regress_reserved2 (void);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index b45f05d..e93242a 100644 (file)
@@ -1,25 +1,33 @@
 <?xml version="1.0"?>
 <page id="Regress.TestObjClass.allow_none_vfunc"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
-  </info>
+    <link xref="index" group="callback" type="guide"/>
+    </info>
   <title>Regress.TestObjClass.allow_none_vfunc</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-csrc">
+void allow_none_vfunc (RegressTestObj* obj,
+                       RegressTestObj* two);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+<item>
+<title><code>two</code></title>
+  <p>Another object</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index 312b198..4f4b0a8 100644 (file)
@@ -1,25 +1,33 @@
 <?xml version="1.0"?>
 <page id="Regress.TestObjClass.matrix"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
-  </info>
+    <link xref="index" group="callback" type="guide"/>
+    </info>
   <title>Regress.TestObjClass.matrix</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-csrc">
+int matrix (RegressTestObj* obj,
+            const char* somestr);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>obj</code></title>
+  <p>A <link xref="Regress.TestObj"/></p>
+</item>
+<item>
+<title><code>somestr</code></title>
+  <p>Meaningless string</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index 86db748..5a6da18 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.TestObjClass"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestObjClass</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 7d2d53b..98eba50 100644 (file)
@@ -6,20 +6,9 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.TestOtherError</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
index 4ed8d53..9bb6a28 100644 (file)
@@ -6,28 +6,20 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.TestOtherError" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>GQuark</api:type>
       </api:returns>
       <api:name>regress_test_unconventional_error_quark</api:name>
     </api:function>
-
   </info>
   <title>regress_test_unconventional_error_quark</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GQuark regress_test_unconventional_error_quark (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ GQuark regress_test_unconventional_error_quark (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 66b477d..e37674e 100644 (file)
@@ -1,25 +1,14 @@
 <?xml version="1.0"?>
 <page id="Regress.TestPrivateEnum"
-      type="topic"
-      style="default"
+      type="guide"
+      style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.TestPrivateEnum</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct-this_is_public_after.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct-this_is_public_after.page
new file mode 100644 (file)
index 0000000..843ed30
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestPrivateStruct-this_is_public_after"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestPrivateStruct" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestPrivateStruct->this_is_public_after</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct-this_is_public_before.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct-this_is_public_before.page
new file mode 100644 (file)
index 0000000..84a6eca
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestPrivateStruct-this_is_public_before"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestPrivateStruct" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestPrivateStruct->this_is_public_before</title>
+
+
+</page>
index 5d55c80..c8eea18 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.TestPrivateStruct"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestPrivateStruct</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 44c3cad..85923d3 100644 (file)
@@ -6,20 +6,9 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.TestReferenceEnum</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_double.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_double.page
new file mode 100644 (file)
index 0000000..61e4303
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestSimpleBoxedA-some_double"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestSimpleBoxedA" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestSimpleBoxedA->some_double</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_enum.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_enum.page
new file mode 100644 (file)
index 0000000..c31c20d
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestSimpleBoxedA-some_enum"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestSimpleBoxedA" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestSimpleBoxedA->some_enum</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_int.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_int.page
new file mode 100644 (file)
index 0000000..aad211d
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestSimpleBoxedA-some_int"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestSimpleBoxedA" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestSimpleBoxedA->some_int</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_int8.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_int8.page
new file mode 100644 (file)
index 0000000..349c0af
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestSimpleBoxedA-some_int8"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestSimpleBoxedA" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestSimpleBoxedA->some_int8</title>
+
+
+</page>
index 628186a..4910e4d 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestSimpleBoxedA" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_simple_boxed_a_const_return</api:name>
     </api:function>
-
   </info>
   <title>regress_test_simple_boxed_a_const_return</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 const RegressTestSimpleBoxedA* regress_test_simple_boxed_a_const_return (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ const RegressTestSimpleBoxedA* regress_test_simple_boxed_a_const_return (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 4e7cf0e..e711958 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestSimpleBoxedA" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>a</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_simple_boxed_a_copy</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressTestSimpleBoxedA* regress_test_simple_boxed_a_copy (RegressTestSimpleBoxedA* a);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>a</code></title>
@@ -43,6 +35,4 @@ RegressTestSimpleBoxedA* regress_test_simple_boxed_a_copy (RegressTestSimpleBoxe
 </item>
 </terms>
 
-  
-  
 </page>
index 5e5dcbd..43f8cba 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestSimpleBoxedA" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>other_a</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_simple_boxed_a_equals</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gboolean regress_test_simple_boxed_a_equals (RegressTestSimpleBoxedA* a,
                                              RegressTestSimpleBoxedA* other_a);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>a</code></title>
@@ -52,6 +44,4 @@ gboolean regress_test_simple_boxed_a_equals (RegressTestSimpleBoxedA* a,
 </item>
 </terms>
 
-  
-  
 </page>
index 08f968f..54570ae 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.TestSimpleBoxedA"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestSimpleBoxedA</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB-nested_a.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB-nested_a.page
new file mode 100644 (file)
index 0000000..6014279
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestSimpleBoxedB-nested_a"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestSimpleBoxedB" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestSimpleBoxedB->nested_a</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB-some_int8.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB-some_int8.page
new file mode 100644 (file)
index 0000000..8c8b86d
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestSimpleBoxedB-some_int8"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestSimpleBoxedB" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestSimpleBoxedB->some_int8</title>
+
+
+</page>
index fd59315..3664cda 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestSimpleBoxedB" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>b</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_simple_boxed_b_copy</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressTestSimpleBoxedB* regress_test_simple_boxed_b_copy (RegressTestSimpleBoxedB* b);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>b</code></title>
@@ -43,6 +35,4 @@ RegressTestSimpleBoxedB* regress_test_simple_boxed_b_copy (RegressTestSimpleBoxe
 </item>
 </terms>
 
-  
-  
 </page>
index 2ed2304..170c176 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.TestSimpleBoxedB"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestSimpleBoxedB</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index f815782..322d497 100644 (file)
@@ -1,25 +1,24 @@
 <?xml version="1.0"?>
 <page id="Regress.TestSimpleCallback"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
-  </info>
+    <link xref="index" group="callback" type="guide"/>
+    </info>
   <title>Regress.TestSimpleCallback</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-csrc">
+void TestSimpleCallback (void);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_double.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_double.page
new file mode 100644 (file)
index 0000000..6cc6110
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructA-some_double"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructA" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructA->some_double</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_enum.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_enum.page
new file mode 100644 (file)
index 0000000..1fc8f31
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructA-some_enum"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructA" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructA->some_enum</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_int.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_int.page
new file mode 100644 (file)
index 0000000..b3e1d84
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructA-some_int"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructA" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructA->some_int</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_int8.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_int8.page
new file mode 100644 (file)
index 0000000..cdfd2a9
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructA-some_int8"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructA" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructA->some_int8</title>
+
+
+</page>
index 9b4d353..e928083 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestStructA" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>a_out</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_struct_a_clone</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_struct_a_clone (RegressTestStructA* a,
                                   RegressTestStructA* a_out);
-</code></synopsis>
+  </code></synopsis>
+  <p>Make a copy of a RegressTestStructA</p>
 
-  
-    <p>Make a copy of a RegressTestStructA</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>a</code></title>
-<p>the structure</p>
+  <p>the structure</p>
 </item>
 <item>
 <title><code>a_out</code></title>
-<p>the cloned structure</p>
+  <p>the cloned structure</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -52,6 +44,4 @@ void regress_test_struct_a_clone (RegressTestStructA* a,
 </item>
 </terms>
 
-  
-  
 </page>
index 22a1e90..b7f81f3 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.TestStructA"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestStructA</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index befbd7c..4ac3686 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestStructA" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>string</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_struct_a_parse</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_struct_a_parse (RegressTestStructA* a_out,
                                   const gchar* string);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>a_out</code></title>
-<p>the structure that is to be filled</p>
+  <p>the structure that is to be filled</p>
 </item>
 <item>
 <title><code>string</code></title>
-<p>ignored</p>
+  <p>ignored</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -52,6 +44,4 @@ void regress_test_struct_a_parse (RegressTestStructA* a_out,
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB-nested_a.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB-nested_a.page
new file mode 100644 (file)
index 0000000..5864588
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructB-nested_a"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructB" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructB->nested_a</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB-some_int8.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB-some_int8.page
new file mode 100644 (file)
index 0000000..d7e90d7
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructB-some_int8"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructB" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructB->some_int8</title>
+
+
+</page>
index b3a9f99..c87287e 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestStructB" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>b_out</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_struct_b_clone</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_struct_b_clone (RegressTestStructB* b,
                                   RegressTestStructB* b_out);
-</code></synopsis>
+  </code></synopsis>
+  <p>Make a copy of a RegressTestStructB</p>
 
-  
-    <p>Make a copy of a RegressTestStructB</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>b</code></title>
-<p>the structure</p>
+  <p>the structure</p>
 </item>
 <item>
 <title><code>b_out</code></title>
-<p>the cloned structure</p>
+  <p>the cloned structure</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -52,6 +44,4 @@ void regress_test_struct_b_clone (RegressTestStructB* b,
 </item>
 </terms>
 
-  
-  
 </page>
index 4ed2b54..36e2629 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.TestStructB"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestStructB</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructC-another_int.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructC-another_int.page
new file mode 100644 (file)
index 0000000..9d3e222
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructC-another_int"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructC" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructC->another_int</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructC-obj.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructC-obj.page
new file mode 100644 (file)
index 0000000..ecf3c25
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructC-obj"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructC" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructC->obj</title>
+
+
+</page>
index f208fcd..c14639e 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.TestStructC"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestStructC</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-array1.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-array1.page
new file mode 100644 (file)
index 0000000..6e8cf23
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructD-array1"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructD" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructD->array1</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-array2.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-array2.page
new file mode 100644 (file)
index 0000000..93995fe
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructD-array2"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructD" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructD->array2</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-field.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-field.page
new file mode 100644 (file)
index 0000000..e46d5da
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructD-field"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructD" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructD->field</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-garray.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-garray.page
new file mode 100644 (file)
index 0000000..39adf11
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructD-garray"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructD" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructD->garray</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-list.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-list.page
new file mode 100644 (file)
index 0000000..2601051
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructD-list"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructD" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructD->list</title>
+
+
+</page>
index f791d70..0195113 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.TestStructD"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestStructD</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE-some_type.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE-some_type.page
new file mode 100644 (file)
index 0000000..ea61037
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructE-some_type"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructE" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructE->some_type</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE-some_union.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE-some_union.page
new file mode 100644 (file)
index 0000000..fda8d2a
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructE-some_union"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructE" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructE->some_union</title>
+
+
+</page>
index ccc8bbd..0520f3c 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.TestStructE"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestStructE</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_double.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_double.page
new file mode 100644 (file)
index 0000000..d80e779
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructE__some_union__union-v_double"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructE__some_union__union"
+      group="field"
+      type="guide"/>
+  </info>
+  <title>Regress.TestStructE__some_union__union->v_double</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_float.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_float.page
new file mode 100644 (file)
index 0000000..30d6126
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructE__some_union__union-v_float"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructE__some_union__union"
+      group="field"
+      type="guide"/>
+  </info>
+  <title>Regress.TestStructE__some_union__union->v_float</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_int.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_int.page
new file mode 100644 (file)
index 0000000..487a6c5
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructE__some_union__union-v_int"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructE__some_union__union"
+      group="field"
+      type="guide"/>
+  </info>
+  <title>Regress.TestStructE__some_union__union->v_int</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_int64.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_int64.page
new file mode 100644 (file)
index 0000000..fbe75bf
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructE__some_union__union-v_int64"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructE__some_union__union"
+      group="field"
+      type="guide"/>
+  </info>
+  <title>Regress.TestStructE__some_union__union->v_int64</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_long.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_long.page
new file mode 100644 (file)
index 0000000..a909fa8
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructE__some_union__union-v_long"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructE__some_union__union"
+      group="field"
+      type="guide"/>
+  </info>
+  <title>Regress.TestStructE__some_union__union->v_long</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_pointer.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_pointer.page
new file mode 100644 (file)
index 0000000..8dca96c
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructE__some_union__union-v_pointer"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructE__some_union__union"
+      group="field"
+      type="guide"/>
+  </info>
+  <title>Regress.TestStructE__some_union__union->v_pointer</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_uint.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_uint.page
new file mode 100644 (file)
index 0000000..61d30a2
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructE__some_union__union-v_uint"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructE__some_union__union"
+      group="field"
+      type="guide"/>
+  </info>
+  <title>Regress.TestStructE__some_union__union->v_uint</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_uint64.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_uint64.page
new file mode 100644 (file)
index 0000000..360e1e9
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructE__some_union__union-v_uint64"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructE__some_union__union"
+      group="field"
+      type="guide"/>
+  </info>
+  <title>Regress.TestStructE__some_union__union->v_uint64</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_ulong.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_ulong.page
new file mode 100644 (file)
index 0000000..117b95f
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructE__some_union__union-v_ulong"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructE__some_union__union"
+      group="field"
+      type="guide"/>
+  </info>
+  <title>Regress.TestStructE__some_union__union->v_ulong</title>
+
+
+</page>
index 3b81e62..e9b94f4 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.TestStructE__some_union__union"
-      type="topic"
-      style="default"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestStructE__some_union__union</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data1.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data1.page
new file mode 100644 (file)
index 0000000..5d424ad
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructF-data1"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructF" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructF->data1</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data2.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data2.page
new file mode 100644 (file)
index 0000000..b03800e
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructF-data2"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructF" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructF->data2</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data3.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data3.page
new file mode 100644 (file)
index 0000000..e25e712
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructF-data3"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructF" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructF->data3</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data4.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data4.page
new file mode 100644 (file)
index 0000000..ceedf9d
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructF-data4"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructF" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructF->data4</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data5.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data5.page
new file mode 100644 (file)
index 0000000..d239488
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructF-data5"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructF" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructF->data5</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data6.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data6.page
new file mode 100644 (file)
index 0000000..09d7215
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructF-data6"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructF" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructF->data6</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-ref_count.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-ref_count.page
new file mode 100644 (file)
index 0000000..98fad0b
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructF-ref_count"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructF" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructF->ref_count</title>
+
+
+</page>
index 74e8483..860d608 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.TestStructF"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestStructF</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray-array.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray-array.page
new file mode 100644 (file)
index 0000000..fb214ce
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructFixedArray-array"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructFixedArray" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructFixedArray->array</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray-just_int.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray-just_int.page
new file mode 100644 (file)
index 0000000..0c8a594
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructFixedArray-just_int"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructFixedArray" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructFixedArray->just_int</title>
+
+
+</page>
index 7d5ed65..ad52571 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestStructFixedArray" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>str</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_struct_fixed_array_frob</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_struct_fixed_array_frob (RegressTestStructFixedArray* str);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>str</code></title>
@@ -43,6 +35,4 @@ void regress_test_struct_fixed_array_frob (RegressTestStructFixedArray* str);
 </item>
 </terms>
 
-  
-  
 </page>
index f33eed9..6b6ea3a 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.TestStructFixedArray"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestStructFixedArray</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj-parent_instance.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj-parent_instance.page
new file mode 100644 (file)
index 0000000..15b87da
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestSubObj-parent_instance"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestSubObj" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestSubObj->parent_instance</title>
+
+
+</page>
index fa401f5..3a16280 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestSubObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>obj</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_sub_obj_instance_method</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 int regress_test_sub_obj_instance_method (RegressTestSubObj* obj);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>obj</code></title>
@@ -43,6 +35,4 @@ int regress_test_sub_obj_instance_method (RegressTestSubObj* obj);
 </item>
 </terms>
 
-  
-  
 </page>
index fbff9d9..ffada79 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestSubObj" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_sub_obj_new</api:name>
     </api:function>
-
   </info>
   <title>regress_test_sub_obj_new</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressTestObj* regress_test_sub_obj_new (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ RegressTestObj* regress_test_sub_obj_new (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 7c6cb98..240e155 100644 (file)
@@ -6,19 +6,11 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestSubObj</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
   <synopsis>
     <title>Hierarchy</title>
     <tree>
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-csrc"
          groups="method" style="linklist">
@@ -43,7 +38,7 @@
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-csrc"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
index 5497c25..c33ed67 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestSubObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>obj</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_sub_obj_unset_bare</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_sub_obj_unset_bare (RegressTestSubObj* obj);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>obj</code></title>
@@ -43,6 +35,4 @@ void regress_test_sub_obj_unset_bare (RegressTestSubObj* obj);
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObjClass-parent_class.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObjClass-parent_class.page
new file mode 100644 (file)
index 0000000..618b8f3
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestSubObjClass-parent_class"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestSubObjClass" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestSubObjClass->parent_class</title>
+
+
+</page>
index 8954334..ab00f64 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.TestSubObjClass"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestSubObjClass</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index e0a7bc0..fcb2f3b 100644 (file)
@@ -6,20 +6,9 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="default" type="guide"/>
   </info>
   <title>Regress.TestTypeGUInt64</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x-parent_instance.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x-parent_instance.page
new file mode 100644 (file)
index 0000000..7bdb8c1
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestWi8021x-parent_instance"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestWi8021x" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestWi8021x->parent_instance</title>
+
+
+</page>
index 47ad7be..ab6862c 100644 (file)
@@ -6,21 +6,10 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestWi8021x" group="property" type="guide"/>
     <title type="link" role="topic">testbool</title>
-
   </info>
   <title>Regress.TestWi8021x:testbool</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
index 9153172..208e214 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestWi8021x" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>obj</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_wi_802_1x_get_testbool</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gboolean regress_test_wi_802_1x_get_testbool (RegressTestWi8021x* obj);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>obj</code></title>
@@ -43,6 +35,4 @@ gboolean regress_test_wi_802_1x_get_testbool (RegressTestWi8021x* obj);
 </item>
 </terms>
 
-  
-  
 </page>
index 7afe8b1..e136adc 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestWi8021x" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_wi_802_1x_new</api:name>
     </api:function>
-
   </info>
   <title>regress_test_wi_802_1x_new</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressTestWi8021x* regress_test_wi_802_1x_new (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ RegressTestWi8021x* regress_test_wi_802_1x_new (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 2965873..8346e89 100644 (file)
@@ -6,19 +6,11 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestWi8021x</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
   <synopsis>
     <title>Hierarchy</title>
     <tree>
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-csrc"
          groups="method" style="linklist">
@@ -40,7 +35,7 @@
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-csrc"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
index bad3b1d..170fd5c 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestWi8021x" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>v</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_wi_802_1x_set_testbool</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_wi_802_1x_set_testbool (RegressTestWi8021x* obj,
                                           gboolean v);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>obj</code></title>
@@ -52,6 +44,4 @@ void regress_test_wi_802_1x_set_testbool (RegressTestWi8021x* obj,
 </item>
 </terms>
 
-  
-  
 </page>
index c0e98df..ef11560 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestWi8021x" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>x</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_wi_802_1x_static_method</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 int regress_test_wi_802_1x_static_method (int x);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>x</code></title>
@@ -43,6 +35,4 @@ int regress_test_wi_802_1x_static_method (int x);
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021xClass-parent_class.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021xClass-parent_class.page
new file mode 100644 (file)
index 0000000..f3dba05
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestWi8021xClass-parent_class"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestWi8021xClass" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestWi8021xClass->parent_class</title>
+
+
+</page>
index 5959303..5fe3d2c 100644 (file)
@@ -1,25 +1,35 @@
 <?xml version="1.0"?>
 <page id="Regress.TestWi8021xClass"
-      type="topic"
-      style="record"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestWi8021xClass</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.UTF8_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.UTF8_CONSTANT.page
new file mode 100644 (file)
index 0000000..343ad00
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.UTF8_CONSTANT"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.UTF8_CONSTANT</title>
+
+
+</page>
index 6b7d031..7df012a 100644 (file)
@@ -6,20 +6,9 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="default" type="guide"/>
   </info>
   <title>Regress.VaListAlias</title>
-  
-  
-  
-    <p>Typedef'd va_list for additional reasons</p>
-  
-  
-  
-  
-  
-  
-  
+  <p>Typedef'd va_list for additional reasons</p>
+
 </page>
index 769da09..6e4065a 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>boxed</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_aliased_caller_alloc</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_aliased_caller_alloc (RegressAliasedTestBoxed* boxed);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>boxed</code></title>
@@ -43,6 +35,4 @@ void regress_aliased_caller_alloc (RegressAliasedTestBoxed* boxed);
 </item>
 </terms>
 
-  
-  
 </page>
index dbf8b82..f57817b 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>data</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_attribute_func</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gint regress_annotation_attribute_func (RegressAnnotationObject* object,
                                         const gchar* data);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
-<p>A <link xref="Regress.AnnotationObject"/>.</p>
+  <p>A <link xref="Regress.AnnotationObject"/>.</p>
 </item>
 <item>
 <title><code>data</code></title>
-<p>Some data.</p>
+  <p>Some data.</p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>The return value.</p>
+  <p>The return value.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 2a474a5..72f910a 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>data</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_custom_destroy</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_annotation_custom_destroy (RegressAnnotationCallback callback,
                                         RegressAnnotationNotifyFunc destroy,
                                         gpointer data);
-</code></synopsis>
-
-  
-    <p>Test messing up the heuristic of closure/destroy-notification
+  </code></synopsis>
+  <p>Test messing up the heuristic of closure/destroy-notification
 detection, and fixing it via annotations.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>callback</code></title>
-<p>Destroy notification</p>
+  <p>Destroy notification</p>
 </item>
 <item>
 <title><code>destroy</code></title>
@@ -62,6 +54,4 @@ detection, and fixing it via annotations.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index a76bade..c05e678 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_get_source_file</api:name>
     </api:function>
-
   </info>
   <title>regress_annotation_get_source_file</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 char* regress_annotation_get_source_file (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>Source file</p>
+  <p>Source file</p>
 </item>
 </terms>
 
-  
-  
 </page>
index d2f479a..7e14343 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>argv</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_init</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_annotation_init (int* argc,
                               char*** argv);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>argc</code></title>
-<p>The number of args.</p>
+  <p>The number of args.</p>
 </item>
 <item>
 <title><code>argv</code></title>
-<p>The arguments.</p>
+  <p>The arguments.</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -52,6 +44,4 @@ void regress_annotation_init (int* argc,
 </item>
 </terms>
 
-  
-  
 </page>
index e0399cd..acec228 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>foo</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_invalid_regress_annotation</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_annotation_invalid_regress_annotation (int foo);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>foo</code></title>
-<p>some text (e.g. example) or else</p>
+  <p>some text (e.g. example) or else</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -43,6 +35,4 @@ void regress_annotation_invalid_regress_annotation (int foo);
 </item>
 </terms>
 
-  
-  
 </page>
index 3b83de9..e88f535 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>array</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_ptr_array</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_annotation_ptr_array (GValue* array);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>array</code></title>
-<p>the array</p>
+  <p>the array</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -43,6 +35,4 @@ void regress_annotation_ptr_array (GValue* array);
 </item>
 </terms>
 
-  
-  
 </page>
index d13fee5..1048c61 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>length</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_return_array</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 char** regress_annotation_return_array (int* length);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>length</code></title>
-<p>Number of return values</p>
+  <p>Number of return values</p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>The return value</p>
+  <p>The return value</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 2e48458..0afdf09 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_return_filename</api:name>
     </api:function>
-
   </info>
   <title>regress_annotation_return_filename</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gchar* regress_annotation_return_filename (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>An annotated filename</p>
+  <p>An annotated filename</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 84c616f..2f7fb86 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>fname</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_set_source_file</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_annotation_set_source_file (char* fname);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>fname</code></title>
-<p>Source file</p>
+  <p>Source file</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -43,6 +35,4 @@ void regress_annotation_set_source_file (char* fname);
 </item>
 </terms>
 
-  
-  
 </page>
index 39cd529..1453f0e 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_space_after_comment_bug631690</api:name>
     </api:function>
-
   </info>
   <title>regress_annotation_space_after_comment_bug631690</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_annotation_space_after_comment_bug631690 (void);
-</code></synopsis>
+  </code></synopsis>
+  <p>Explicitly test having a space after the ** here.</p>
 
-  
-    <p>Explicitly test having a space after the ** here.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ void regress_annotation_space_after_comment_bug631690 (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 5d3813d..d37326c 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>properties</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_string_array_length</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_annotation_string_array_length (guint n_properties,
                                              utf8* properties);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>n_properties</code></title>
@@ -52,6 +44,4 @@ void regress_annotation_string_array_length (guint n_properties,
 </item>
 </terms>
 
-  
-  
 </page>
index 8c68554..48c812e 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_string_zero_terminated</api:name>
     </api:function>
-
   </info>
   <title>regress_annotation_string_zero_terminated</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 char** regress_annotation_string_zero_terminated (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>The return value</p>
+  <p>The return value</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 13eb1ca..ac9964d 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>out</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_annotation_string_zero_terminated_out</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_annotation_string_zero_terminated_out (char*** out);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>out</code></title>
@@ -43,6 +35,4 @@ void regress_annotation_string_zero_terminated_out (char*** out);
 </item>
 </terms>
 
-  
-  
 </page>
index 6fc0ad4..b9dba0a 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_test_parsing_bug630862</api:name>
     </api:function>
-
   </info>
   <title>regress_annotation_test_parsing_bug630862</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GObject* regress_annotation_test_parsing_bug630862 (void);
-</code></synopsis>
+  </code></synopsis>
+  <p>See https://bugzilla.gnome.org/show_bug.cgi?id=630862</p>
 
-  
-    <p>See https://bugzilla.gnome.org/show_bug.cgi?id=630862</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>An object, note the colon:in here</p>
+  <p>An object, note the colon:in here</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 4db50ca..78684c8 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_transfer_floating</api:name>
     </api:function>
-
   </info>
   <title>regress_annotation_transfer_floating</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GObject* regress_annotation_transfer_floating (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>A floating object</p>
+  <p>A floating object</p>
 </item>
 </terms>
 
-  
-  
 </page>
index f12a3cf..2d36790 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_versioned</api:name>
     </api:function>
-
   </info>
   <title>regress_annotation_versioned</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_annotation_versioned (void);
-</code></synopsis>
+  </code></synopsis>
 
-  
-    
-  
-  
-    <p>Since 0.6</p>
-  
-  
+  <p>Since 0.6</p>
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -36,6 +27,4 @@ void regress_annotation_versioned (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 75bc68c..6d9968b 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_atest_error_quark</api:name>
     </api:function>
-
   </info>
   <title>regress_atest_error_quark</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GQuark regress_atest_error_quark (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ GQuark regress_atest_error_quark (void);
 </item>
 </terms>
 
-  
-  
 </page>
index eadb613..f667df6 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>user_data</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_async_ready_callback</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_foo_async_ready_callback (GCancellable* cancellable,
                                        GAsyncReadyCallback callback,
                                        gpointer user_data);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>cancellable</code></title>
@@ -61,6 +53,4 @@ void regress_foo_async_ready_callback (GCancellable* cancellable,
 </item>
 </terms>
 
-  
-  
 </page>
index b37a287..58a7e41 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>destroy</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_destroy_notify_callback</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_foo_destroy_notify_callback (RegressFooCallback callback,
                                           gpointer data,
                                           GDestroyNotify destroy);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -61,6 +53,4 @@ void regress_foo_destroy_notify_callback (RegressFooCallback callback,
 </item>
 </terms>
 
-  
-  
 </page>
index f035be5..e627759 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_init</api:name>
     </api:function>
-
   </info>
   <title>regress_foo_init</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gint regress_foo_init (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ gint regress_foo_init (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 5eef0df..2a77e2c 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>s</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_method_external_references</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_foo_method_external_references (UtilityObject* object,
                                              UtilityEnumType e,
                                              UtilityFlagType f,
                                              UtilityStruct s);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
@@ -70,6 +62,4 @@ void regress_foo_method_external_references (UtilityObject* object,
 </item>
 </terms>
 
-  
-  
 </page>
index 63d5766..01bbafe 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_not_a_constructor_new</api:name>
     </api:function>
-
   </info>
   <title>regress_foo_not_a_constructor_new</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressFooObject* regress_foo_not_a_constructor_new (void);
-</code></synopsis>
-
-  
-    <p>This should be scanned as a top-level function, and shouldn't cause
+  </code></synopsis>
+  <p>This should be scanned as a top-level function, and shouldn't cause
 a "Can't find matching type for constructor" warning.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -36,6 +28,4 @@ a "Can't find matching type for constructor" warning.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 96773b3..df4d2e7 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>fs</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_skip_me</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_foo_skip_me (RegressFooSkippable fs);
-</code></synopsis>
-
-  
-    <p>Does something that's only interesting from C and should not be
+  </code></synopsis>
+  <p>Does something that's only interesting from C and should not be
 exposed to language bindings.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>fs</code></title>
-<p>a <link xref="Regress.FooSkippable"/></p>
+  <p>a <link xref="Regress.FooSkippable"/></p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -44,6 +36,4 @@ exposed to language bindings.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 41e570f..ca7cd1e 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>args</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_some_variant</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_foo_some_variant (guint x,
                                va_list args);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>x</code></title>
@@ -52,6 +44,4 @@ void regress_foo_some_variant (guint x,
 </item>
 </terms>
 
-  
-  
 </page>
index 81483f1..a292f00 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>args</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_some_variant_ptr</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_foo_some_variant_ptr (guint x,
                                    va_list* args);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>x</code></title>
@@ -52,6 +44,4 @@ void regress_foo_some_variant_ptr (guint x,
 </item>
 </terms>
 
-  
-  
 </page>
index 810eba9..d04ec86 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_test_array</api:name>
     </api:function>
-
   </info>
   <title>regress_foo_test_array</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GArray* regress_foo_test_array (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ GArray* regress_foo_test_array (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 57ca7b3..9368b46 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>param</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_test_const_char_param</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_foo_test_const_char_param (const char* param);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>param</code></title>
@@ -43,6 +35,4 @@ void regress_foo_test_const_char_param (const char* param);
 </item>
 </terms>
 
-  
-  
 </page>
index 839bee2..bc5b9b5 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_test_const_char_retval</api:name>
     </api:function>
-
   </info>
   <title>regress_foo_test_const_char_retval</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 const char* regress_foo_test_const_char_retval (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ const char* regress_foo_test_const_char_retval (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 00a1e07..414a286 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>param</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_test_const_struct_param</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_foo_test_const_struct_param (const RegressFooStruct* param);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>param</code></title>
@@ -43,6 +35,4 @@ void regress_foo_test_const_struct_param (const RegressFooStruct* param);
 </item>
 </terms>
 
-  
-  
 </page>
index 527b8ea..72c58a0 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_test_const_struct_retval</api:name>
     </api:function>
-
   </info>
   <title>regress_foo_test_const_struct_retval</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 const RegressFooStruct* regress_foo_test_const_struct_retval (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ const RegressFooStruct* regress_foo_test_const_struct_retval (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 17bf08a..d6bc02b 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>array</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_test_string_array</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_foo_test_string_array (char** array);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>array</code></title>
@@ -43,6 +35,4 @@ void regress_foo_test_string_array (char** array);
 </item>
 </terms>
 
-  
-  
 </page>
index 91d5824..22d2635 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>array</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_test_string_array_with_g</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_foo_test_string_array_with_g (gchar** array);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>array</code></title>
@@ -43,6 +35,4 @@ void regress_foo_test_string_array_with_g (gchar** array);
 </item>
 </terms>
 
-  
-  
 </page>
index 8e02366..7019d51 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>unsigned_param</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_test_unsigned_qualifier</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_foo_test_unsigned_qualifier (unsigned int unsigned_param);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>unsigned_param</code></title>
@@ -43,6 +35,4 @@ void regress_foo_test_unsigned_qualifier (unsigned int unsigned_param);
 </item>
 </terms>
 
-  
-  
 </page>
index 04eec05..56870b4 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>unsigned_param</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_test_unsigned_type</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_foo_test_unsigned_type (unsigned unsigned_param);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>unsigned_param</code></title>
@@ -43,6 +35,4 @@ void regress_foo_test_unsigned_type (unsigned unsigned_param);
 </item>
 </terms>
 
-  
-  
 </page>
index 210f53c..edc60f1 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_test_varargs_callback</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_foo_test_varargs_callback (gint i,
                                         RegressFooVarargsCallback callback);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>i</code></title>
@@ -52,6 +44,4 @@ void regress_foo_test_varargs_callback (gint i,
 </item>
 </terms>
 
-  
-  
 </page>
index 1d49d31..ef371fc 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_test_varargs_callback2</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_foo_test_varargs_callback2 (RegressFooVarargsCallback callback);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -43,6 +35,4 @@ void regress_foo_test_varargs_callback2 (RegressFooVarargsCallback callback);
 </item>
 </terms>
 
-  
-  
 </page>
index 19c1932..0453e64 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback2</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_foo_test_varargs_callback3</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_foo_test_varargs_callback3 (RegressFooVarargsCallback callback,
                                          RegressFooVarargsCallback callback2);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -52,6 +44,4 @@ void regress_foo_test_varargs_callback3 (RegressFooVarargsCallback callback,
 </item>
 </terms>
 
-  
-  
 </page>
index 40093e2..7507bb7 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>obj</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_func_obj_null_in</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_func_obj_null_in (RegressTestObj* obj);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>obj</code></title>
-<p>A <link xref="Regress.TestObj"/></p>
+  <p>A <link xref="Regress.TestObj"/></p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -43,6 +35,4 @@ void regress_func_obj_null_in (RegressTestObj* obj);
 </item>
 </terms>
 
-  
-  
 </page>
index a43baa0..d174ecc 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>v</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_global_get_flags_out</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_global_get_flags_out (RegressTestFlags* v);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>v</code></title>
-<p>A flags value</p>
+  <p>A flags value</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -43,6 +35,4 @@ void regress_global_get_flags_out (RegressTestFlags* v);
 </item>
 </terms>
 
-  
-  
 </page>
index 6fd4e6b..05505a7 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>attributes</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_has_parameter_named_attrs</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_has_parameter_named_attrs (int foo,
                                         gpointer* attributes);
-</code></synopsis>
-
-  
-    <p>This test case mirrors GnomeKeyringPasswordSchema from
+  </code></synopsis>
+  <p>This test case mirrors GnomeKeyringPasswordSchema from
 libgnome-keyring.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>foo</code></title>
-<p>some int</p>
+  <p>some int</p>
 </item>
 <item>
 <title><code>attributes</code></title>
-<p>list of attributes</p>
+  <p>list of attributes</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -53,6 +45,4 @@ libgnome-keyring.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 4d30ec5..dc6b573 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>data</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_introspectable_via_alias</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_introspectable_via_alias (RegressPtrArrayAlias* data);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>data</code></title>
@@ -43,6 +35,4 @@ void regress_introspectable_via_alias (RegressPtrArrayAlias* data);
 </item>
 </terms>
 
-  
-  
 </page>
index 6158db4..a9f494c 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>ok</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_not_introspectable_via_alias</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_not_introspectable_via_alias (RegressVaListAlias ok);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>ok</code></title>
@@ -43,6 +35,4 @@ void regress_not_introspectable_via_alias (RegressVaListAlias ok);
 </item>
 </terms>
 
-  
-  
 </page>
index 3304979..e6fb0a6 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>v</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_random_function_with_skipped_structure</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_random_function_with_skipped_structure (int x,
                                                      RegressSkippedStructure* foo,
                                                      double v);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>x</code></title>
@@ -61,6 +53,4 @@ void regress_random_function_with_skipped_structure (int x,
 </item>
 </terms>
 
-  
-  
 </page>
index 2853609..0d02fd1 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>abort_on_error</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_set_abort_on_error</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_set_abort_on_error (gboolean abort_on_error);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>abort_on_error</code></title>
@@ -43,6 +35,4 @@ void regress_set_abort_on_error (gboolean abort_on_error);
 </item>
 </terms>
 
-  
-  
 </page>
index ee1afcd..ea616e3 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_array_callback</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 int regress_test_array_callback (RegressTestCallbackArray callback);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -43,6 +35,4 @@ int regress_test_array_callback (RegressTestCallbackArray callback);
 </item>
 </terms>
 
-  
-  
 </page>
index 8110915..c759e09 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>objs</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_array_fixed_out_objects</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_array_fixed_out_objects (RegressTestObj*** objs);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>objs</code></title>
-<p>An array of <link xref="Regress.TestObj"/></p>
+  <p>An array of <link xref="Regress.TestObj"/></p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -43,6 +35,4 @@ void regress_test_array_fixed_out_objects (RegressTestObj*** objs);
 </item>
 </terms>
 
-  
-  
 </page>
index 21c6d9f..d5d7d80 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>ints</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_array_fixed_size_int_in</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 int regress_test_array_fixed_size_int_in (int* ints);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>ints</code></title>
-<p>a list of 5 integers</p>
+  <p>a list of 5 integers</p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>the sum of the items in <code>ints</code></p>
+  <p>the sum of the items in <code>ints</code></p>
 </item>
 </terms>
 
-  
-  
 </page>
index 3fa5c4e..414bb64 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>ints</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_array_fixed_size_int_out</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_array_fixed_size_int_out (int** ints);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>ints</code></title>
-<p>a list of 5 integers ranging from 0 to 4</p>
+  <p>a list of 5 integers ranging from 0 to 4</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -43,6 +35,4 @@ void regress_test_array_fixed_size_int_out (int** ints);
 </item>
 </terms>
 
-  
-  
 </page>
index 913dc0d..5b70e08 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_array_fixed_size_int_return</api:name>
     </api:function>
-
   </info>
   <title>regress_test_array_fixed_size_int_return</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 int* regress_test_array_fixed_size_int_return (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>a list of 5 integers ranging from 0 to 4</p>
+  <p>a list of 5 integers ranging from 0 to 4</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 7d05b00..6325a59 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>ints</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_array_gint16_in</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 int regress_test_array_gint16_in (int n_ints,
                                   gint16* ints);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>n_ints</code></title>
@@ -44,7 +36,7 @@ int regress_test_array_gint16_in (int n_ints,
 </item>
 <item>
 <title><code>ints</code></title>
-<p>List of ints</p>
+  <p>List of ints</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -52,6 +44,4 @@ int regress_test_array_gint16_in (int n_ints,
 </item>
 </terms>
 
-  
-  
 </page>
index c5eee2d..36f0e64 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>ints</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_array_gint32_in</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gint32 regress_test_array_gint32_in (int n_ints,
                                      gint32* ints);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>n_ints</code></title>
@@ -44,7 +36,7 @@ gint32 regress_test_array_gint32_in (int n_ints,
 </item>
 <item>
 <title><code>ints</code></title>
-<p>List of ints</p>
+  <p>List of ints</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -52,6 +44,4 @@ gint32 regress_test_array_gint32_in (int n_ints,
 </item>
 </terms>
 
-  
-  
 </page>
index 7a7701d..96f37c8 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>ints</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_array_gint64_in</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gint64 regress_test_array_gint64_in (int n_ints,
                                      gint64* ints);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>n_ints</code></title>
@@ -44,7 +36,7 @@ gint64 regress_test_array_gint64_in (int n_ints,
 </item>
 <item>
 <title><code>ints</code></title>
-<p>List of ints</p>
+  <p>List of ints</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -52,6 +44,4 @@ gint64 regress_test_array_gint64_in (int n_ints,
 </item>
 </terms>
 
-  
-  
 </page>
index 8e68579..6b6fd24 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>ints</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_array_gint8_in</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 int regress_test_array_gint8_in (int n_ints,
                                  gint8* ints);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>n_ints</code></title>
@@ -44,7 +36,7 @@ int regress_test_array_gint8_in (int n_ints,
 </item>
 <item>
 <title><code>ints</code></title>
-<p>List of ints</p>
+  <p>List of ints</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -52,6 +44,4 @@ int regress_test_array_gint8_in (int n_ints,
 </item>
 </terms>
 
-  
-  
 </page>
index 0eab274..51545e3 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>types</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_array_gtype_in</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 char* regress_test_array_gtype_in (int n_types,
                                    GType* types);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>n_types</code></title>
@@ -44,14 +36,12 @@ char* regress_test_array_gtype_in (int n_types,
 </item>
 <item>
 <title><code>types</code></title>
-<p>List of types</p>
+  <p>List of types</p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>string representation of provided types</p>
+  <p>string representation of provided types</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 5eb26d6..54fdd14 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>len</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_array_int_full_out</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 int* regress_test_array_int_full_out (int* len);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>len</code></title>
-<p>length of the returned array.</p>
+  <p>length of the returned array.</p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>a new array of integers.</p>
+  <p>a new array of integers.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 0caeee1..97a25eb 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>ints</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_array_int_in</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 int regress_test_array_int_in (int n_ints,
                                int* ints);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>n_ints</code></title>
@@ -44,7 +36,7 @@ int regress_test_array_int_in (int n_ints,
 </item>
 <item>
 <title><code>ints</code></title>
-<p>List of ints</p>
+  <p>List of ints</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -52,6 +44,4 @@ int regress_test_array_int_in (int n_ints,
 </item>
 </terms>
 
-  
-  
 </page>
index 75d142a..1fc3d1b 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>ints</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_array_int_inout</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_array_int_inout (int* n_ints,
                                    int** ints);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>n_ints</code></title>
-<p>the length of <code>ints</code></p>
+  <p>the length of <code>ints</code></p>
 </item>
 <item>
 <title><code>ints</code></title>
-<p>a list of integers whose items will be increased by 1, except the first that will be dropped</p>
+  <p>a list of integers whose items will be increased by 1, except the first that will be dropped</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -52,6 +44,4 @@ void regress_test_array_int_inout (int* n_ints,
 </item>
 </terms>
 
-  
-  
 </page>
index c4698ce..91bef74 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>len</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_array_int_none_out</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 int* regress_test_array_int_none_out (int* len);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>len</code></title>
-<p>length of the returned array.</p>
+  <p>length of the returned array.</p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>a static array of integers.</p>
+  <p>a static array of integers.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index bab1741..824fc94 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>len</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_array_int_null_in</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_array_int_null_in (int* arr,
                                      int len);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>arr</code></title>
@@ -44,7 +36,7 @@ void regress_test_array_int_null_in (int* arr,
 </item>
 <item>
 <title><code>len</code></title>
-<p>length</p>
+  <p>length</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -52,6 +44,4 @@ void regress_test_array_int_null_in (int* arr,
 </item>
 </terms>
 
-  
-  
 </page>
index cdf6bda..c3645c9 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>len</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_array_int_null_out</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_array_int_null_out (int** arr,
                                       int* len);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>arr</code></title>
@@ -44,7 +36,7 @@ void regress_test_array_int_null_out (int** arr,
 </item>
 <item>
 <title><code>len</code></title>
-<p>length</p>
+  <p>length</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -52,6 +44,4 @@ void regress_test_array_int_null_out (int** arr,
 </item>
 </terms>
 
-  
-  
 </page>
index b88feb2..c7f3407 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>ints</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_array_int_out</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_array_int_out (int* n_ints,
                                  int** ints);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>n_ints</code></title>
-<p>the length of <code>ints</code></p>
+  <p>the length of <code>ints</code></p>
 </item>
 <item>
 <title><code>ints</code></title>
-<p>a list of 5 integers, from 0 to 4 in consecutive order</p>
+  <p>a list of 5 integers, from 0 to 4 in consecutive order</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -52,6 +44,4 @@ void regress_test_array_int_out (int* n_ints,
 </item>
 </terms>
 
-  
-  
 </page>
index bd65df0..0d893ad 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_async_ready_callback</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_async_ready_callback (GAsyncReadyCallback callback);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -43,6 +35,4 @@ void regress_test_async_ready_callback (GAsyncReadyCallback callback);
 </item>
 </terms>
 
-  
-  
 </page>
index a444eb2..576763e 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_boolean</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gboolean regress_test_boolean (gboolean in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ gboolean regress_test_boolean (gboolean in);
 </item>
 </terms>
 
-  
-  
 </page>
index c96a2f9..2743a49 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_boolean_false</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gboolean regress_test_boolean_false (gboolean in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ gboolean regress_test_boolean_false (gboolean in);
 </item>
 </terms>
 
-  
-  
 </page>
index 1fb64c1..4eb3597 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_boolean_true</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gboolean regress_test_boolean_true (gboolean in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ gboolean regress_test_boolean_true (gboolean in);
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_boxeds_not_a_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_boxeds_not_a_method.page
new file mode 100644 (file)
index 0000000..dd1b24b
--- /dev/null
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<page id="Regress.test_boxeds_not_a_method"
+      type="topic"
+      style="function"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="function" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>void</api:type>
+      </api:returns>
+      <api:name>regress_test_boxeds_not_a_method</api:name>
+      <api:arg>
+        <api:type>RegressTestBoxed*</api:type>
+        <api:name>boxed</api:name>
+      </api:arg>
+    </api:function>
+  </info>
+  <title>regress_test_boxeds_not_a_method</title>
+  <synopsis><code mime="text/x-csrc">
+void regress_test_boxeds_not_a_method (RegressTestBoxed* boxed);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>boxed</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_boxeds_not_a_static.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_boxeds_not_a_static.page
new file mode 100644 (file)
index 0000000..583fa93
--- /dev/null
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<page id="Regress.test_boxeds_not_a_static"
+      type="topic"
+      style="function"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="function" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>void</api:type>
+      </api:returns>
+      <api:name>regress_test_boxeds_not_a_static</api:name>
+    </api:function>
+  </info>
+  <title>regress_test_boxeds_not_a_static</title>
+  <synopsis><code mime="text/x-csrc">
+void regress_test_boxeds_not_a_static (void);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
index 8ada9d2..ac5bb55 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_cairo_context_full_return</api:name>
     </api:function>
-
   </info>
   <title>regress_test_cairo_context_full_return</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 cairo_t* regress_test_cairo_context_full_return (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ cairo_t* regress_test_cairo_context_full_return (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 059afd5..42abbee 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>context</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_cairo_context_none_in</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_cairo_context_none_in (cairo_t* context);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>context</code></title>
@@ -43,6 +35,4 @@ void regress_test_cairo_context_none_in (cairo_t* context);
 </item>
 </terms>
 
-  
-  
 </page>
index c04a345..3ce5239 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>surface</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_cairo_surface_full_out</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_cairo_surface_full_out (cairo_surface_t** surface);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>surface</code></title>
@@ -43,6 +35,4 @@ void regress_test_cairo_surface_full_out (cairo_surface_t** surface);
 </item>
 </terms>
 
-  
-  
 </page>
index 7d77ae6..d2110e3 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_cairo_surface_full_return</api:name>
     </api:function>
-
   </info>
   <title>regress_test_cairo_surface_full_return</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 cairo_surface_t* regress_test_cairo_surface_full_return (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ cairo_surface_t* regress_test_cairo_surface_full_return (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 6730247..ee9d5d7 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>surface</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_cairo_surface_none_in</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_cairo_surface_none_in (cairo_surface_t* surface);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>surface</code></title>
@@ -43,6 +35,4 @@ void regress_test_cairo_surface_none_in (cairo_surface_t* surface);
 </item>
 </terms>
 
-  
-  
 </page>
index a5ac661..c5f471c 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_cairo_surface_none_return</api:name>
     </api:function>
-
   </info>
   <title>regress_test_cairo_surface_none_return</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 cairo_surface_t* regress_test_cairo_surface_none_return (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ cairo_surface_t* regress_test_cairo_surface_none_return (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 7d2f2c8..a70aecb 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_callback</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 int regress_test_callback (RegressTestCallback callback);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -43,6 +35,4 @@ int regress_test_callback (RegressTestCallback callback);
 </item>
 </terms>
 
-  
-  
 </page>
index 8c0a62e..69885df 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>user_data</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_callback_async</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_callback_async (RegressTestCallbackUserData callback,
                                   gpointer user_data);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -52,6 +44,4 @@ void regress_test_callback_async (RegressTestCallbackUserData callback,
 </item>
 </terms>
 
-  
-  
 </page>
index f7a5e56..484bdae 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>notify</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_callback_destroy_notify</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 int regress_test_callback_destroy_notify (RegressTestCallbackUserData callback,
                                           gpointer user_data,
                                           GDestroyNotify notify);
-</code></synopsis>
-
-  
-    <p>Notified - callback persists until a DestroyNotify delegate
+  </code></synopsis>
+  <p>Notified - callback persists until a DestroyNotify delegate
 is invoked.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -62,6 +54,4 @@ is invoked.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 3b162e2..44933c6 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>notify</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_callback_destroy_notify_no_user_data</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 int regress_test_callback_destroy_notify_no_user_data (RegressTestCallbackUserData callback,
                                                        GDestroyNotify notify);
-</code></synopsis>
-
-  
-    <p>Adds a scope notified callback with no user data. This can invoke an error
+  </code></synopsis>
+  <p>Adds a scope notified callback with no user data. This can invoke an error
 condition in bindings which needs to be tested.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -53,6 +45,4 @@ condition in bindings which needs to be tested.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 5cc1557..7babbdf 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_callback_thaw_async</api:name>
     </api:function>
-
   </info>
   <title>regress_test_callback_thaw_async</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 int regress_test_callback_thaw_async (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ int regress_test_callback_thaw_async (void);
 </item>
 </terms>
 
-  
-  
 </page>
index bb0ed81..3ff8aaa 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_callback_thaw_notifications</api:name>
     </api:function>
-
   </info>
   <title>regress_test_callback_thaw_notifications</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 int regress_test_callback_thaw_notifications (void);
-</code></synopsis>
-
-  
-    <p>Invokes all callbacks installed by #test_callback_destroy_notify(),
+  </code></synopsis>
+  <p>Invokes all callbacks installed by #test_callback_destroy_notify(),
 adding up their return values, and removes them, invoking the
 corresponding destroy notfications.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>Sum of the return values of the invoked callbacks.</p>
+  <p>Sum of the return values of the invoked callbacks.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 3a98a47..1f120a9 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>user_data</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_callback_user_data</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 int regress_test_callback_user_data (RegressTestCallbackUserData callback,
                                      gpointer user_data);
-</code></synopsis>
-
-  
-    <p>Call - callback parameter persists for the duration of the method
+  </code></synopsis>
+  <p>Call - callback parameter persists for the duration of the method
 call and can be released on return.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -53,6 +45,4 @@ call and can be released on return.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 0fdad91..5979523 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>closure</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_closure</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 int regress_test_closure (GClosure* closure);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>closure</code></title>
@@ -43,6 +35,4 @@ int regress_test_closure (GClosure* closure);
 </item>
 </terms>
 
-  
-  
 </page>
index 0708b5c..c772776 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>arg</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_closure_one_arg</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 int regress_test_closure_one_arg (GClosure* closure,
                                   int arg);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>closure</code></title>
@@ -52,6 +44,4 @@ int regress_test_closure_one_arg (GClosure* closure,
 </item>
 </terms>
 
-  
-  
 </page>
index 681b37a..ec22a9e 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>arg</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_closure_variant</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GVariant* regress_test_closure_variant (GClosure* closure,
                                         GVariant* arg);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>closure</code></title>
-<p>GClosure which takes one GVariant and returns a GVariant</p>
+  <p>GClosure which takes one GVariant and returns a GVariant</p>
 </item>
 <item>
 <title><code>arg</code></title>
-<p>a GVariant passed as argument to <code>closure</code></p>
+  <p>a GVariant passed as argument to <code>closure</code></p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>the return value of <code>closure</code></p>
+  <p>the return value of <code>closure</code></p>
 </item>
 </terms>
 
-  
-  
 </page>
index adb21f2..caca59c 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_date_in_gvalue</api:name>
     </api:function>
-
   </info>
   <title>regress_test_date_in_gvalue</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GValue* regress_test_date_in_gvalue (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ GValue* regress_test_date_in_gvalue (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 7ad7eb0..1990677 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_def_error_quark</api:name>
     </api:function>
-
   </info>
   <title>regress_test_def_error_quark</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GQuark regress_test_def_error_quark (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ GQuark regress_test_def_error_quark (void);
 </item>
 </terms>
 
-  
-  
 </page>
index f954fe8..ad2a039 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_double</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gdouble regress_test_double (gdouble in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ gdouble regress_test_double (gdouble in);
 </item>
 </terms>
 
-  
-  
 </page>
index 857e4da..43e5aab 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_filename_return</api:name>
     </api:function>
-
   </info>
   <title>regress_test_filename_return</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GSList* regress_test_filename_return (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>list of strings</p>
+  <p>list of strings</p>
 </item>
 </terms>
 
-  
-  
 </page>
index c395b04..3e70394 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_float</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gfloat regress_test_float (gfloat in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ gfloat regress_test_float (gfloat in);
 </item>
 </terms>
 
-  
-  
 </page>
index f17cdd9..ccee90d 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_garray_container_return</api:name>
     </api:function>
-
   </info>
   <title>regress_test_garray_container_return</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GPtrArray* regress_test_garray_container_return (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ GPtrArray* regress_test_garray_container_return (void);
 </item>
 </terms>
 
-  
-  
 </page>
index b127ed7..64b1817 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_garray_full_return</api:name>
     </api:function>
-
   </info>
   <title>regress_test_garray_full_return</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GPtrArray* regress_test_garray_full_return (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ GPtrArray* regress_test_garray_full_return (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 1a5f54c..7a2080c 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_gerror_callback</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_gerror_callback (RegressTestCallbackGError callback);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -43,6 +35,4 @@ void regress_test_gerror_callback (RegressTestCallbackGError callback);
 </item>
 </terms>
 
-  
-  
 </page>
index d465113..539d7eb 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_ghash_container_return</api:name>
     </api:function>
-
   </info>
   <title>regress_test_ghash_container_return</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GHashTable* regress_test_ghash_container_return (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ GHashTable* regress_test_ghash_container_return (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 616432a..a4ca1cf 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_ghash_everything_return</api:name>
     </api:function>
-
   </info>
   <title>regress_test_ghash_everything_return</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GHashTable* regress_test_ghash_everything_return (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ GHashTable* regress_test_ghash_everything_return (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 7603f2a..e7d8ba8 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>hash</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_ghash_gvalue_in</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_ghash_gvalue_in (GHashTable* hash);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>hash</code></title>
-<p>the hash table returned by
+  <p>the hash table returned by
 <link xref="Regress.test_ghash_gvalue_return"/>.</p>
 </item>
 <item>
@@ -44,6 +36,4 @@ void regress_test_ghash_gvalue_in (GHashTable* hash);
 </item>
 </terms>
 
-  
-  
 </page>
index 2e739c8..726f674 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_ghash_gvalue_return</api:name>
     </api:function>
-
   </info>
   <title>regress_test_ghash_gvalue_return</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GHashTable* regress_test_ghash_gvalue_return (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ GHashTable* regress_test_ghash_gvalue_return (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 6b53197..f721d1b 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_ghash_nested_everything_return</api:name>
     </api:function>
-
   </info>
   <title>regress_test_ghash_nested_everything_return</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GHashTable* regress_test_ghash_nested_everything_return (void);
-</code></synopsis>
+  </code></synopsis>
+  <p>Specify nested parameterized types directly with the (type ) annotation.</p>
 
-  
-    <p>Specify nested parameterized types directly with the (type ) annotation.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ GHashTable* regress_test_ghash_nested_everything_return (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 0c780b5..4b145bd 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_ghash_nested_everything_return2</api:name>
     </api:function>
-
   </info>
   <title>regress_test_ghash_nested_everything_return2</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GHashTable* regress_test_ghash_nested_everything_return2 (void);
-</code></synopsis>
-
-  
-    <p>Another way of specifying nested parameterized types: using the
+  </code></synopsis>
+  <p>Another way of specifying nested parameterized types: using the
 element-type annotation.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -36,6 +28,4 @@ element-type annotation.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 8c457ad..ebda10b 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_ghash_nothing_in</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_ghash_nothing_in (const GHashTable* in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ void regress_test_ghash_nothing_in (const GHashTable* in);
 </item>
 </terms>
 
-  
-  
 </page>
index a56ad65..6a6c95c 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_ghash_nothing_in2</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_ghash_nothing_in2 (GHashTable* in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ void regress_test_ghash_nothing_in2 (GHashTable* in);
 </item>
 </terms>
 
-  
-  
 </page>
index c258ee0..d291e15 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_ghash_nothing_return</api:name>
     </api:function>
-
   </info>
   <title>regress_test_ghash_nothing_return</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 const GHashTable* regress_test_ghash_nothing_return (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ const GHashTable* regress_test_ghash_nothing_return (void);
 </item>
 </terms>
 
-  
-  
 </page>
index d221744..1c2eced 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_ghash_nothing_return2</api:name>
     </api:function>
-
   </info>
   <title>regress_test_ghash_nothing_return2</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GHashTable* regress_test_ghash_nothing_return2 (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ GHashTable* regress_test_ghash_nothing_return2 (void);
 </item>
 </terms>
 
-  
-  
 </page>
index a538b44..e8a6d68 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_ghash_null_in</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_ghash_null_in (const GHashTable* in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ void regress_test_ghash_null_in (const GHashTable* in);
 </item>
 </terms>
 
-  
-  
 </page>
index 323469c..9acbfa9 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>out</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_ghash_null_out</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_ghash_null_out (const GHashTable** out);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>out</code></title>
@@ -43,6 +35,4 @@ void regress_test_ghash_null_out (const GHashTable** out);
 </item>
 </terms>
 
-  
-  
 </page>
index 03461fd..aa97efb 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_ghash_null_return</api:name>
     </api:function>
-
   </info>
   <title>regress_test_ghash_null_return</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 const GHashTable* regress_test_ghash_null_return (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ const GHashTable* regress_test_ghash_null_return (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 32a3c3a..ee98b28 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_glist_container_return</api:name>
     </api:function>
-
   </info>
   <title>regress_test_glist_container_return</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GList* regress_test_glist_container_return (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ GList* regress_test_glist_container_return (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 6de1a9c..96f7985 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_glist_everything_return</api:name>
     </api:function>
-
   </info>
   <title>regress_test_glist_everything_return</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GList* regress_test_glist_everything_return (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ GList* regress_test_glist_everything_return (void);
 </item>
 </terms>
 
-  
-  
 </page>
index d88487f..c14e0a1 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_glist_nothing_in</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_glist_nothing_in (const GList* in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ void regress_test_glist_nothing_in (const GList* in);
 </item>
 </terms>
 
-  
-  
 </page>
index 7cba851..310643b 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_glist_nothing_in2</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_glist_nothing_in2 (GList* in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ void regress_test_glist_nothing_in2 (GList* in);
 </item>
 </terms>
 
-  
-  
 </page>
index af54aea..7e87fca 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_glist_nothing_return</api:name>
     </api:function>
-
   </info>
   <title>regress_test_glist_nothing_return</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 const GList* regress_test_glist_nothing_return (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ const GList* regress_test_glist_nothing_return (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 2901e41..c59cb8d 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_glist_nothing_return2</api:name>
     </api:function>
-
   </info>
   <title>regress_test_glist_nothing_return2</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GList* regress_test_glist_nothing_return2 (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ GList* regress_test_glist_nothing_return2 (void);
 </item>
 </terms>
 
-  
-  
 </page>
index b6ca3ab..db71142 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_glist_null_in</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_glist_null_in (GSList* in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ void regress_test_glist_null_in (GSList* in);
 </item>
 </terms>
 
-  
-  
 </page>
index 13e421d..ac03e1a 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>out_list</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_glist_null_out</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_glist_null_out (GSList** out_list);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>out_list</code></title>
@@ -43,6 +35,4 @@ void regress_test_glist_null_out (GSList** out_list);
 </item>
 </terms>
 
-  
-  
 </page>
index 05587fc..4920cfb 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_gslist_container_return</api:name>
     </api:function>
-
   </info>
   <title>regress_test_gslist_container_return</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GSList* regress_test_gslist_container_return (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ GSList* regress_test_gslist_container_return (void);
 </item>
 </terms>
 
-  
-  
 </page>
index a03f4d8..4939dd1 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_gslist_everything_return</api:name>
     </api:function>
-
   </info>
   <title>regress_test_gslist_everything_return</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GSList* regress_test_gslist_everything_return (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ GSList* regress_test_gslist_everything_return (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 61a14b1..76ddec5 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_gslist_nothing_in</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_gslist_nothing_in (const GSList* in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ void regress_test_gslist_nothing_in (const GSList* in);
 </item>
 </terms>
 
-  
-  
 </page>
index 0703ec0..bc93886 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_gslist_nothing_in2</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_gslist_nothing_in2 (GSList* in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ void regress_test_gslist_nothing_in2 (GSList* in);
 </item>
 </terms>
 
-  
-  
 </page>
index 8df79aa..1b18f67 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_gslist_nothing_return</api:name>
     </api:function>
-
   </info>
   <title>regress_test_gslist_nothing_return</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 const GSList* regress_test_gslist_nothing_return (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ const GSList* regress_test_gslist_nothing_return (void);
 </item>
 </terms>
 
-  
-  
 </page>
index aeb9a67..3d8caef 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_gslist_nothing_return2</api:name>
     </api:function>
-
   </info>
   <title>regress_test_gslist_nothing_return2</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GSList* regress_test_gslist_nothing_return2 (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ GSList* regress_test_gslist_nothing_return2 (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 21d8d5c..2dd93e8 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_gslist_null_in</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_gslist_null_in (GSList* in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ void regress_test_gslist_null_in (GSList* in);
 </item>
 </terms>
 
-  
-  
 </page>
index d763519..8448b51 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>out_list</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_gslist_null_out</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_gslist_null_out (GSList** out_list);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>out_list</code></title>
@@ -43,6 +35,4 @@ void regress_test_gslist_null_out (GSList** out_list);
 </item>
 </terms>
 
-  
-  
 </page>
index 76e678b..bd800b5 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_gtype</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GType regress_test_gtype (GType in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ GType regress_test_gtype (GType in);
 </item>
 </terms>
 
-  
-  
 </page>
index df9d988..e0e1f80 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_gvariant_as</api:name>
     </api:function>
-
   </info>
   <title>regress_test_gvariant_as</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GVariant* regress_test_gvariant_as (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>New variant</p>
+  <p>New variant</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 2d64ab2..c23f3b2 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_gvariant_asv</api:name>
     </api:function>
-
   </info>
   <title>regress_test_gvariant_asv</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GVariant* regress_test_gvariant_asv (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>New variant</p>
+  <p>New variant</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 2eec994..1d5ed1f 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_gvariant_i</api:name>
     </api:function>
-
   </info>
   <title>regress_test_gvariant_i</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GVariant* regress_test_gvariant_i (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>New variant</p>
+  <p>New variant</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 9ef9d9f..2ba1a2c 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_gvariant_s</api:name>
     </api:function>
-
   </info>
   <title>regress_test_gvariant_s</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GVariant* regress_test_gvariant_s (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>New variant</p>
+  <p>New variant</p>
 </item>
 </terms>
 
-  
-  
 </page>
index c07b2ac..d47e28c 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_gvariant_v</api:name>
     </api:function>
-
   </info>
   <title>regress_test_gvariant_v</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GVariant* regress_test_gvariant_v (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>New variant</p>
+  <p>New variant</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 24862b1..a623454 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_hash_table_callback</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_hash_table_callback (GHashTable* data,
                                        RegressTestCallbackHashtable callback);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>data</code></title>
-<p>GHashTable that gets passed to callback</p>
+  <p>GHashTable that gets passed to callback</p>
 </item>
 <item>
 <title><code>callback</code></title>
@@ -52,6 +44,4 @@ void regress_test_hash_table_callback (GHashTable* data,
 </item>
 </terms>
 
-  
-  
 </page>
index 430af30..747b2cd 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_int</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gint regress_test_int (gint in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ gint regress_test_int (gint in);
 </item>
 </terms>
 
-  
-  
 </page>
index d5be61d..ff49f2e 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_int16</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gint16 regress_test_int16 (gint16 in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ gint16 regress_test_int16 (gint16 in);
 </item>
 </terms>
 
-  
-  
 </page>
index be90ac6..96962ba 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_int32</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gint32 regress_test_int32 (gint32 in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ gint32 regress_test_int32 (gint32 in);
 </item>
 </terms>
 
-  
-  
 </page>
index d864702..f2f73f7 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_int64</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gint64 regress_test_int64 (gint64 in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ gint64 regress_test_int64 (gint64 in);
 </item>
 </terms>
 
-  
-  
 </page>
index 1cfb431..67746b3 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_int8</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gint8 regress_test_int8 (gint8 in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ gint8 regress_test_int8 (gint8 in);
 </item>
 </terms>
 
-  
-  
 </page>
index 80276c0..6089228 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_int_out_utf8</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_int_out_utf8 (int* length,
                                 const char* in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>length</code></title>
@@ -52,6 +44,4 @@ void regress_test_int_out_utf8 (int* length,
 </item>
 </terms>
 
-  
-  
 </page>
index a61c91c..51735d1 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>v</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_int_value_arg</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 int regress_test_int_value_arg (const GValue* v);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>v</code></title>
@@ -43,6 +35,4 @@ int regress_test_int_value_arg (const GValue* v);
 </item>
 </terms>
 
-  
-  
 </page>
index 30bf3af..840b0b8 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_long</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 glong regress_test_long (glong in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ glong regress_test_long (glong in);
 </item>
 </terms>
 
-  
-  
 </page>
index 152c916..dfa77f2 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_multi_callback</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 int regress_test_multi_callback (RegressTestCallback callback);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -43,6 +35,4 @@ int regress_test_multi_callback (RegressTestCallback callback);
 </item>
 </terms>
 
-  
-  
 </page>
index 5135297..693a2c8 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>two</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_multi_double_args</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_multi_double_args (gdouble in,
                                      gdouble* one,
                                      gdouble* two);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -61,6 +53,4 @@ void regress_test_multi_double_args (gdouble in,
 </item>
 </terms>
 
-  
-  
 </page>
index d660bd8..9c4c685 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_multiline_doc_comments</api:name>
     </api:function>
-
   </info>
   <title>regress_test_multiline_doc_comments</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_multiline_doc_comments (void);
-</code></synopsis>
+  </code></synopsis>
+  <p>This is a function.</p>  <p>It has multiple lines in the documentation.</p>  <p>The sky is blue.</p>  <p>You will give me your credit card number.</p>
 
-  
-    <p>This is a function.</p><p>It has multiple lines in the documentation.</p><p>The sky is blue.</p><p>You will give me your credit card number.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ void regress_test_multiline_doc_comments (void);
 </item>
 </terms>
 
-  
-  
 </page>
index c28cc8f..c04055c 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>a</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_nested_parameter</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_nested_parameter (int a);
-</code></synopsis>
-
-  
-    <p>&lt;informaltable&gt;
+  </code></synopsis>
+  <p>&lt;informaltable&gt;
   &lt;tgroup cols="3"&gt;
     &lt;thead&gt;
       &lt;row&gt;
@@ -52,15 +47,12 @@ rgb(20%, 30%, 0%)&lt;/literallayout&gt;&lt;/entry&gt;
       &lt;/row&gt;
    &lt;/tbody&gt;
  &lt;/tgroup&gt;
-&lt;/informaltable&gt;</p><p>What we're testing here is that the scanner ignores the <code>a</code> nested inside XML.</p>
-  
-  
-  
-  
+&lt;/informaltable&gt;</p>  <p>What we're testing here is that the scanner ignores the <code>a</code> nested inside XML.</p>
+
 <terms>
 <item>
 <title><code>a</code></title>
-<p>An integer</p>
+  <p>An integer</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -68,6 +60,4 @@ rgb(20%, 30%, 0%)&lt;/literallayout&gt;&lt;/entry&gt;
 </item>
 </terms>
 
-  
-  
 </page>
index bdcc152..c6ed1f9 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_null_gerror_callback</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_null_gerror_callback (RegressTestCallbackGError callback);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -43,6 +35,4 @@ void regress_test_null_gerror_callback (RegressTestCallbackGError callback);
 </item>
 </terms>
 
-  
-  
 </page>
index 49f1b36..3e12c1d 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_owned_gerror_callback</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_owned_gerror_callback (RegressTestCallbackOwnedGError callback);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -43,6 +35,4 @@ void regress_test_owned_gerror_callback (RegressTestCallbackOwnedGError callback
 </item>
 </terms>
 
-  
-  
 </page>
index 53d3b1b..fd17290 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_short</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gshort regress_test_short (gshort in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ gshort regress_test_short (gshort in);
 </item>
 </terms>
 
-  
-  
 </page>
index 514fbfa..fa5974d 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_simple_callback</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_simple_callback (RegressTestSimpleCallback callback);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -43,6 +35,4 @@ void regress_test_simple_callback (RegressTestSimpleCallback callback);
 </item>
 </terms>
 
-  
-  
 </page>
index 3b67a00..d6fdd17 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_size</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gsize regress_test_size (gsize in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ gsize regress_test_size (gsize in);
 </item>
 </terms>
 
-  
-  
 </page>
index 321d087..ad415bc 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_skip_unannotated_callback</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_skip_unannotated_callback (RegressTestCallback callback);
-</code></synopsis>
-
-  
-    <p>Should not emit a warning:
+  </code></synopsis>
+  <p>Should not emit a warning:
 https://bugzilla.gnome.org/show_bug.cgi?id=685399</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>callback</code></title>
-<p>No annotation here</p>
+  <p>No annotation here</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -44,6 +36,4 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685399</p>
 </item>
 </terms>
 
-  
-  
 </page>
index d11446e..6afb6be 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_ssize</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gssize regress_test_ssize (gssize in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ gssize regress_test_ssize (gssize in);
 </item>
 </terms>
 
-  
-  
 </page>
index 3f9ca2a..bbaae44 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>arr</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_strv_in</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gboolean regress_test_strv_in (char** arr);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>arr</code></title>
@@ -43,6 +35,4 @@ gboolean regress_test_strv_in (char** arr);
 </item>
 </terms>
 
-  
-  
 </page>
index 44b0c6c..3cdc304 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_strv_in_gvalue</api:name>
     </api:function>
-
   </info>
   <title>regress_test_strv_in_gvalue</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 GValue* regress_test_strv_in_gvalue (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ GValue* regress_test_strv_in_gvalue (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 207e69f..f884be5 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_strv_out</api:name>
     </api:function>
-
   </info>
   <title>regress_test_strv_out</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 char** regress_test_strv_out (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ char** regress_test_strv_out (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 582ab10..28c1efe 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_strv_out_c</api:name>
     </api:function>
-
   </info>
   <title>regress_test_strv_out_c</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 const char* const* regress_test_strv_out_c (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ const char* const* regress_test_strv_out_c (void);
 </item>
 </terms>
 
-  
-  
 </page>
index 0515bce..3e27a2e 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_strv_out_container</api:name>
     </api:function>
-
   </info>
   <title>regress_test_strv_out_container</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 char** regress_test_strv_out_container (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -35,6 +27,4 @@ char** regress_test_strv_out_container (void);
 </item>
 </terms>
 
-  
-  
 </page>
index a105b5b..07c00b1 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>retp</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_strv_outarg</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_strv_outarg (char*** retp);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>retp</code></title>
@@ -43,6 +35,4 @@ void regress_test_strv_outarg (char*** retp);
 </item>
 </terms>
 
-  
-  
 </page>
index acada71..fdf552c 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_timet</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 time_t regress_test_timet (time_t in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ time_t regress_test_timet (time_t in);
 </item>
 </terms>
 
-  
-  
 </page>
index 3d4c18c..bf164c1 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>m</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_torture_signature_0</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_torture_signature_0 (int x,
                                        double* y,
                                        int* z,
                                        const char* foo,
                                        int* q,
                                        guint m);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>x</code></title>
@@ -88,6 +80,4 @@ void regress_test_torture_signature_0 (int x,
 </item>
 </terms>
 
-  
-  
 </page>
index 7568989..6f5a925 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>m</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_torture_signature_1</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gboolean regress_test_torture_signature_1 (int x,
                                            double* y,
                                            int* z,
                                            const char* foo,
                                            int* q,
                                            guint m);
-</code></synopsis>
+  </code></synopsis>
+  <p>This function throws an error if m is odd.</p>
 
-  
-    <p>This function throws an error if m is odd.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>x</code></title>
@@ -88,6 +80,4 @@ gboolean regress_test_torture_signature_1 (int x,
 </item>
 </terms>
 
-  
-  
 </page>
index eb615c3..3339a62 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>m</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_torture_signature_2</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_torture_signature_2 (int x,
                                        RegressTestCallbackUserData callback,
                                        gpointer user_data,
@@ -64,14 +61,9 @@ void regress_test_torture_signature_2 (int x,
                                        const char* foo,
                                        int* q,
                                        guint m);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>x</code></title>
@@ -115,6 +107,4 @@ void regress_test_torture_signature_2 (int x,
 </item>
 </terms>
 
-  
-  
 </page>
index 1651512..dc8aea4 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_uint</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 guint regress_test_uint (guint in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ guint regress_test_uint (guint in);
 </item>
 </terms>
 
-  
-  
 </page>
index 2af7ee4..0266295 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_uint16</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 guint16 regress_test_uint16 (guint16 in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ guint16 regress_test_uint16 (guint16 in);
 </item>
 </terms>
 
-  
-  
 </page>
index 7ccdde7..50b6a2e 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_uint32</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 guint32 regress_test_uint32 (guint32 in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ guint32 regress_test_uint32 (guint32 in);
 </item>
 </terms>
 
-  
-  
 </page>
index 24a9256..84aa11d 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_uint64</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 guint64 regress_test_uint64 (guint64 in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ guint64 regress_test_uint64 (guint64 in);
 </item>
 </terms>
 
-  
-  
 </page>
index 7222e74..d6bc24d 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_uint8</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 guint8 regress_test_uint8 (guint8 in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ guint8 regress_test_uint8 (guint8 in);
 </item>
 </terms>
 
-  
-  
 </page>
index 8095370..011bfd3 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_ulong</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gulong regress_test_ulong (gulong in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ gulong regress_test_ulong (gulong in);
 </item>
 </terms>
 
-  
-  
 </page>
index 0349472..4ee1c44 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_unichar</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gunichar regress_test_unichar (gunichar in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ gunichar regress_test_unichar (gunichar in);
 </item>
 </terms>
 
-  
-  
 </page>
index 642e75a..81c8e16 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>e</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_unsigned_enum_param</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 const gchar* regress_test_unsigned_enum_param (RegressTestEnumUnsigned e);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>e</code></title>
@@ -43,6 +35,4 @@ const gchar* regress_test_unsigned_enum_param (RegressTestEnumUnsigned e);
 </item>
 </terms>
 
-  
-  
 </page>
index 2b50e72..d06bb4e 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_ushort</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 gushort regress_test_ushort (gushort in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ gushort regress_test_ushort (gushort in);
 </item>
 </terms>
 
-  
-  
 </page>
index eaafeae..af18ce2 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_utf8_const_in</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_utf8_const_in (const char* in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ void regress_test_utf8_const_in (const char* in);
 </item>
 </terms>
 
-  
-  
 </page>
index 6bcb786..8f70ef6 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_utf8_const_return</api:name>
     </api:function>
-
   </info>
   <title>regress_test_utf8_const_return</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 const char* regress_test_utf8_const_return (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>UTF-8 string</p>
+  <p>UTF-8 string</p>
 </item>
 </terms>
 
-  
-  
 </page>
index ce0a884..7e04703 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>inout</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_utf8_inout</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_utf8_inout (char** inout);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>inout</code></title>
@@ -43,6 +35,4 @@ void regress_test_utf8_inout (char** inout);
 </item>
 </terms>
 
-  
-  
 </page>
index aa921b0..6cd2b2d 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_utf8_nonconst_return</api:name>
     </api:function>
-
   </info>
   <title>regress_test_utf8_nonconst_return</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 char* regress_test_utf8_nonconst_return (void);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>UTF-8 string</p>
+  <p>UTF-8 string</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 9b19637..2a7dd03 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_utf8_null_in</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_utf8_null_in (char* in);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -43,6 +35,4 @@ void regress_test_utf8_null_in (char* in);
 </item>
 </terms>
 
-  
-  
 </page>
index 6d4c455..66df917 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>char_out</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_utf8_null_out</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_utf8_null_out (char** char_out);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>char_out</code></title>
@@ -43,6 +35,4 @@ void regress_test_utf8_null_out (char** char_out);
 </item>
 </terms>
 
-  
-  
 </page>
index 5084da3..5766637 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>out</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_utf8_out</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_utf8_out (char** out);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>out</code></title>
@@ -43,6 +35,4 @@ void regress_test_utf8_out (char** out);
 </item>
 </terms>
 
-  
-  
 </page>
index 65b2a8a..15b0d3a 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>out</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_utf8_out_nonconst_return</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 char* regress_test_utf8_out_nonconst_return (char** out);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>out</code></title>
-<p>a copy of "second"</p>
+  <p>a copy of "second"</p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>a copy of "first"</p>
+  <p>a copy of "first"</p>
 </item>
 </terms>
 
-  
-  
 </page>
index e377199..3038870 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>out1</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_utf8_out_out</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_utf8_out_out (char** out0,
                                 char** out1);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>out0</code></title>
-<p>a copy of "first"</p>
+  <p>a copy of "first"</p>
 </item>
 <item>
 <title><code>out1</code></title>
-<p>a copy of "second"</p>
+  <p>a copy of "second"</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -52,6 +44,4 @@ void regress_test_utf8_out_out (char** out0,
 </item>
 </terms>
 
-  
-  
 </page>
index 3435610..6259abf 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>value</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_value_get_fundamental_object</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 RegressTestFundamentalObject* regress_test_value_get_fundamental_object (const GValue* value);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>value</code></title>
@@ -43,6 +35,4 @@ RegressTestFundamentalObject* regress_test_value_get_fundamental_object (const G
 </item>
 </terms>
 
-  
-  
 </page>
index 2edb30a..25d1f71 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>i</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_value_return</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 const GValue* regress_test_value_return (int i);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>i</code></title>
-<p>an int</p>
+  <p>an int</p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>the int wrapped in a GValue.</p>
+  <p>the int wrapped in a GValue.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index ba1822e..db1b327 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>fundamental_object</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>regress_test_value_set_fundamental_object</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_value_set_fundamental_object (GValue* value,
                                                 RegressTestFundamentalObject* fundamental_object);
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>value</code></title>
@@ -52,6 +44,4 @@ void regress_test_value_set_fundamental_object (GValue* value,
 </item>
 </terms>
 
-  
-  
 </page>
index a389bda..cc5ef0e 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_versioning</api:name>
     </api:function>
-
   </info>
   <title>regress_test_versioning</title>
-  
-<synopsis><code mime="text/x-csrc">
+  <synopsis><code mime="text/x-csrc">
 void regress_test_versioning (void);
-</code></synopsis>
+  </code></synopsis>
 
-  
-    
-  
-  
-    <p>Since 1.32.1</p>
-  
-  
+  <p>Since 1.32.1</p>
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -36,6 +27,4 @@ void regress_test_versioning (void);
 </item>
 </terms>
 
-  
-  
 </page>
index a5426d8..426ebed 100644 (file)
@@ -5,21 +5,9 @@
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-
-  </info>
-  <title>Index</title>
-  
-  
-  
-
-  
-
-  
-  
-  
-  <links type="topic" ui:expanded="true" groups="class" style="linklist">
+  <info>  </info>
+  <title>Regress</title>
+  <links type="topic" ui:expanded="true" groups="class interface" style="linklist">
     <title>Classes</title>
   </links>
   <links type="topic" ui:expanded="true" groups="function" style="linklist">
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page
new file mode 100644 (file)
index 0000000..55a4b6d
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.ANNOTATION_CALCULATED_DEFINE"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.ANNOTATION_CALCULATED_DEFINE</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_LARGE.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_LARGE.page
new file mode 100644 (file)
index 0000000..c8887ff
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.ANNOTATION_CALCULATED_LARGE"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.ANNOTATION_CALCULATED_LARGE</title>
+  <p>Constant to define a calculated large value</p>
+  <p>Since 1.4</p>
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page
new file mode 100644 (file)
index 0000000..08eda31
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.ANNOTATION_CALCULATED_LARGE_DIV"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.ANNOTATION_CALCULATED_LARGE_DIV</title>
+  <p>Constant to define a calculated large value</p>
+
+</page>
index 9ac6820..377a063 100644 (file)
@@ -1,24 +1,16 @@
 <?xml version="1.0"?>
 <page id="Regress.ATestError"
-      type="topic"
+      type="guide"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.ATestError</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
 <terms>
 <item>
 <title><code>ATestError.CODE0</code></title>
@@ -33,7 +25,9 @@
 
 </item>
 </terms>
-
-  
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
index 9490e4a..097c37b 100644 (file)
@@ -6,20 +6,9 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="default" type="guide"/>
   </info>
   <title>Regress.AliasedTestBoxed</title>
-  
-  
-  
-    <p>Typedef TestBoxed to test caller-allocates correctness</p>
-  
-  
-  
-  
-  
-  
-  
+  <p>Typedef TestBoxed to test caller-allocates correctness</p>
+
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnAnonymousUnion-x.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnAnonymousUnion-x.page
new file mode 100644 (file)
index 0000000..71177e3
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.AnAnonymousUnion-x"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.AnAnonymousUnion" group="field" type="guide"/>
+    <title type="link" role="topic">x</title>
+  </info>
+  <title>Regress.AnAnonymousUnion.x</title>
+  <synopsis><code mime="text/x-gjs">
+AnAnonymousUnion.x: Number(gint) (Read / Write)
+  </code></synopsis>
+
+
+</page>
index 2556fed..ff0853e 100644 (file)
@@ -1,25 +1,42 @@
 <?xml version="1.0"?>
 <page id="Regress.AnAnonymousUnion"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.AnAnonymousUnion</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let anAnonymousUnion = new Regress.AnAnonymousUnion({
+    <link xref='Regress.AnAnonymousUnion-x'>x</link>: value
+});
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 4e19ef9..355066b 100644 (file)
@@ -1,25 +1,29 @@
 <?xml version="1.0"?>
 <page id="Regress.AnnotationBitfield"
-      type="topic"
-      style="default"
+      type="guide"
+      style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.AnnotationBitfield</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+<terms>
+<item>
+<title><code>AnnotationBitfield.FOO</code></title>
+
+</item>
+<item>
+<title><code>AnnotationBitfield.BAR</code></title>
+
+</item>
+</terms>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
index 9a652d8..4c40231 100644 (file)
@@ -1,25 +1,29 @@
 <?xml version="1.0"?>
 <page id="Regress.AnnotationCallback"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="callback" type="guide"/>
   </info>
   <title>Regress.AnnotationCallback</title>
-  
-  
-  
-    <p>This is a callback.</p>
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-gjs">
+function onAnnotationCallback(in: Number(gint)): Number(gint) {
+}
+  </code></synopsis>
+  <p>This is a callback.</p>
+
+<terms>
+<item>
+<title><code>in</code></title>
+  <p>array of ints</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+  <p>array of ints</p>
+</item>
+</terms>
+
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationFields-arr.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationFields-arr.page
new file mode 100644 (file)
index 0000000..a95e09d
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.AnnotationFields-arr"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.AnnotationFields" group="field" type="guide"/>
+    <title type="link" role="topic">arr</title>
+  </info>
+  <title>Regress.AnnotationFields.arr</title>
+  <synopsis><code mime="text/x-gjs">
+AnnotationFields.arr: ByteArray (Read / Write)
+  </code></synopsis>
+  <p>an array of length @len</p>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationFields-field1.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationFields-field1.page
new file mode 100644 (file)
index 0000000..aa029db
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.AnnotationFields-field1"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.AnnotationFields" group="field" type="guide"/>
+    <title type="link" role="topic">field1</title>
+  </info>
+  <title>Regress.AnnotationFields.field1</title>
+  <synopsis><code mime="text/x-gjs">
+AnnotationFields.field1: Number(gint) (Read / Write)
+  </code></synopsis>
+  <p>Some documentation</p>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationFields-len.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationFields-len.page
new file mode 100644 (file)
index 0000000..5fb363c
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.AnnotationFields-len"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.AnnotationFields" group="field" type="guide"/>
+    <title type="link" role="topic">len</title>
+  </info>
+  <title>Regress.AnnotationFields.len</title>
+  <synopsis><code mime="text/x-gjs">
+AnnotationFields.len: Number(gulong) (Read / Write)
+  </code></synopsis>
+  <p>the length of array</p>
+
+</page>
index 5323454..585a97c 100644 (file)
@@ -1,25 +1,44 @@
 <?xml version="1.0"?>
 <page id="Regress.AnnotationFields"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.AnnotationFields</title>
-  
-  
-  
-    <p>This is a struct for testing field documentation and annotations</p>
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let annotationFields = new Regress.AnnotationFields({
+    <link xref='Regress.AnnotationFields-field1'>field1</link>: value
+    <link xref='Regress.AnnotationFields-arr'>arr</link>: value
+    <link xref='Regress.AnnotationFields-len'>len</link>: value
+});
+  </code></synopsis>
+  <p>This is a struct for testing field documentation and annotations</p>
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index db77a11..cf16fa3 100644 (file)
@@ -1,25 +1,29 @@
 <?xml version="1.0"?>
 <page id="Regress.AnnotationForeachFunc"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="callback" type="guide"/>
   </info>
   <title>Regress.AnnotationForeachFunc</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-gjs">
+function onAnnotationForeachFunc(object: <link xref="Regress.AnnotationObject">Regress.AnnotationObject</link>, item: String): void {
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>object</code></title>
+
+</item>
+<item>
+<title><code>item</code></title>
+
+</item>
+</terms>
+
 </page>
index 79844c6..e66cdef 100644 (file)
@@ -1,25 +1,29 @@
 <?xml version="1.0"?>
 <page id="Regress.AnnotationListCallback"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="callback" type="guide"/>
   </info>
   <title>Regress.AnnotationListCallback</title>
-  
-  
-  
-    <p>This is a callback taking a list.</p>
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-gjs">
+function onAnnotationListCallback(in: Array(String)): Array(String) {
+}
+  </code></synopsis>
+  <p>This is a callback taking a list.</p>
+
+<terms>
+<item>
+<title><code>in</code></title>
+  <p>list of strings</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+  <p>list of strings</p>
+</item>
+</terms>
+
 </page>
index 17c8029..665fd2a 100644 (file)
@@ -1,26 +1,22 @@
 <?xml version="1.0"?>
 <page id="Regress.AnnotationNotifyFunc"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="callback" type="guide"/>
   </info>
   <title>Regress.AnnotationNotifyFunc</title>
-  
-  
-  
-    <p>This is a callback with a 'closure' argument that is not named
+  <synopsis><code mime="text/x-gjs">
+function onAnnotationNotifyFunc(): void {
+}
+  </code></synopsis>
+  <p>This is a callback with a 'closure' argument that is not named
 'user_data' and hence has to be annotated.</p>
-  
-  
-  
-  
-  
-  
-  
+
+<terms>
+</terms>
+
 </page>
index c30c337..d57d251 100644 (file)
@@ -6,42 +6,32 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="signal" type="guide"/>
     <title type="link" role="topic">attribute-signal</title>
-
   </info>
   <title>Regress.AnnotationObject::attribute-signal</title>
-  
-<synopsis><code mime="text/x-python">
-function callback(annotation_object, arg1:String, arg2:String, ):String;
-</code></synopsis>
+  <synopsis><code mime="text/x-gjs">
+connect('attribute-signal', function (annotationObject, arg1: String, arg2: String, ): String);
+  </code></synopsis>
+  <p>This signal tests a signal with attributes.</p>
 
-  
-    <p>This signal tests a signal with attributes.</p>
-  
-  
-  
-  
 <terms>
 <item>
-<title><code>annotation_object</code></title>
+<title><code>annotationObject</code></title>
 <p>instance of <link xref="Regress.AnnotationObject"/> that is emitting the signal</p>
 </item>
 <item>
 <title><code>arg1</code></title>
-<p>a value</p>
+  <p>a value</p>
 </item>
 <item>
 <title><code>arg2</code></title>
-<p>another value</p>
+  <p>another value</p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>the return value</p>
+  <p>the return value</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 6102591..0bcbbbc 100644 (file)
@@ -6,26 +6,18 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="signal" type="guide"/>
     <title type="link" role="topic">doc-empty-arg-parsing</title>
-
   </info>
   <title>Regress.AnnotationObject::doc-empty-arg-parsing</title>
-  
-<synopsis><code mime="text/x-python">
-function callback(annotation_object, arg1:gpointer, ):void;
-</code></synopsis>
+  <synopsis><code mime="text/x-gjs">
+connect('doc-empty-arg-parsing', function (annotationObject, arg1: void, ): void);
+  </code></synopsis>
+  <p>This signal tests an empty document argument (<code>arg1</code>)</p>
 
-  
-    <p>This signal tests an empty document argument (<code>arg1</code>)</p>
-  
-  
-  
-  
 <terms>
 <item>
-<title><code>annotation_object</code></title>
+<title><code>annotationObject</code></title>
 <p>instance of <link xref="Regress.AnnotationObject"/> that is emitting the signal</p>
 </item>
 <item>
@@ -34,6 +26,4 @@ function callback(annotation_object, arg1:gpointer, ):void;
 </item>
 </terms>
 
-  
-  
 </page>
index d9d8b55..148081a 100644 (file)
@@ -6,24 +6,13 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="property" type="guide"/>
     <title type="link" role="topic">function-property</title>
-
   </info>
-  <title>Regress.AnnotationObject:function-property</title>
-  
-<synopsis><code mime="text/x-python">
-"function-property"             Regress.AnnotationCallback                : Read / Write / Construct
-</code></synopsis>
+  <title>Regress.AnnotationObject.function_property</title>
+  <synopsis><code mime="text/x-gjs">
+AnnotationObject.function_property: <link xref="Regress.AnnotationCallback">Regress.AnnotationCallback</link> (Read / Write / Construct)
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-  
-  
-  
 </page>
index 4e2044d..c94b525 100644 (file)
@@ -6,35 +6,25 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="signal" type="guide"/>
     <title type="link" role="topic">list-signal</title>
-
   </info>
   <title>Regress.AnnotationObject::list-signal</title>
-  
-<synopsis><code mime="text/x-python">
-function callback(annotation_object, list:[String], ):void;
-</code></synopsis>
-
-  
-    <p>This is a signal which takes a list of strings, but it's not
+  <synopsis><code mime="text/x-gjs">
+connect('list-signal', function (annotationObject, list: Array(String), ): void);
+  </code></synopsis>
+  <p>This is a signal which takes a list of strings, but it's not
 known by GObject as it's only marked as G_TYPE_POINTER</p>
-  
-  
-  
-  
+
 <terms>
 <item>
-<title><code>annotation_object</code></title>
+<title><code>annotationObject</code></title>
 <p>instance of <link xref="Regress.AnnotationObject"/> that is emitting the signal</p>
 </item>
 <item>
 <title><code>list</code></title>
-<p>a list of strings</p>
+  <p>a list of strings</p>
 </item>
 </terms>
 
-  
-  
 </page>
index eba5cef..2eff716 100644 (file)
@@ -6,25 +6,13 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="property" type="guide"/>
     <title type="link" role="topic">string-property</title>
-
   </info>
-  <title>Regress.AnnotationObject:string-property</title>
-  
-<synopsis><code mime="text/x-python">
-"string-property"             String                : Read / Write / Construct
-</code></synopsis>
-
-  
-    <p>This is a property which is a string</p>
-  
-  
-    <p>Since 1.0</p>
-  
-  
-  
-  
-  
+  <title>Regress.AnnotationObject.string_property</title>
+  <synopsis><code mime="text/x-gjs">
+AnnotationObject.string_property: String (Read / Write / Construct)
+  </code></synopsis>
+  <p>This is a property which is a string</p>
+  <p>Since 1.0</p>
 </page>
index 59408b4..9c16d75 100644 (file)
@@ -6,36 +6,25 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="signal" type="guide"/>
     <title type="link" role="topic">string-signal</title>
-
   </info>
   <title>Regress.AnnotationObject::string-signal</title>
-  
-<synopsis><code mime="text/x-python">
-function callback(annotation_object, string:String, ):void;
-</code></synopsis>
-
-  
-    <p>This is a signal which has a broken signal handler,
+  <synopsis><code mime="text/x-gjs">
+connect('string-signal', function (annotationObject, string: String, ): void);
+  </code></synopsis>
+  <p>This is a signal which has a broken signal handler,
 it says it's pointer but it's actually a string.</p>
-  
-  
-    <p>Since 1.0</p>
-  
-  
+  <p>Since 1.0</p>
 <terms>
 <item>
-<title><code>annotation_object</code></title>
+<title><code>annotationObject</code></title>
 <p>instance of <link xref="Regress.AnnotationObject"/> that is emitting the signal</p>
 </item>
 <item>
 <title><code>string</code></title>
-<p>a string</p>
+  <p>a string</p>
 </item>
 </terms>
 
-  
-  
 </page>
index c2444fa..d943cf4 100644 (file)
@@ -6,26 +6,14 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="property" type="guide"/>
     <title type="link" role="topic">tab-property</title>
-
   </info>
-  <title>Regress.AnnotationObject:tab-property</title>
-  
-<synopsis><code mime="text/x-python">
-"tab-property"             String                : Read / Write / Construct
-</code></synopsis>
-
-  
-    <p>This is a property annotation intentionally indented with a mix
+  <title>Regress.AnnotationObject.tab_property</title>
+  <synopsis><code mime="text/x-gjs">
+AnnotationObject.tab_property: String (Read / Write / Construct)
+  </code></synopsis>
+  <p>This is a property annotation intentionally indented with a mix
 of tabs and strings to test the tab handling capabilities of the scanner.</p>
-  
-  
-    <p>Since 1.2</p>
-  
-  
-  
-  
-  
+  <p>Since 1.2</p>
 </page>
index 414f5c6..9a4cc08 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>somearg</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.prototype.allow_none</title>
-  
-<synopsis><code mime="text/x-gjs">
-function allow_none(somearg:String):GObject.Object {
+  <synopsis><code mime="text/x-gjs">
+function allow_none(somearg: String): <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link> {
     // Gjs wrapper for regress_annotation_object_allow_none()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>somearg</code></title>
@@ -41,10 +33,8 @@ function allow_none(somearg:String):GObject.Object {
 </item>
 <item>
 <title><code>Returns</code></title>
-<p><code>null</code> always</p>
+  <p><code>null</code> always</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 8dd15f1..0e458c4 100644 (file)
@@ -6,37 +6,31 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_annotation_object_calleeowns</api:name>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.prototype.calleeowns</title>
-  
-<synopsis><code mime="text/x-gjs">
-function calleeowns():Number {
+  <synopsis><code mime="text/x-gjs">
+function calleeowns(): [return_value: Number(gint), toown: <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link>] {
     // Gjs wrapper for regress_annotation_object_calleeowns()
 }
-</code></synopsis>
+  </code></synopsis>
+  <p>This is a test for out arguments; GObject defaults to transfer</p>
 
-  
-    <p>This is a test for out arguments; GObject defaults to transfer</p>
-  
-  
-  
-  
 <terms>
 <item>
-<title><code>Returns</code></title>
-<p>an int</p>
+<title><code>return_value</code></title>
+  <p>an int</p>
+</item>
+<item>
+<title><code>toown</code></title>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 </terms>
 
-  
-  
 </page>
index a12be35..401fcb0 100644 (file)
@@ -6,37 +6,35 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_annotation_object_calleesowns</api:name>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.prototype.calleesowns</title>
-  
-<synopsis><code mime="text/x-gjs">
-function calleesowns():Number {
+  <synopsis><code mime="text/x-gjs">
+function calleesowns(): [return_value: Number(gint), toown1: <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link>, toown2: <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link>] {
     // Gjs wrapper for regress_annotation_object_calleesowns()
 }
-</code></synopsis>
+  </code></synopsis>
+  <p>This is a test for out arguments, one transferred, other not</p>
 
-  
-    <p>This is a test for out arguments, one transferred, other not</p>
-  
-  
-  
-  
 <terms>
 <item>
-<title><code>Returns</code></title>
-<p>an int</p>
+<title><code>return_value</code></title>
+  <p>an int</p>
+</item>
+<item>
+<title><code>toown1</code></title>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
+</item>
+<item>
+<title><code>toown2</code></title>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 </terms>
 
-  
-  
 </page>
index d7e6784..fd3e794 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_object_compute_sum</api:name>
       <api:arg>
-        <api:type>[Number]</api:type>
+        <api:type>Array(Number(gint))</api:type>
         <api:name>nums</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.prototype.compute_sum</title>
-  
-<synopsis><code mime="text/x-gjs">
-function compute_sum(nums:[Number]):void {
+  <synopsis><code mime="text/x-gjs">
+function compute_sum(nums: Array(Number(gint))): void {
     // Gjs wrapper for regress_annotation_object_compute_sum()
 }
-</code></synopsis>
+  </code></synopsis>
+  <p>Test taking a zero-terminated array</p>
 
-  
-    <p>Test taking a zero-terminated array</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>nums</code></title>
-<p>Sequence of numbers</p>
+  <p>Sequence of numbers</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 932b192..331214b 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_object_compute_sum_n</api:name>
       <api:arg>
-        <api:type>[Number]</api:type>
+        <api:type>Array(Number(gint))</api:type>
         <api:name>nums</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.prototype.compute_sum_n</title>
-  
-<synopsis><code mime="text/x-gjs">
-function compute_sum_n(nums:[Number]):void {
+  <synopsis><code mime="text/x-gjs">
+function compute_sum_n(nums: Array(Number(gint))): void {
     // Gjs wrapper for regress_annotation_object_compute_sum_n()
 }
-</code></synopsis>
+  </code></synopsis>
+  <p>Test taking an array with length parameter</p>
 
-  
-    <p>Test taking an array with length parameter</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>nums</code></title>
-<p>Sequence of
+  <p>Sequence of
   numbers that are zero-terminated</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 3891049..754a37f 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_object_compute_sum_nz</api:name>
       <api:arg>
-        <api:type>[Number]</api:type>
+        <api:type>Array(Number(gint))</api:type>
         <api:name>nums</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.prototype.compute_sum_nz</title>
-  
-<synopsis><code mime="text/x-gjs">
-function compute_sum_nz(nums:[Number]):void {
+  <synopsis><code mime="text/x-gjs">
+function compute_sum_nz(nums: Array(Number(gint))): void {
     // Gjs wrapper for regress_annotation_object_compute_sum_nz()
 }
-</code></synopsis>
+  </code></synopsis>
+  <p>Test taking a zero-terminated array with length parameter</p>
 
-  
-    <p>Test taking a zero-terminated array with length parameter</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>nums</code></title>
-<p>Sequence of numbers that
+  <p>Sequence of numbers that
 are zero-terminated</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 03ceac1..c659864 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_object_create_object</api:name>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.prototype.create_object</title>
-  
-<synopsis><code mime="text/x-gjs">
-function create_object():GObject.Object {
+  <synopsis><code mime="text/x-gjs">
+function create_object(): <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link> {
     // Gjs wrapper for regress_annotation_object_create_object()
 }
-</code></synopsis>
+  </code></synopsis>
+  <p>Test returning a caller-owned object</p>
 
-  
-    <p>Test returning a caller-owned object</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>The object</p>
+  <p>The object</p>
 </item>
 </terms>
 
-  
-  
 </page>
index e89c8fe..07a0ed8 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_object_do_not_use</api:name>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.prototype.do_not_use</title>
-  
-<synopsis><code mime="text/x-gjs">
-function do_not_use():GObject.Object {
+  <synopsis><code mime="text/x-gjs">
+function do_not_use(): <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link> {
     // Gjs wrapper for regress_annotation_object_do_not_use()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p><code>null</code> always</p>
+  <p><code>null</code> always</p>
 </item>
 </terms>
 
-  
-  
 </page>
index cd58eed..af1d729 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_object_extra_annos</api:name>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.prototype.extra_annos</title>
-  
-<synopsis><code mime="text/x-gjs">
-function extra_annos():void {
+  <synopsis><code mime="text/x-gjs">
+function extra_annos(): void {
     // Gjs wrapper for regress_annotation_object_extra_annos()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-<terms>
-</terms>
 
-  
-  
 </page>
index e4cc4c0..8152aa8 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>func</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.prototype.foreach</title>
-  
-<synopsis><code mime="text/x-gjs">
-function foreach(func:Regress.AnnotationForeachFunc):void {
+  <synopsis><code mime="text/x-gjs">
+function foreach(func: <link xref="Regress.AnnotationForeachFunc">Regress.AnnotationForeachFunc</link>): void {
     // Gjs wrapper for regress_annotation_object_foreach()
 }
-</code></synopsis>
+  </code></synopsis>
+  <p>Test taking a call-scoped callback</p>
 
-  
-    <p>Test taking a call-scoped callback</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>func</code></title>
-<p>Callback to invoke</p>
+  <p>Callback to invoke</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 2e6ca61..ec29a8a 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_object_get_hash</api:name>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.prototype.get_hash</title>
-  
-<synopsis><code mime="text/x-gjs">
-function get_hash():{String: GObject.Object} {
+  <synopsis><code mime="text/x-gjs">
+function get_hash(): {String: <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link>} {
     // Gjs wrapper for regress_annotation_object_get_hash()
 }
-</code></synopsis>
-
-  
-    <p>This is a test for returning a hash table mapping strings to
+  </code></synopsis>
+  <p>This is a test for returning a hash table mapping strings to
 objects.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>hash table</p>
+  <p>hash table</p>
 </item>
 </terms>
 
-  
-  
 </page>
index c0350d7..38e3d46 100644 (file)
@@ -6,39 +6,29 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>[Regress.AnnotationObject]</api:type>
+        <api:type>Array(Regress.AnnotationObject)</api:type>
       </api:returns>
       <api:name>regress_annotation_object_get_objects</api:name>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.prototype.get_objects</title>
-  
-<synopsis><code mime="text/x-gjs">
-function get_objects():[Regress.AnnotationObject] {
+  <synopsis><code mime="text/x-gjs">
+function get_objects(): Array(<link xref="Regress.AnnotationObject">Regress.AnnotationObject</link>) {
     // Gjs wrapper for regress_annotation_object_get_objects()
 }
-</code></synopsis>
-
-  
-    <p>This is a test for returning a list of objects.
+  </code></synopsis>
+  <p>This is a test for returning a list of objects.
 The list itself should be freed, but not the internal objects,
 intentionally similar example to gtk_container_get_children</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>list of objects</p>
+  <p>list of objects</p>
 </item>
 </terms>
 
-  
-  
 </page>
index e36d25a..03fece1 100644 (file)
@@ -6,38 +6,28 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>[String]</api:type>
+        <api:type>Array(String)</api:type>
       </api:returns>
       <api:name>regress_annotation_object_get_strings</api:name>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.prototype.get_strings</title>
-  
-<synopsis><code mime="text/x-gjs">
-function get_strings():[String] {
+  <synopsis><code mime="text/x-gjs">
+function get_strings(): Array(String) {
     // Gjs wrapper for regress_annotation_object_get_strings()
 }
-</code></synopsis>
-
-  
-    <p>This is a test for returning a list of strings, where
+  </code></synopsis>
+  <p>This is a test for returning a list of strings, where
 each string needs to be freed.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>list of strings</p>
+  <p>list of strings</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 945acf0..814248f 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_object_hidden_self</api:name>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.prototype.hidden_self</title>
-  
-<synopsis><code mime="text/x-gjs">
-function hidden_self():void {
+  <synopsis><code mime="text/x-gjs">
+function hidden_self(): void {
     // Gjs wrapper for regress_annotation_object_hidden_self()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-<terms>
-</terms>
 
-  
-  
 </page>
index 226b2b9..892eb42 100644 (file)
@@ -6,45 +6,35 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_annotation_object_in</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>inarg</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.prototype.in</title>
-  
-<synopsis><code mime="text/x-gjs">
-function in(inarg:Number):Number {
+  <synopsis><code mime="text/x-gjs">
+function in(inarg: Number(gint)): Number(gint) {
     // Gjs wrapper for regress_annotation_object_in()
 }
-</code></synopsis>
+  </code></synopsis>
+  <p>This is a test for in arguments</p>
 
-  
-    <p>This is a test for in arguments</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>inarg</code></title>
-<p>This is an argument test</p>
+  <p>This is an argument test</p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>an int</p>
+  <p>an int</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 885412f..5d2eaa5 100644 (file)
@@ -6,45 +6,39 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_annotation_object_inout</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>inoutarg</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.prototype.inout</title>
-  
-<synopsis><code mime="text/x-gjs">
-function inout(inoutarg:Number):Number {
+  <synopsis><code mime="text/x-gjs">
+function inout(inoutarg: Number(gint)): [return_value: Number(gint), inoutarg: Number(gint)] {
     // Gjs wrapper for regress_annotation_object_inout()
 }
-</code></synopsis>
+  </code></synopsis>
+  <p>This is a test for out arguments</p>
 
-  
-    <p>This is a test for out arguments</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>inoutarg</code></title>
-<p>This is an argument test</p>
+  <p>This is an argument test</p>
+</item>
+<item>
+<title><code>return_value</code></title>
+  <p>an int</p>
 </item>
 <item>
-<title><code>Returns</code></title>
-<p>an int</p>
+<title><code>inoutarg (out)</code></title>
+  <p>This is an argument test</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 34406b7..06c0a83 100644 (file)
@@ -6,45 +6,39 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_annotation_object_inout2</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>inoutarg</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.prototype.inout2</title>
-  
-<synopsis><code mime="text/x-gjs">
-function inout2(inoutarg:Number):Number {
+  <synopsis><code mime="text/x-gjs">
+function inout2(inoutarg: Number(gint)): [return_value: Number(gint), inoutarg: Number(gint)] {
     // Gjs wrapper for regress_annotation_object_inout2()
 }
-</code></synopsis>
+  </code></synopsis>
+  <p>This is a second test for out arguments</p>
 
-  
-    <p>This is a second test for out arguments</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>inoutarg</code></title>
-<p>This is an argument test</p>
+  <p>This is an argument test</p>
+</item>
+<item>
+<title><code>return_value</code></title>
+  <p>an int</p>
 </item>
 <item>
-<title><code>Returns</code></title>
-<p>an int</p>
+<title><code>inoutarg (out)</code></title>
+  <p>This is an argument test</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 2828964..e20f1f5 100644 (file)
@@ -6,45 +6,39 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_annotation_object_inout3</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>inoutarg</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.prototype.inout3</title>
-  
-<synopsis><code mime="text/x-gjs">
-function inout3(inoutarg:Number):Number {
+  <synopsis><code mime="text/x-gjs">
+function inout3(inoutarg: Number(gint)): [return_value: Number(gint), inoutarg: Number(gint)] {
     // Gjs wrapper for regress_annotation_object_inout3()
 }
-</code></synopsis>
+  </code></synopsis>
+  <p>This is a 3th test for out arguments</p>
 
-  
-    <p>This is a 3th test for out arguments</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>inoutarg</code></title>
-<p>This is an argument test</p>
+  <p>This is an argument test</p>
+</item>
+<item>
+<title><code>return_value</code></title>
+  <p>an int</p>
 </item>
 <item>
-<title><code>Returns</code></title>
-<p>an int</p>
+<title><code>inoutarg (out)</code></title>
+  <p>This is an argument test</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 49d937a..e94067c 100644 (file)
@@ -6,37 +6,27 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_annotation_object_method</api:name>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.prototype.method</title>
-  
-<synopsis><code mime="text/x-gjs">
-function method():Number {
+  <synopsis><code mime="text/x-gjs">
+function method(): Number(gint) {
     // Gjs wrapper for regress_annotation_object_method()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>an int</p>
+  <p>an int</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 0424719..97d302b 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_object_notrans</api:name>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.prototype.notrans</title>
-  
-<synopsis><code mime="text/x-gjs">
-function notrans():GObject.Object {
+  <synopsis><code mime="text/x-gjs">
+function notrans(): <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link> {
     // Gjs wrapper for regress_annotation_object_notrans()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>An object, not referenced</p>
+  <p>An object, not referenced</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 5120baf..e9cb17b 100644 (file)
@@ -6,37 +6,31 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_annotation_object_out</api:name>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.prototype.out</title>
-  
-<synopsis><code mime="text/x-gjs">
-function out():Number {
+  <synopsis><code mime="text/x-gjs">
+function out(): [return_value: Number(gint), outarg: Number(gint)] {
     // Gjs wrapper for regress_annotation_object_out()
 }
-</code></synopsis>
+  </code></synopsis>
+  <p>This is a test for out arguments</p>
 
-  
-    <p>This is a test for out arguments</p>
-  
-  
-  
-  
 <terms>
 <item>
-<title><code>Returns</code></title>
-<p>an int</p>
+<title><code>return_value</code></title>
+  <p>an int</p>
+</item>
+<item>
+<title><code>outarg</code></title>
+  <p>This is an argument test</p>
 </item>
 </terms>
 
-  
-  
 </page>
index f4f0130..cca4c5d 100644 (file)
@@ -6,28 +6,20 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.AnnotationObject</title>
-  
   <synopsis><code>
 const Regress = imports.gi.Regress;
 
-let annotation_object = new Regress.AnnotationObject({
+let annotationObject = new Regress.AnnotationObject({
     <link xref='Regress.AnnotationObject-function-property'>function_property</link>: value,
     <link xref='Regress.AnnotationObject-string-property'>string_property</link>: value,
     <link xref='Regress.AnnotationObject-tab-property'>tab_property</link>: value,
 });
   </code></synopsis>
+  <p>This is an object used to test annotations.</p>
 
-  
-    <p>This is an object used to test annotations.</p>
-  
-  
-  
-  
   <synopsis>
     <title>Hierarchy</title>
     <tree>
@@ -39,8 +31,11 @@ let annotation_object = new Regress.AnnotationObject({
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-gjs"
          groups="method" style="linklist">
@@ -49,7 +44,7 @@ let annotation_object = new Regress.AnnotationObject({
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-gjs"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
@@ -60,8 +55,10 @@ let annotation_object = new Regress.AnnotationObject({
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
index 8476fd8..8bc6913 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_object_parse_args</api:name>
       <api:arg>
-        <api:type>[String]</api:type>
+        <api:type>Array(String)</api:type>
         <api:name>argv</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.prototype.parse_args</title>
-  
-<synopsis><code mime="text/x-gjs">
-function parse_args(argv:[String]):void {
+  <synopsis><code mime="text/x-gjs">
+function parse_args(argv: Array(String)): Array(String) {
     // Gjs wrapper for regress_annotation_object_parse_args()
 }
-</code></synopsis>
+  </code></synopsis>
+  <p>Test taking a zero-terminated array with length parameter</p>
 
-  
-    <p>Test taking a zero-terminated array with length parameter</p>
-  
-  
-  
-  
 <terms>
 <item>
-<title><code>argv</code></title>
-<p>Argument vector</p>
+<title><code>Returns</code></title>
+  <p>Argument vector</p>
+</item>
+<item>
+<title><code>Returns (out)</code></title>
+  <p>Argument vector</p>
 </item>
 </terms>
 
-  
-  
 </page>
index a5dafb9..1114cea 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_object_set_data</api:name>
       <api:arg>
-        <api:type>[guint8]</api:type>
+        <api:type>ByteArray</api:type>
         <api:name>data</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.prototype.set_data</title>
-  
-<synopsis><code mime="text/x-gjs">
-function set_data(data:[guint8]):void {
+  <synopsis><code mime="text/x-gjs">
+function set_data(data: ByteArray): void {
     // Gjs wrapper for regress_annotation_object_set_data()
 }
-</code></synopsis>
+  </code></synopsis>
+  <p>Test taking a guchar * with a length.</p>
 
-  
-    <p>Test taking a guchar * with a length.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>data</code></title>
-<p>The data</p>
+  <p>The data</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 3fcd818..83a2349 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_object_set_data2</api:name>
       <api:arg>
-        <api:type>[gint8]</api:type>
+        <api:type>ByteArray</api:type>
         <api:name>data</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.prototype.set_data2</title>
-  
-<synopsis><code mime="text/x-gjs">
-function set_data2(data:[gint8]):void {
+  <synopsis><code mime="text/x-gjs">
+function set_data2(data: ByteArray): void {
     // Gjs wrapper for regress_annotation_object_set_data2()
 }
-</code></synopsis>
+  </code></synopsis>
+  <p>Test taking a gchar * with a length.</p>
 
-  
-    <p>Test taking a gchar * with a length.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>data</code></title>
-<p>The data</p>
+  <p>The data</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 22fb98d..ffef4ec 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_object_set_data3</api:name>
       <api:arg>
-        <api:type>[guint8]</api:type>
+        <api:type>ByteArray</api:type>
         <api:name>data</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.prototype.set_data3</title>
-  
-<synopsis><code mime="text/x-gjs">
-function set_data3(data:[guint8]):void {
+  <synopsis><code mime="text/x-gjs">
+function set_data3(data: ByteArray): void {
     // Gjs wrapper for regress_annotation_object_set_data3()
 }
-</code></synopsis>
-
-  
-    <p>Test taking a gchar * with a length, overriding the array element
+  </code></synopsis>
+  <p>Test taking a gchar * with a length, overriding the array element
 type.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>data</code></title>
-<p>The data</p>
+  <p>The data</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 4d6029a..9df3a2a 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_object_string_out</api:name>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.prototype.string_out</title>
-  
-<synopsis><code mime="text/x-gjs">
-function string_out():Boolean {
+  <synopsis><code mime="text/x-gjs">
+function string_out(): [ok: Boolean, str_out: String] {
     // Gjs wrapper for regress_annotation_object_string_out()
 }
-</code></synopsis>
+  </code></synopsis>
+  <p>Test returning a string as an out parameter</p>
 
-  
-    <p>Test returning a string as an out parameter</p>
-  
-  
-  
-  
 <terms>
 <item>
-<title><code>Returns</code></title>
-<p>some boolean</p>
+<title><code>ok</code></title>
+  <p>some boolean</p>
+</item>
+<item>
+<title><code>str_out</code></title>
+  <p>string return value</p>
 </item>
 </terms>
 
-  
-  
 </page>
index c602a89..5f45283 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_object_use_buffer</api:name>
       <api:arg>
-        <api:type>guint8</api:type>
+        <api:type>Number(guint8)</api:type>
         <api:name>bytes</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.prototype.use_buffer</title>
-  
-<synopsis><code mime="text/x-gjs">
-function use_buffer(bytes:guint8):void {
+  <synopsis><code mime="text/x-gjs">
+function use_buffer(bytes: Number(guint8)): void {
     // Gjs wrapper for regress_annotation_object_use_buffer()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>bytes</code></title>
@@ -41,6 +33,4 @@ function use_buffer(bytes:guint8):void {
 </item>
 </terms>
 
-  
-  
 </page>
@@ -1,12 +1,11 @@
 <?xml version="1.0"?>
-<page id="Regress.AnnotationObject.watch_full"
+<page id="Regress.AnnotationObject.watch"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>func</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Regress.AnnotationObject.prototype.watch_full</title>
-  
-<synopsis><code mime="text/x-gjs">
-function watch_full(func:Regress.AnnotationForeachFunc):void {
+  <title>Regress.AnnotationObject.prototype.watch</title>
+  <synopsis><code mime="text/x-gjs">
+function watch(func: <link xref="Regress.AnnotationForeachFunc">Regress.AnnotationForeachFunc</link>): void {
     // Gjs wrapper for regress_annotation_object_watch_full()
 }
-</code></synopsis>
+  </code></synopsis>
+  <p>Test overriding via the "Rename To" annotation.</p>
 
-  
-    <p>Test overriding via the "Rename To" annotation.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>func</code></title>
-<p>The callback</p>
+  <p>The callback</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 6daccb5..b78d7bf 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_object_with_voidp</api:name>
       <api:arg>
-        <api:type>gpointer</api:type>
+        <api:type>void</api:type>
         <api:name>data</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.prototype.with_voidp</title>
-  
-<synopsis><code mime="text/x-gjs">
-function with_voidp(data:gpointer):void {
+  <synopsis><code mime="text/x-gjs">
+function with_voidp(data: void): void {
     // Gjs wrapper for regress_annotation_object_with_voidp()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>data</code></title>
-<p>Opaque pointer handle</p>
+  <p>Opaque pointer handle</p>
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationStruct-objects.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationStruct-objects.page
new file mode 100644 (file)
index 0000000..e1e85f0
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.AnnotationStruct-objects"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.AnnotationStruct" group="field" type="guide"/>
+    <title type="link" role="topic">objects</title>
+  </info>
+  <title>Regress.AnnotationStruct.objects</title>
+  <synopsis><code mime="text/x-gjs">
+AnnotationStruct.objects: Array(<link xref="Regress.AnnotationObject">Regress.AnnotationObject</link>) (Read / Write)
+  </code></synopsis>
+
+
+</page>
index e210042..cdb5585 100644 (file)
@@ -1,25 +1,42 @@
 <?xml version="1.0"?>
 <page id="Regress.AnnotationStruct"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.AnnotationStruct</title>
-  
-  
-  
-    <p>This is a test of an array of object in an field of a struct.</p>
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let annotationStruct = new Regress.AnnotationStruct({
+    <link xref='Regress.AnnotationStruct-objects'>objects</link>: value
+});
+  </code></synopsis>
+  <p>This is a test of an array of object in an field of a struct.</p>
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.BOOL_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.BOOL_CONSTANT.page
new file mode 100644 (file)
index 0000000..e65594f
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.BOOL_CONSTANT"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.BOOL_CONSTANT</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.DOUBLE_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.DOUBLE_CONSTANT.page
new file mode 100644 (file)
index 0000000..bbc2a03
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.DOUBLE_CONSTANT"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.DOUBLE_CONSTANT</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page
new file mode 100644 (file)
index 0000000..09b1561
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FOO_DEFINE_SHOULD_BE_EXPOSED"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.FOO_DEFINE_SHOULD_BE_EXPOSED</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_PIE_IS_TASTY.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_PIE_IS_TASTY.page
new file mode 100644 (file)
index 0000000..132f508
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FOO_PIE_IS_TASTY"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.FOO_PIE_IS_TASTY</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_SUCCESS_INT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_SUCCESS_INT.page
new file mode 100644 (file)
index 0000000..58650ec
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FOO_SUCCESS_INT"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.FOO_SUCCESS_INT</title>
+
+
+</page>
index 09cd98f..ee97008 100644 (file)
@@ -1,31 +1,25 @@
 <?xml version="1.0"?>
 <page id="Regress.FooASingle"
-      type="topic"
+      type="guide"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.FooASingle</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
 <terms>
 <item>
 <title><code>FooASingle.FOO_SOME_SINGLE_ENUM</code></title>
 
 </item>
 </terms>
-
-  
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
index 008a8f3..16ee99d 100644 (file)
@@ -1,24 +1,16 @@
 <?xml version="1.0"?>
 <page id="Regress.FooAddressType"
-      type="topic"
+      type="guide"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.FooAddressType</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
 <terms>
 <item>
 <title><code>FooAddressType.INVALID</code></title>
@@ -33,7 +25,9 @@
 
 </item>
 </terms>
-
-  
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect-x.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect-x.page
new file mode 100644 (file)
index 0000000..3bb9c25
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.FooBRect-x"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooBRect" group="field" type="guide"/>
+    <title type="link" role="topic">x</title>
+  </info>
+  <title>Regress.FooBRect.x</title>
+  <synopsis><code mime="text/x-gjs">
+FooBRect.x: Number(gdouble) (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect-y.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect-y.page
new file mode 100644 (file)
index 0000000..6a233fc
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.FooBRect-y"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooBRect" group="field" type="guide"/>
+    <title type="link" role="topic">y</title>
+  </info>
+  <title>Regress.FooBRect.y</title>
+  <synopsis><code mime="text/x-gjs">
+FooBRect.y: Number(gdouble) (Read / Write)
+  </code></synopsis>
+
+
+</page>
index 9091617..7e5ba37 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooBRect" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>b2</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.FooBRect.prototype.add</title>
-  
-<synopsis><code mime="text/x-gjs">
-function add(b2:Regress.FooBRect):void {
+  <synopsis><code mime="text/x-gjs">
+function add(b2: <link xref="Regress.FooBRect">Regress.FooBRect</link>): void {
     // Gjs wrapper for regress_foo_brect_add()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>b2</code></title>
@@ -41,6 +33,4 @@ function add(b2:Regress.FooBRect):void {
 </item>
 </terms>
 
-  
-  
 </page>
index 2d2b574..f09ba87 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooBRect" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_brect_new</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gdouble)</api:type>
         <api:name>x</api:name>
       </api:arg>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gdouble)</api:type>
         <api:name>y</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.FooBRect.new</title>
-  
-<synopsis><code mime="text/x-gjs">
-function new(x:Number, y:Number):Regress.FooBRect {
+  <synopsis><code mime="text/x-gjs">
+function new(x: Number(gdouble), y: Number(gdouble)): <link xref="Regress.FooBRect">Regress.FooBRect</link> {
     // Gjs wrapper for regress_foo_brect_new()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>x</code></title>
@@ -53,6 +45,4 @@ function new(x:Number, y:Number):Regress.FooBRect {
 </item>
 </terms>
 
-  
-  
 </page>
index fd1e9d6..81db692 100644 (file)
@@ -1,25 +1,43 @@
 <?xml version="1.0"?>
 <page id="Regress.FooBRect"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooBRect</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let fooBRect = new Regress.FooBRect({
+    <link xref='Regress.FooBRect-x'>x</link>: value
+    <link xref='Regress.FooBRect-y'>y</link>: value
+});
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 7d82f4f..33ec70a 100644 (file)
@@ -6,30 +6,22 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooBUnion" group="method" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_foo_bunion_get_contained_type</api:name>
     </api:function>
-
   </info>
   <title>Regress.FooBUnion.prototype.get_contained_type</title>
-  
-<synopsis><code mime="text/x-gjs">
-function get_contained_type():Number {
+  <synopsis><code mime="text/x-gjs">
+function get_contained_type(): Number(gint) {
     // Gjs wrapper for regress_foo_bunion_get_contained_type()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function get_contained_type():Number {
 </item>
 </terms>
 
-  
-  
 </page>
index e16397c..da064a6 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooBUnion" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_bunion_new</api:name>
     </api:function>
-
   </info>
   <title>Regress.FooBUnion.new</title>
-  
-<synopsis><code mime="text/x-gjs">
-function new():Regress.FooBUnion {
+  <synopsis><code mime="text/x-gjs">
+function new(): <link xref="Regress.FooBUnion">Regress.FooBUnion</link> {
     // Gjs wrapper for regress_foo_bunion_new()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function new():Regress.FooBUnion {
 </item>
 </terms>
 
-  
-  
 </page>
index 8644d96..a5ef038 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.FooBUnion"
-      type="topic"
-      style="default"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooBUnion</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let fooBUnion = new Regress.FooBUnion();
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 896d02a..c5d4dac 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooBoxed" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_boxed_method</api:name>
     </api:function>
-
   </info>
   <title>Regress.FooBoxed.prototype.method</title>
-  
-<synopsis><code mime="text/x-gjs">
-function method():void {
+  <synopsis><code mime="text/x-gjs">
+function method(): void {
     // Gjs wrapper for regress_foo_boxed_method()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-<terms>
-</terms>
 
-  
-  
 </page>
index 67b1c4f..ab3a533 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooBoxed" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_boxed_new</api:name>
     </api:function>
-
   </info>
   <title>Regress.FooBoxed.new</title>
-  
-<synopsis><code mime="text/x-gjs">
-function new():Regress.FooBoxed {
+  <synopsis><code mime="text/x-gjs">
+function new(): <link xref="Regress.FooBoxed">Regress.FooBoxed</link> {
     // Gjs wrapper for regress_foo_boxed_new()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function new():Regress.FooBoxed {
 </item>
 </terms>
 
-  
-  
 </page>
index bca1f99..d7e24e2 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.FooBoxed"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooBoxed</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let fooBoxed = new Regress.FooBoxed();
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 0b4f9e5..6e28c73 100644 (file)
@@ -6,24 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooBuffer</title>
-  
   <synopsis><code>
 const Regress = imports.gi.Regress;
 
-let foo_buffer = new Regress.FooBuffer();
+let fooBuffer = new Regress.FooBuffer();
   </code></synopsis>
 
-  
-    
-  
-  
-  
-  
+
   <synopsis>
     <title>Hierarchy</title>
     <tree>
@@ -38,8 +30,11 @@ let foo_buffer = new Regress.FooBuffer();
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-gjs"
          groups="method" style="linklist">
@@ -48,7 +43,7 @@ let foo_buffer = new Regress.FooBuffer();
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-gjs"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
@@ -59,8 +54,10 @@ let foo_buffer = new Regress.FooBuffer();
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
index 871ec7a..273d069 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooBuffer" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_buffer_some_method</api:name>
     </api:function>
-
   </info>
   <title>Regress.FooBuffer.prototype.some_method</title>
-  
-<synopsis><code mime="text/x-gjs">
-function some_method():void {
+  <synopsis><code mime="text/x-gjs">
+function some_method(): void {
     // Gjs wrapper for regress_foo_buffer_some_method()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-<terms>
-</terms>
 
-  
-  
 </page>
index 52feda2..697eab7 100644 (file)
@@ -1,25 +1,37 @@
 <?xml version="1.0"?>
 <page id="Regress.FooCallback"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="callback" type="guide"/>
   </info>
   <title>Regress.FooCallback</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-gjs">
+function onFooCallback(regress_foo: <link xref="Regress.FooObject">Regress.FooObject</link>, b: Boolean, data: void): Boolean {
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>regress_foo</code></title>
+
+</item>
+<item>
+<title><code>b</code></title>
+
+</item>
+<item>
+<title><code>data</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index 0b1b6b8..734f2ae 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooDBusData" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_dbus_data_method</api:name>
     </api:function>
-
   </info>
   <title>Regress.FooDBusData.prototype.method</title>
-  
-<synopsis><code mime="text/x-gjs">
-function method():void {
+  <synopsis><code mime="text/x-gjs">
+function method(): void {
     // Gjs wrapper for regress_foo_dbus_data_method()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-<terms>
-</terms>
 
-  
-  
 </page>
index b4eaead..60ef872 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.FooDBusData"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooDBusData</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let fooDBusData = new Regress.FooDBusData();
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 00169aa..2d36462 100644 (file)
@@ -1,24 +1,16 @@
 <?xml version="1.0"?>
 <page id="Regress.FooEnumFullname"
-      type="topic"
+      type="guide"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.FooEnumFullname</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
 <terms>
 <item>
 <title><code>FooEnumFullname.ONE</code></title>
@@ -33,7 +25,9 @@
 
 </item>
 </terms>
-
-  
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
index d2b41e6..fb10ef7 100644 (file)
@@ -1,24 +1,16 @@
 <?xml version="1.0"?>
 <page id="Regress.FooEnumNoType"
-      type="topic"
+      type="guide"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.FooEnumNoType</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
 <terms>
 <item>
 <title><code>FooEnumNoType.UN</code></title>
@@ -37,7 +29,9 @@
 
 </item>
 </terms>
-
-  
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
index e3240c1..c5c166d 100644 (file)
@@ -6,11 +6,10 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.FooEnumType" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_foo_enum_type_method</api:name>
       <api:arg>
         <api:name>regress_foo_enum</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>method</title>
-  
-<synopsis><code mime="text/x-gjs">
-function method(regress_foo_enum:Regress.FooEnumType):Number {
+  <title>Regress.FooEnumType.method</title>
+  <synopsis><code mime="text/x-gjs">
+function method(regress_foo_enum: <link xref="Regress.FooEnumType">Regress.FooEnumType</link>): Number(gint) {
     // Gjs wrapper for regress_foo_enum_type_method()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>regress_foo_enum</code></title>
@@ -45,6 +37,4 @@ function method(regress_foo_enum:Regress.FooEnumType):Number {
 </item>
 </terms>
 
-  
-  
 </page>
index c3ff89b..1a92059 100644 (file)
@@ -1,24 +1,16 @@
 <?xml version="1.0"?>
 <page id="Regress.FooEnumType"
-      type="topic"
+      type="guide"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.FooEnumType</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
 <terms>
 <item>
 <title><code>FooEnumType.ALPHA</code></title>
@@ -33,7 +25,9 @@
 
 </item>
 </terms>
-
-  
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
index 4e42fde..d5c274b 100644 (file)
@@ -6,34 +6,26 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.FooEnumType" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>Regress.FooEnumType</api:type>
       </api:returns>
       <api:name>regress_foo_enum_type_returnv</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>x</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>returnv</title>
-  
-<synopsis><code mime="text/x-gjs">
-function returnv(x:Number):Regress.FooEnumType {
+  <title>Regress.FooEnumType.returnv</title>
+  <synopsis><code mime="text/x-gjs">
+function returnv(x: Number(gint)): <link xref="Regress.FooEnumType">Regress.FooEnumType</link> {
     // Gjs wrapper for regress_foo_enum_type_returnv()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>x</code></title>
@@ -45,6 +37,4 @@ function returnv(x:Number):Regress.FooEnumType {
 </item>
 </terms>
 
-  
-  
 </page>
index 8c0b6a2..ef47486 100644 (file)
@@ -1,24 +1,16 @@
 <?xml version="1.0"?>
 <page id="Regress.FooError"
-      type="topic"
+      type="guide"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.FooError</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
 <terms>
 <item>
 <title><code>FooError.GOOD</code></title>
@@ -33,7 +25,9 @@
 
 </item>
 </terms>
-
-  
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
index ed02376..794fbb5 100644 (file)
@@ -6,30 +6,22 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.FooError" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>GLib.Quark</api:type>
       </api:returns>
       <api:name>regress_foo_error_quark</api:name>
     </api:function>
-
   </info>
-  <title>quark</title>
-  
-<synopsis><code mime="text/x-gjs">
-function quark():GLib.Quark {
+  <title>Regress.FooError.quark</title>
+  <synopsis><code mime="text/x-gjs">
+function quark(): <link href="../GLib-2.0/GLib.Quark.html">GLib.Quark</link> {
     // Gjs wrapper for regress_foo_error_quark()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function quark():GLib.Quark {
 </item>
 </terms>
 
-  
-  
 </page>
index ce36830..8bd91a3 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.FooEvent"
-      type="topic"
-      style="default"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooEvent</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let fooEvent = new Regress.FooEvent();
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventAny-send_event.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventAny-send_event.page
new file mode 100644 (file)
index 0000000..e6cba87
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.FooEventAny-send_event"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooEventAny" group="field" type="guide"/>
+    <title type="link" role="topic">send_event</title>
+  </info>
+  <title>Regress.FooEventAny.send_event</title>
+  <synopsis><code mime="text/x-gjs">
+FooEventAny.send_event: Number(gint8) (Read / Write)
+  </code></synopsis>
+
+
+</page>
index 562ec03..110f36d 100644 (file)
@@ -1,25 +1,42 @@
 <?xml version="1.0"?>
 <page id="Regress.FooEventAny"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooEventAny</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let fooEventAny = new Regress.FooEventAny({
+    <link xref='Regress.FooEventAny-send_event'>send_event</link>: value
+});
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventExpose-count.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventExpose-count.page
new file mode 100644 (file)
index 0000000..d8ef3dc
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.FooEventExpose-count"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooEventExpose" group="field" type="guide"/>
+    <title type="link" role="topic">count</title>
+  </info>
+  <title>Regress.FooEventExpose.count</title>
+  <synopsis><code mime="text/x-gjs">
+FooEventExpose.count: Number(gint) (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventExpose-send_event.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventExpose-send_event.page
new file mode 100644 (file)
index 0000000..19d36c8
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.FooEventExpose-send_event"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooEventExpose" group="field" type="guide"/>
+    <title type="link" role="topic">send_event</title>
+  </info>
+  <title>Regress.FooEventExpose.send_event</title>
+  <synopsis><code mime="text/x-gjs">
+FooEventExpose.send_event: Number(gint8) (Read / Write)
+  </code></synopsis>
+
+
+</page>
index 0000add..4e6d7f0 100644 (file)
@@ -1,25 +1,43 @@
 <?xml version="1.0"?>
 <page id="Regress.FooEventExpose"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooEventExpose</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let fooEventExpose = new Regress.FooEventExpose({
+    <link xref='Regress.FooEventExpose-send_event'>send_event</link>: value
+    <link xref='Regress.FooEventExpose-count'>count</link>: value
+});
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 53539d4..d9b2cc7 100644 (file)
@@ -1,25 +1,33 @@
 <?xml version="1.0"?>
 <page id="Regress.FooFlagsNoType"
-      type="topic"
-      style="default"
+      type="guide"
+      style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.FooFlagsNoType</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+<terms>
+<item>
+<title><code>FooFlagsNoType.ETT</code></title>
+
+</item>
+<item>
+<title><code>FooFlagsNoType.TVA</code></title>
+
+</item>
+<item>
+<title><code>FooFlagsNoType.FYRA</code></title>
+
+</item>
+</terms>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
index 2b4afeb..ec6f34c 100644 (file)
@@ -1,25 +1,33 @@
 <?xml version="1.0"?>
 <page id="Regress.FooFlagsType"
-      type="topic"
-      style="default"
+      type="guide"
+      style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.FooFlagsType</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+<terms>
+<item>
+<title><code>FooFlagsType.FIRST</code></title>
+
+</item>
+<item>
+<title><code>FooFlagsType.SECOND</code></title>
+
+</item>
+<item>
+<title><code>FooFlagsType.THIRD</code></title>
+
+</item>
+</terms>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct-regress_foo.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct-regress_foo.page
new file mode 100644 (file)
index 0000000..f50e634
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.FooForeignStruct-regress_foo"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooForeignStruct" group="field" type="guide"/>
+    <title type="link" role="topic">regress_foo</title>
+  </info>
+  <title>Regress.FooForeignStruct.regress_foo</title>
+  <synopsis><code mime="text/x-gjs">
+FooForeignStruct.regress_foo: Number(gint) (Read / Write)
+  </code></synopsis>
+
+
+</page>
index 1a61cfb..313f3ec 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooForeignStruct" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_foreign_struct_copy</api:name>
     </api:function>
-
   </info>
   <title>Regress.FooForeignStruct.prototype.copy</title>
-  
-<synopsis><code mime="text/x-gjs">
-function copy():Regress.FooForeignStruct {
+  <synopsis><code mime="text/x-gjs">
+function copy(): <link xref="Regress.FooForeignStruct">Regress.FooForeignStruct</link> {
     // Gjs wrapper for regress_foo_foreign_struct_copy()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function copy():Regress.FooForeignStruct {
 </item>
 </terms>
 
-  
-  
 </page>
index 814eef3..7040d19 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooForeignStruct" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_foreign_struct_new</api:name>
     </api:function>
-
   </info>
   <title>Regress.FooForeignStruct.new</title>
-  
-<synopsis><code mime="text/x-gjs">
-function new():Regress.FooForeignStruct {
+  <synopsis><code mime="text/x-gjs">
+function new(): <link xref="Regress.FooForeignStruct">Regress.FooForeignStruct</link> {
     // Gjs wrapper for regress_foo_foreign_struct_new()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function new():Regress.FooForeignStruct {
 </item>
 </terms>
 
-  
-  
 </page>
index 312994a..8689226 100644 (file)
@@ -1,25 +1,42 @@
 <?xml version="1.0"?>
 <page id="Regress.FooForeignStruct"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooForeignStruct</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let fooForeignStruct = new Regress.FooForeignStruct({
+    <link xref='Regress.FooForeignStruct-regress_foo'>regress_foo</link>: value
+});
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 17f6ec9..25f1709 100644 (file)
@@ -6,23 +6,15 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="Regress.FooInterface" group="vfunc" type="guide"/>
-    
+    <link xref="Regress.FooInterface" group="vfunc" type="guide"/>
   </info>
   <title>Regress.FooInterface::do_regress_foo</title>
-  
-<synopsis><code mime="text/x-gjs">
-function vfunc_do_regress_foo(x:Number):void {
+  <synopsis><code mime="text/x-gjs">
+function vfunc_do_regress_foo(x: Number(gint)): void {
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>x</code></title>
@@ -30,6 +22,4 @@ function vfunc_do_regress_foo(x:Number):void {
 </item>
 </terms>
 
-  
-  
 </page>
index 993998e..4fda50e 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooInterface" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_interface_do_regress_foo</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>x</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.FooInterface.prototype.do_regress_foo</title>
-  
-<synopsis><code mime="text/x-gjs">
-function do_regress_foo(x:Number):void {
+  <synopsis><code mime="text/x-gjs">
+function do_regress_foo(x: Number(gint)): void {
     // Gjs wrapper for regress_foo_interface_do_regress_foo()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>x</code></title>
@@ -41,6 +33,4 @@ function do_regress_foo(x:Number):void {
 </item>
 </terms>
 
-  
-  
 </page>
index 83ae1d0..d5db2a0 100644 (file)
@@ -1,39 +1,34 @@
 <?xml version="1.0"?>
 <page id="Regress.FooInterface"
       type="guide"
-      style="class"
+      style="interface"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="interface" type="guide"/>
   </info>
   <title>Regress.FooInterface</title>
-  
   <synopsis><code>
 const Regress = imports.gi.Regress;
 
 let foo_interface = new Regress.FooInterface();
   </code></synopsis>
 
-  
-    
-  
-  
-  
-  
+
   <synopsis>
-    <title>Hierarchy</title>
-    <tree>
-      <item>
-        <code>Regress.FooInterface</code>
-      </item>
-    </tree>
+    <title>Prerequisites</title>
+    <p>FooInterface requires GObject.Object</p>
+  </synopsis>
+  <synopsis>
+    <title>Known Implementations</title>
+    <p>FooInterface is implemented by FooBuffer, FooObject and FooSubobject</p>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-gjs"
          groups="method" style="linklist">
@@ -42,7 +37,7 @@ let foo_interface = new Regress.FooInterface();
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-gjs"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
@@ -53,8 +48,10 @@ let foo_interface = new Regress.FooInterface();
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
index d38a448..6915fcc 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooInterface" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_interface_static_method</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>x</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>static_method</title>
-  
-<synopsis><code mime="text/x-gjs">
-function static_method(x:Number):void {
+  <title>Regress.FooInterface.static_method</title>
+  <synopsis><code mime="text/x-gjs">
+function static_method(x: Number(gint)): void {
     // Gjs wrapper for regress_foo_interface_static_method()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>x</code></title>
@@ -41,6 +33,4 @@ function static_method(x:Number):void {
 </item>
 </terms>
 
-  
-  
 </page>
index 4bdaf37..7c05893 100644 (file)
@@ -6,34 +6,24 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="Regress.FooObject" group="vfunc" type="guide"/>
-    
+    <link xref="Regress.FooObject" group="vfunc" type="guide"/>
   </info>
   <title>Regress.FooObject::read_fn</title>
-  
-<synopsis><code mime="text/x-gjs">
-function vfunc_read_fn(offset:Number, length:Number):void {
+  <synopsis><code mime="text/x-gjs">
+function vfunc_read_fn(offset: Number(gint), length: Number(gint)): void {
 }
-</code></synopsis>
+  </code></synopsis>
+  <p>Read some stuff.</p>
 
-  
-    <p>Read some stuff.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>offset</code></title>
-<p>offset</p>
+  <p>offset</p>
 </item>
 <item>
 <title><code>length</code></title>
-<p>length</p>
+  <p>length</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 6e5657d..92f2c60 100644 (file)
@@ -6,26 +6,18 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="signal" type="guide"/>
     <title type="link" role="topic">signal</title>
-
   </info>
   <title>Regress.FooObject::signal</title>
-  
-<synopsis><code mime="text/x-python">
-function callback(foo_object, object:GObject.Object, p0:gpointer, ):String;
-</code></synopsis>
+  <synopsis><code mime="text/x-gjs">
+connect('signal', function (fooObject, object: <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link>, p0: void, ): String);
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
-<title><code>foo_object</code></title>
+<title><code>fooObject</code></title>
 <p>instance of <link xref="Regress.FooObject"/> that is emitting the signal</p>
 </item>
 <item>
@@ -42,6 +34,4 @@ function callback(foo_object, object:GObject.Object, p0:gpointer, ):String;
 </item>
 </terms>
 
-  
-  
 </page>
index a738fdd..47e9002 100644 (file)
@@ -6,24 +6,13 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="property" type="guide"/>
     <title type="link" role="topic">string</title>
-
   </info>
-  <title>Regress.FooObject:string</title>
-  
-<synopsis><code mime="text/x-python">
-"string"             String                : Read / Write / Construct
-</code></synopsis>
+  <title>Regress.FooObject.string</title>
+  <synopsis><code mime="text/x-gjs">
+FooObject.string: String (Read / Write / Construct)
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-  
-  
-  
 </page>
index d2ccd86..327a02d 100644 (file)
@@ -6,23 +6,15 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="Regress.FooObject" group="vfunc" type="guide"/>
-    
+    <link xref="Regress.FooObject" group="vfunc" type="guide"/>
   </info>
   <title>Regress.FooObject::virtual_method</title>
-  
-<synopsis><code mime="text/x-gjs">
-function vfunc_virtual_method(first_param:Number):Boolean {
+  <synopsis><code mime="text/x-gjs">
+function vfunc_virtual_method(first_param: Number(gint)): Boolean {
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>first_param</code></title>
@@ -34,6 +26,4 @@ function vfunc_virtual_method(first_param:Number):Boolean {
 </item>
 </terms>
 
-  
-  
 </page>
index 83fec18..ba829fb 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>obj</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>a_global_method</title>
-  
-<synopsis><code mime="text/x-gjs">
-function a_global_method(obj:Utility.Object):void {
+  <title>Regress.FooObject.a_global_method</title>
+  <synopsis><code mime="text/x-gjs">
+function a_global_method(obj: <link href="../Utility-1.0/Utility.Object.html">Utility.Object</link>): void {
     // Gjs wrapper for regress_foo_object_a_global_method()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>obj</code></title>
@@ -41,6 +33,4 @@ function a_global_method(obj:Utility.Object):void {
 </item>
 </terms>
 
-  
-  
 </page>
index f1bfd92..9aa82be 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_object_append_new_stack_layer</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>x</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.FooObject.prototype.append_new_stack_layer</title>
-  
-<synopsis><code mime="text/x-gjs">
-function append_new_stack_layer(x:Number):Regress.FooOtherObject {
+  <synopsis><code mime="text/x-gjs">
+function append_new_stack_layer(x: Number(gint)): <link xref="Regress.FooOtherObject">Regress.FooOtherObject</link> {
     // Gjs wrapper for regress_foo_object_append_new_stack_layer()
 }
-</code></synopsis>
+  </code></synopsis>
+  <p>This shouldn't be scanned as a constructor.</p>
 
-  
-    <p>This shouldn't be scanned as a constructor.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>x</code></title>
@@ -45,6 +37,4 @@ function append_new_stack_layer(x:Number):Regress.FooOtherObject {
 </item>
 </terms>
 
-  
-  
 </page>
index d74f95b..83aa735 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_object_dup_name</api:name>
     </api:function>
-
   </info>
   <title>Regress.FooObject.prototype.dup_name</title>
-  
-<synopsis><code mime="text/x-gjs">
-function dup_name():String {
+  <synopsis><code mime="text/x-gjs">
+function dup_name(): String {
     // Gjs wrapper for regress_foo_object_dup_name()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function dup_name():String {
 </item>
 </terms>
 
-  
-  
 </page>
index 7da1b86..bd806bf 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_object_external_type</api:name>
     </api:function>
-
   </info>
   <title>Regress.FooObject.prototype.external_type</title>
-  
-<synopsis><code mime="text/x-gjs">
-function external_type():Utility.Object {
+  <synopsis><code mime="text/x-gjs">
+function external_type(): <link href="../Utility-1.0/Utility.Object.html">Utility.Object</link> {
     // Gjs wrapper for regress_foo_object_external_type()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p><code>null</code> always</p>
+  <p><code>null</code> always</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 8ab8654..63fa575 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_object_get_default</api:name>
     </api:function>
-
   </info>
-  <title>get_default</title>
-  
-<synopsis><code mime="text/x-gjs">
-function get_default():Regress.FooSubobject {
+  <title>Regress.FooObject.get_default</title>
+  <synopsis><code mime="text/x-gjs">
+function get_default(): <link xref="Regress.FooSubobject">Regress.FooSubobject</link> {
     // Gjs wrapper for regress_foo_object_get_default()
 }
-</code></synopsis>
-
-  
-    <p>This function is intended to match clutter_stage_get_default which
+  </code></synopsis>
+  <p>This function is intended to match clutter_stage_get_default which
 uses a C sugar return type.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>The global <link xref="Regress.FooSubobject"/></p>
+  <p>The global <link xref="Regress.FooSubobject"/></p>
 </item>
 </terms>
 
-  
-  
 </page>
index b9c69d2..00b4445 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_object_get_name</api:name>
     </api:function>
-
   </info>
   <title>Regress.FooObject.prototype.get_name</title>
-  
-<synopsis><code mime="text/x-gjs">
-function get_name():String {
+  <synopsis><code mime="text/x-gjs">
+function get_name(): String {
     // Gjs wrapper for regress_foo_object_get_name()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function get_name():String {
 </item>
 </terms>
 
-  
-  
 </page>
index 3209f20..a5cad51 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>glyph</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.FooObject.prototype.handle_glyph</title>
-  
-<synopsis><code mime="text/x-gjs">
-function handle_glyph(glyph:Utility.Glyph):void {
+  <synopsis><code mime="text/x-gjs">
+function handle_glyph(glyph: <link href="../Utility-1.0/Utility.Glyph.html">Utility.Glyph</link>): void {
     // Gjs wrapper for regress_foo_object_handle_glyph()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>glyph</code></title>
@@ -41,6 +33,4 @@ function handle_glyph(glyph:Utility.Glyph):void {
 </item>
 </terms>
 
-  
-  
 </page>
index f42e16b..61c1a7f 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_object_is_it_time_yet</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(glong)</api:type>
         <api:name>time</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.FooObject.prototype.is_it_time_yet</title>
-  
-<synopsis><code mime="text/x-gjs">
-function is_it_time_yet(time:Number):void {
+  <synopsis><code mime="text/x-gjs">
+function is_it_time_yet(time: Number(glong)): void {
     // Gjs wrapper for regress_foo_object_is_it_time_yet()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>time</code></title>
@@ -41,6 +33,4 @@ function is_it_time_yet(time:Number):void {
 </item>
 </terms>
 
-  
-  
 </page>
index fa40bfc..5411fde 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_object_new</api:name>
     </api:function>
-
   </info>
   <title>Regress.FooObject.new</title>
-  
-<synopsis><code mime="text/x-gjs">
-function new():Regress.FooObject {
+  <synopsis><code mime="text/x-gjs">
+function new(): <link xref="Regress.FooObject">Regress.FooObject</link> {
     // Gjs wrapper for regress_foo_object_new()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function new():Regress.FooObject {
 </item>
 </terms>
 
-  
-  
 </page>
index 0323a1b..7cc20b9 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_object_new_as_super</api:name>
     </api:function>
-
   </info>
   <title>Regress.FooObject.new_as_super</title>
-  
-<synopsis><code mime="text/x-gjs">
-function new_as_super():GObject.Object {
+  <synopsis><code mime="text/x-gjs">
+function new_as_super(): <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link> {
     // Gjs wrapper for regress_foo_object_new_as_super()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function new_as_super():GObject.Object {
 </item>
 </terms>
 
-  
-  
 </page>
index 1cbea89..723e8e8 100644 (file)
@@ -6,27 +6,19 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooObject</title>
-  
   <synopsis><code>
 const Regress = imports.gi.Regress;
 
-let foo_object = new Regress.FooObject({
+let fooObject = new Regress.FooObject({
     <link xref='Regress.FooObject-hidden'>hidden</link>: value,
     <link xref='Regress.FooObject-string'>string</link>: value,
 });
   </code></synopsis>
 
-  
-    
-  
-  
-  
-  
+
   <synopsis>
     <title>Hierarchy</title>
     <tree>
@@ -38,8 +30,11 @@ let foo_object = new Regress.FooObject({
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-gjs"
          groups="method" style="linklist">
@@ -48,7 +43,7 @@ let foo_object = new Regress.FooObject({
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-gjs"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
@@ -59,8 +54,10 @@ let foo_object = new Regress.FooObject({
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
index 78bdb64..f4224db 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_object_read</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>offset</api:name>
       </api:arg>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>length</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.FooObject.prototype.read</title>
-  
-<synopsis><code mime="text/x-gjs">
-function read(offset:Number, length:Number):void {
+  <synopsis><code mime="text/x-gjs">
+function read(offset: Number(gint), length: Number(gint)): void {
     // Gjs wrapper for regress_foo_object_read()
 }
-</code></synopsis>
+  </code></synopsis>
+  <p>Read some stuff.</p>
 
-  
-    <p>Read some stuff.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>offset</code></title>
-<p>offset</p>
+  <p>offset</p>
 </item>
 <item>
 <title><code>length</code></title>
-<p>length</p>
+  <p>length</p>
 </item>
 </terms>
 
-  
-  
 </page>
index c4c1045..fe9c952 100644 (file)
@@ -6,30 +6,22 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_foo_object_static_meth</api:name>
     </api:function>
-
   </info>
-  <title>static_meth</title>
-  
-<synopsis><code mime="text/x-gjs">
-function static_meth():Number {
+  <title>Regress.FooObject.static_meth</title>
+  <synopsis><code mime="text/x-gjs">
+function static_meth(): Number(gint) {
     // Gjs wrapper for regress_foo_object_static_meth()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function static_meth():Number {
 </item>
 </terms>
 
-  
-  
 </page>
index 1f50921..f16c04d 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_object_various</api:name>
       <api:arg>
-        <api:type>gpointer</api:type>
+        <api:type>void</api:type>
         <api:name>data</api:name>
       </api:arg>
       <api:arg>
-        <api:type>GType</api:type>
+        <api:type>GObject.Type</api:type>
         <api:name>some_type</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.FooObject.prototype.various</title>
-  
-<synopsis><code mime="text/x-gjs">
-function various(data:gpointer, some_type:GType):void {
+  <synopsis><code mime="text/x-gjs">
+function various(data: void, some_type: GObject.Type): void {
     // Gjs wrapper for regress_foo_object_various()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>data</code></title>
@@ -49,6 +41,4 @@ function various(data:gpointer, some_type:GType):void {
 </item>
 </terms>
 
-  
-  
 </page>
index 3467ca2..8a60024 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_object_virtual_method</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>first_param</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.FooObject.prototype.virtual_method</title>
-  
-<synopsis><code mime="text/x-gjs">
-function virtual_method(first_param:Number):Boolean {
+  <synopsis><code mime="text/x-gjs">
+function virtual_method(first_param: Number(gint)): Boolean {
     // Gjs wrapper for regress_foo_object_virtual_method()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>first_param</code></title>
@@ -45,6 +37,4 @@ function virtual_method(first_param:Number):Boolean {
 </item>
 </terms>
 
-  
-  
 </page>
index 44a63ab..fecc554 100644 (file)
@@ -6,20 +6,9 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="default" type="guide"/>
   </info>
   <title>Regress.FooObjectCookie</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
index 0916a44..524f761 100644 (file)
@@ -6,24 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooOtherObject</title>
-  
   <synopsis><code>
 const Regress = imports.gi.Regress;
 
-let foo_other_object = new Regress.FooOtherObject();
+let fooOtherObject = new Regress.FooOtherObject();
   </code></synopsis>
 
-  
-    
-  
-  
-  
-  
+
   <synopsis>
     <title>Hierarchy</title>
     <tree>
@@ -35,8 +27,11 @@ let foo_other_object = new Regress.FooOtherObject();
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-gjs"
          groups="method" style="linklist">
@@ -45,7 +40,7 @@ let foo_other_object = new Regress.FooOtherObject();
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-gjs"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
@@ -56,8 +51,10 @@ let foo_other_object = new Regress.FooOtherObject();
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle-height.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle-height.page
new file mode 100644 (file)
index 0000000..bd583c7
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.FooRectangle-height"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooRectangle" group="field" type="guide"/>
+    <title type="link" role="topic">height</title>
+  </info>
+  <title>Regress.FooRectangle.height</title>
+  <synopsis><code mime="text/x-gjs">
+FooRectangle.height: Number(gint) (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle-width.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle-width.page
new file mode 100644 (file)
index 0000000..bc3d3de
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.FooRectangle-width"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooRectangle" group="field" type="guide"/>
+    <title type="link" role="topic">width</title>
+  </info>
+  <title>Regress.FooRectangle.width</title>
+  <synopsis><code mime="text/x-gjs">
+FooRectangle.width: Number(gint) (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle-x.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle-x.page
new file mode 100644 (file)
index 0000000..5e2c251
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.FooRectangle-x"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooRectangle" group="field" type="guide"/>
+    <title type="link" role="topic">x</title>
+  </info>
+  <title>Regress.FooRectangle.x</title>
+  <synopsis><code mime="text/x-gjs">
+FooRectangle.x: Number(gint) (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle-y.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle-y.page
new file mode 100644 (file)
index 0000000..5096547
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.FooRectangle-y"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooRectangle" group="field" type="guide"/>
+    <title type="link" role="topic">y</title>
+  </info>
+  <title>Regress.FooRectangle.y</title>
+  <synopsis><code mime="text/x-gjs">
+FooRectangle.y: Number(gint) (Read / Write)
+  </code></synopsis>
+
+
+</page>
index 276450e..a3978c4 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooRectangle" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>r2</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.FooRectangle.prototype.add</title>
-  
-<synopsis><code mime="text/x-gjs">
-function add(r2:Regress.FooRectangle):void {
+  <synopsis><code mime="text/x-gjs">
+function add(r2: <link xref="Regress.FooRectangle">Regress.FooRectangle</link>): void {
     // Gjs wrapper for regress_foo_rectangle_add()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>r2</code></title>
-<p>source rectangle</p>
+  <p>source rectangle</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 0cfef62..0b6e46d 100644 (file)
@@ -1,25 +1,45 @@
 <?xml version="1.0"?>
 <page id="Regress.FooRectangle"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooRectangle</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let fooRectangle = new Regress.FooRectangle({
+    <link xref='Regress.FooRectangle-x'>x</link>: value
+    <link xref='Regress.FooRectangle-y'>y</link>: value
+    <link xref='Regress.FooRectangle-width'>width</link>: value
+    <link xref='Regress.FooRectangle-height'>height</link>: value
+});
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 8a08c9a..711561c 100644 (file)
@@ -1,24 +1,16 @@
 <?xml version="1.0"?>
 <page id="Regress.FooStackLayer"
-      type="topic"
+      type="guide"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.FooStackLayer</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
 <terms>
 <item>
 <title><code>FooStackLayer.DESKTOP</code></title>
@@ -57,7 +49,9 @@
 
 </item>
 </terms>
-
-  
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStruct-member.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStruct-member.page
new file mode 100644 (file)
index 0000000..5a2946e
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.FooStruct-member"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooStruct" group="field" type="guide"/>
+    <title type="link" role="topic">member</title>
+  </info>
+  <title>Regress.FooStruct.member</title>
+  <synopsis><code mime="text/x-gjs">
+FooStruct.member: Number(gint) (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStruct-priv.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStruct-priv.page
new file mode 100644 (file)
index 0000000..665bf16
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.FooStruct-priv"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooStruct" group="field" type="guide"/>
+    <title type="link" role="topic">priv</title>
+  </info>
+  <title>Regress.FooStruct.priv</title>
+  <synopsis><code mime="text/x-gjs">
+FooStruct.priv: <link xref="Regress.FooStructPrivate">Regress.FooStructPrivate</link> (Read)
+  </code></synopsis>
+
+
+</page>
index 84f5d19..0571517 100644 (file)
@@ -1,25 +1,42 @@
 <?xml version="1.0"?>
 <page id="Regress.FooStruct"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooStruct</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let fooStruct = new Regress.FooStruct({
+    <link xref='Regress.FooStruct-member'>member</link>: value
+});
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 961a22e..7f3f1f8 100644 (file)
@@ -6,30 +6,20 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooSubInterface" group="signal" type="guide"/>
     <title type="link" role="topic">destroy-event</title>
-
   </info>
   <title>Regress.FooSubInterface::destroy-event</title>
-  
-<synopsis><code mime="text/x-python">
-function callback(foo_sub_interface, ):void;
-</code></synopsis>
+  <synopsis><code mime="text/x-gjs">
+connect('destroy-event', function (fooSubInterface, ): void);
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
-<title><code>foo_sub_interface</code></title>
+<title><code>fooSubInterface</code></title>
 <p>instance of <link xref="Regress.FooSubInterface"/> that is emitting the signal</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 5abc585..0433a7f 100644 (file)
@@ -6,26 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="Regress.FooSubInterface" group="vfunc" type="guide"/>
-    
+    <link xref="Regress.FooSubInterface" group="vfunc" type="guide"/>
   </info>
   <title>Regress.FooSubInterface::destroy_event</title>
-  
-<synopsis><code mime="text/x-gjs">
-function vfunc_destroy_event():void {
+  <synopsis><code mime="text/x-gjs">
+function vfunc_destroy_event(): void {
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 </terms>
 
-  
-  
 </page>
index 8164924..90b6bf4 100644 (file)
@@ -6,26 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="Regress.FooSubInterface" group="vfunc" type="guide"/>
-    
+    <link xref="Regress.FooSubInterface" group="vfunc" type="guide"/>
   </info>
   <title>Regress.FooSubInterface::do_bar</title>
-  
-<synopsis><code mime="text/x-gjs">
-function vfunc_do_bar():void {
+  <synopsis><code mime="text/x-gjs">
+function vfunc_do_bar(): void {
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 </terms>
 
-  
-  
 </page>
index 4945c89..5bc8639 100644 (file)
@@ -6,23 +6,15 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="Regress.FooSubInterface" group="vfunc" type="guide"/>
-    
+    <link xref="Regress.FooSubInterface" group="vfunc" type="guide"/>
   </info>
   <title>Regress.FooSubInterface::do_baz</title>
-  
-<synopsis><code mime="text/x-gjs">
-function vfunc_do_baz(callback:GObject.Callback):void {
+  <synopsis><code mime="text/x-gjs">
+function vfunc_do_baz(callback: <link href="../GObject-2.0/GObject.Callback.html">GObject.Callback</link>): void {
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -30,6 +22,4 @@ function vfunc_do_baz(callback:GObject.Callback):void {
 </item>
 </terms>
 
-  
-  
 </page>
index a258a3e..aad9cf4 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooSubInterface" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_sub_interface_do_bar</api:name>
     </api:function>
-
   </info>
   <title>Regress.FooSubInterface.prototype.do_bar</title>
-  
-<synopsis><code mime="text/x-gjs">
-function do_bar():void {
+  <synopsis><code mime="text/x-gjs">
+function do_bar(): void {
     // Gjs wrapper for regress_foo_sub_interface_do_bar()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-<terms>
-</terms>
 
-  
-  
 </page>
index b55a8d7..44cc71b 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooSubInterface" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.FooSubInterface.prototype.do_baz</title>
-  
-<synopsis><code mime="text/x-gjs">
-function do_baz(callback:GObject.Callback):void {
+  <synopsis><code mime="text/x-gjs">
+function do_baz(callback: <link href="../GObject-2.0/GObject.Callback.html">GObject.Callback</link>): void {
     // Gjs wrapper for regress_foo_sub_interface_do_baz()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -41,6 +33,4 @@ function do_baz(callback:GObject.Callback):void {
 </item>
 </terms>
 
-  
-  
 </page>
index 0694e3d..eae9fbd 100644 (file)
@@ -1,39 +1,34 @@
 <?xml version="1.0"?>
 <page id="Regress.FooSubInterface"
       type="guide"
-      style="class"
+      style="interface"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="interface" type="guide"/>
   </info>
   <title>Regress.FooSubInterface</title>
-  
   <synopsis><code>
 const Regress = imports.gi.Regress;
 
 let foo_sub_interface = new Regress.FooSubInterface();
   </code></synopsis>
 
-  
-    
-  
-  
-  
-  
+
   <synopsis>
-    <title>Hierarchy</title>
-    <tree>
-      <item>
-        <code>Regress.FooSubInterface</code>
-      </item>
-    </tree>
+    <title>Prerequisites</title>
+    <p>FooSubInterface requires Regress.FooInterface</p>
+  </synopsis>
+  <synopsis>
+    <title>Known Implementations</title>
+    <p>None</p>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-gjs"
          groups="method" style="linklist">
@@ -42,7 +37,7 @@ let foo_sub_interface = new Regress.FooSubInterface();
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-gjs"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
@@ -53,8 +48,10 @@ let foo_sub_interface = new Regress.FooSubInterface();
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
index 08cb116..0e39571 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooSubobject" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_subobject_new</api:name>
     </api:function>
-
   </info>
   <title>Regress.FooSubobject.new</title>
-  
-<synopsis><code mime="text/x-gjs">
-function new():Regress.FooSubobject {
+  <synopsis><code mime="text/x-gjs">
+function new(): <link xref="Regress.FooSubobject">Regress.FooSubobject</link> {
     // Gjs wrapper for regress_foo_subobject_new()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function new():Regress.FooSubobject {
 </item>
 </terms>
 
-  
-  
 </page>
index f9cac64..3936b17 100644 (file)
@@ -6,24 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooSubobject</title>
-  
   <synopsis><code>
 const Regress = imports.gi.Regress;
 
-let foo_subobject = new Regress.FooSubobject();
+let fooSubobject = new Regress.FooSubobject();
   </code></synopsis>
 
-  
-    
-  
-  
-  
-  
+
   <synopsis>
     <title>Hierarchy</title>
     <tree>
@@ -38,8 +30,11 @@ let foo_subobject = new Regress.FooSubobject();
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-gjs"
          groups="method" style="linklist">
@@ -48,7 +43,7 @@ let foo_subobject = new Regress.FooSubobject();
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-gjs"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
@@ -59,8 +54,10 @@ let foo_subobject = new Regress.FooSubobject();
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray-data.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray-data.page
new file mode 100644 (file)
index 0000000..ba23b2f
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.FooThingWithArray-data"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooThingWithArray" group="field" type="guide"/>
+    <title type="link" role="topic">data</title>
+  </info>
+  <title>Regress.FooThingWithArray.data</title>
+  <synopsis><code mime="text/x-gjs">
+FooThingWithArray.data: Number(guint8) (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray-lines.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray-lines.page
new file mode 100644 (file)
index 0000000..0ff4621
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.FooThingWithArray-lines"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooThingWithArray" group="field" type="guide"/>
+    <title type="link" role="topic">lines</title>
+  </info>
+  <title>Regress.FooThingWithArray.lines</title>
+  <synopsis><code mime="text/x-gjs">
+FooThingWithArray.lines: Array(Number(gchar)) (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray-x.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray-x.page
new file mode 100644 (file)
index 0000000..bae7f5a
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.FooThingWithArray-x"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooThingWithArray" group="field" type="guide"/>
+    <title type="link" role="topic">x</title>
+  </info>
+  <title>Regress.FooThingWithArray.x</title>
+  <synopsis><code mime="text/x-gjs">
+FooThingWithArray.x: Number(gint) (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray-y.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray-y.page
new file mode 100644 (file)
index 0000000..c1812ca
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.FooThingWithArray-y"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooThingWithArray" group="field" type="guide"/>
+    <title type="link" role="topic">y</title>
+  </info>
+  <title>Regress.FooThingWithArray.y</title>
+  <synopsis><code mime="text/x-gjs">
+FooThingWithArray.y: Number(gint) (Read / Write)
+  </code></synopsis>
+
+
+</page>
index 430dce7..2254edc 100644 (file)
@@ -1,25 +1,45 @@
 <?xml version="1.0"?>
 <page id="Regress.FooThingWithArray"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooThingWithArray</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let fooThingWithArray = new Regress.FooThingWithArray({
+    <link xref='Regress.FooThingWithArray-x'>x</link>: value
+    <link xref='Regress.FooThingWithArray-y'>y</link>: value
+    <link xref='Regress.FooThingWithArray-lines'>lines</link>: value
+    <link xref='Regress.FooThingWithArray-data'>data</link>: value
+});
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 9746f17..a824d6f 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.FooUnion"
-      type="topic"
-      style="default"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooUnion</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let fooUnion = new Regress.FooUnion();
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUtilityStruct-bar.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUtilityStruct-bar.page
new file mode 100644 (file)
index 0000000..325c7ec
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.FooUtilityStruct-bar"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooUtilityStruct" group="field" type="guide"/>
+    <title type="link" role="topic">bar</title>
+  </info>
+  <title>Regress.FooUtilityStruct.bar</title>
+  <synopsis><code mime="text/x-gjs">
+FooUtilityStruct.bar: <link href="../Utility-1.0/Utility.Struct.html">Utility.Struct</link> (Read / Write)
+  </code></synopsis>
+
+
+</page>
index 2b94f69..6d6b633 100644 (file)
@@ -1,25 +1,42 @@
 <?xml version="1.0"?>
 <page id="Regress.FooUtilityStruct"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooUtilityStruct</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let fooUtilityStruct = new Regress.FooUtilityStruct({
+    <link xref='Regress.FooUtilityStruct-bar'>bar</link>: value
+});
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index c389ef0..19bee42 100644 (file)
@@ -6,20 +6,9 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="default" type="guide"/>
   </info>
   <title>Regress.FooXEvent</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.GI_SCANNER_ELSE.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.GI_SCANNER_ELSE.page
new file mode 100644 (file)
index 0000000..e9876e0
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.GI_SCANNER_ELSE"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.GI_SCANNER_ELSE</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.GI_SCANNER_IFDEF.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.GI_SCANNER_IFDEF.page
new file mode 100644 (file)
index 0000000..bfef183
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.GI_SCANNER_IFDEF"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.GI_SCANNER_IFDEF</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.GUINT64_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.GUINT64_CONSTANT.page
new file mode 100644 (file)
index 0000000..8c16dd2
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.GUINT64_CONSTANT"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.GUINT64_CONSTANT</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.GUINT64_CONSTANTA.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.GUINT64_CONSTANTA.page
new file mode 100644 (file)
index 0000000..3b0d6f1
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.GUINT64_CONSTANTA"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.GUINT64_CONSTANTA</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.G_GINT64_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.G_GINT64_CONSTANT.page
new file mode 100644 (file)
index 0000000..cdce607
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.G_GINT64_CONSTANT"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.G_GINT64_CONSTANT</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.INT_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.INT_CONSTANT.page
new file mode 100644 (file)
index 0000000..e0512ab
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.INT_CONSTANT"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.INT_CONSTANT</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.LONG_STRING_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LONG_STRING_CONSTANT.page
new file mode 100644 (file)
index 0000000..85fe96e
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.LONG_STRING_CONSTANT"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.LONG_STRING_CONSTANT</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema-attributes.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema-attributes.page
new file mode 100644 (file)
index 0000000..1a9e2de
--- /dev/null
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<page id="Regress.LikeGnomeKeyringPasswordSchema-attributes"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.LikeGnomeKeyringPasswordSchema"
+      group="field"
+      type="guide"/>
+    <title type="link" role="topic">attributes</title>
+  </info>
+  <title>Regress.LikeGnomeKeyringPasswordSchema.attributes</title>
+  <synopsis><code mime="text/x-gjs">
+LikeGnomeKeyringPasswordSchema.attributes: Array(void) (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy.page
new file mode 100644 (file)
index 0000000..bcca817
--- /dev/null
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<page id="Regress.LikeGnomeKeyringPasswordSchema-dummy"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.LikeGnomeKeyringPasswordSchema"
+      group="field"
+      type="guide"/>
+    <title type="link" role="topic">dummy</title>
+  </info>
+  <title>Regress.LikeGnomeKeyringPasswordSchema.dummy</title>
+  <synopsis><code mime="text/x-gjs">
+LikeGnomeKeyringPasswordSchema.dummy: Number(gint) (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy2.page
new file mode 100644 (file)
index 0000000..4d64ad8
--- /dev/null
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<page id="Regress.LikeGnomeKeyringPasswordSchema-dummy2"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.LikeGnomeKeyringPasswordSchema"
+      group="field"
+      type="guide"/>
+    <title type="link" role="topic">dummy2</title>
+  </info>
+  <title>Regress.LikeGnomeKeyringPasswordSchema.dummy2</title>
+  <synopsis><code mime="text/x-gjs">
+LikeGnomeKeyringPasswordSchema.dummy2: Number(gdouble) (Read / Write)
+  </code></synopsis>
+
+
+</page>
index 44a946e..fc44fcc 100644 (file)
@@ -1,25 +1,44 @@
 <?xml version="1.0"?>
 <page id="Regress.LikeGnomeKeyringPasswordSchema"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.LikeGnomeKeyringPasswordSchema</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let likeGnomeKeyringPasswordSchema = new Regress.LikeGnomeKeyringPasswordSchema({
+    <link xref='Regress.LikeGnomeKeyringPasswordSchema-dummy'>dummy</link>: value
+    <link xref='Regress.LikeGnomeKeyringPasswordSchema-attributes'>attributes</link>: value
+    <link xref='Regress.LikeGnomeKeyringPasswordSchema-dummy2'>dummy2</link>: value
+});
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeXklConfigItem-name.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeXklConfigItem-name.page
new file mode 100644 (file)
index 0000000..bf777c8
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.LikeXklConfigItem-name"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.LikeXklConfigItem" group="field" type="guide"/>
+    <title type="link" role="topic">name</title>
+  </info>
+  <title>Regress.LikeXklConfigItem.name</title>
+  <synopsis><code mime="text/x-gjs">
+LikeXklConfigItem.name: Array(Number(gchar)) (Read / Write)
+  </code></synopsis>
+
+
+</page>
index fb4831f..5399d10 100644 (file)
@@ -1,25 +1,42 @@
 <?xml version="1.0"?>
 <page id="Regress.LikeXklConfigItem"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.LikeXklConfigItem</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let likeXklConfigItem = new Regress.LikeXklConfigItem({
+    <link xref='Regress.LikeXklConfigItem-name'>name</link>: value
+});
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index f81bc5d..2e0b9e8 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.LikeXklConfigItem" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>name</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.LikeXklConfigItem.prototype.set_name</title>
-  
-<synopsis><code mime="text/x-gjs">
-function set_name(name:String):void {
+  <synopsis><code mime="text/x-gjs">
+function set_name(name: String): void {
     // Gjs wrapper for regress_like_xkl_config_item_set_name()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>name</code></title>
@@ -41,6 +33,4 @@ function set_name(name:String):void {
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.MAXUINT64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.MAXUINT64.page
new file mode 100644 (file)
index 0000000..91d7ce5
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.MAXUINT64"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.MAXUINT64</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.MININT64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.MININT64.page
new file mode 100644 (file)
index 0000000..1531540
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.MININT64"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.MININT64</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.Mixed_Case_Constant.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.Mixed_Case_Constant.page
new file mode 100644 (file)
index 0000000..29e7314
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.Mixed_Case_Constant"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.Mixed_Case_Constant</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.NEGATIVE_INT_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.NEGATIVE_INT_CONSTANT.page
new file mode 100644 (file)
index 0000000..a0aad76
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.NEGATIVE_INT_CONSTANT"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.NEGATIVE_INT_CONSTANT</title>
+
+
+</page>
index f66aee4..1acd4d2 100644 (file)
@@ -6,20 +6,9 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="default" type="guide"/>
   </info>
   <title>Regress.PtrArrayAlias</title>
-  
-  
-  
-    <p>Typedef'd GPtrArray for some reason</p>
-  
-  
-  
-  
-  
-  
-  
+  <p>Typedef'd GPtrArray for some reason</p>
+
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.STRING_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.STRING_CONSTANT.page
new file mode 100644 (file)
index 0000000..be1d6e1
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.STRING_CONSTANT"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.STRING_CONSTANT</title>
+
+
+</page>
index f31b58e..18c41d8 100644 (file)
@@ -1,24 +1,16 @@
 <?xml version="1.0"?>
 <page id="Regress.TestABCError"
-      type="topic"
+      type="guide"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.TestABCError</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
 <terms>
 <item>
 <title><code>TestABCError.CODE1</code></title>
@@ -33,7 +25,9 @@
 
 </item>
 </terms>
-
-  
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
index 72f9adc..1701f5a 100644 (file)
@@ -6,30 +6,22 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.TestABCError" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>GLib.Quark</api:type>
       </api:returns>
       <api:name>regress_test_abc_error_quark</api:name>
     </api:function>
-
   </info>
-  <title>quark</title>
-  
-<synopsis><code mime="text/x-gjs">
-function quark():GLib.Quark {
+  <title>Regress.TestABCError.quark</title>
+  <synopsis><code mime="text/x-gjs">
+function quark(): <link href="../GLib-2.0/GLib.Quark.html">GLib.Quark</link> {
     // Gjs wrapper for regress_test_abc_error_quark()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function quark():GLib.Quark {
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed-nested_a.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed-nested_a.page
new file mode 100644 (file)
index 0000000..856aa6f
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestBoxed-nested_a"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestBoxed" group="field" type="guide"/>
+    <title type="link" role="topic">nested_a</title>
+  </info>
+  <title>Regress.TestBoxed.nested_a</title>
+  <synopsis><code mime="text/x-gjs">
+TestBoxed.nested_a: <link xref="Regress.TestSimpleBoxedA">Regress.TestSimpleBoxedA</link> (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed-priv.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed-priv.page
new file mode 100644 (file)
index 0000000..54bf659
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestBoxed-priv"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestBoxed" group="field" type="guide"/>
+    <title type="link" role="topic">priv</title>
+  </info>
+  <title>Regress.TestBoxed.priv</title>
+  <synopsis><code mime="text/x-gjs">
+TestBoxed.priv: <link xref="Regress.TestBoxedPrivate">Regress.TestBoxedPrivate</link> (Read)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed-some_int8.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed-some_int8.page
new file mode 100644 (file)
index 0000000..226cf95
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestBoxed-some_int8"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestBoxed" group="field" type="guide"/>
+    <title type="link" role="topic">some_int8</title>
+  </info>
+  <title>Regress.TestBoxed.some_int8</title>
+  <synopsis><code mime="text/x-gjs">
+TestBoxed.some_int8: Number(gint8) (Read / Write)
+  </code></synopsis>
+
+
+</page>
index 751ce88..0aee5d0 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestBoxed" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_boxed_copy</api:name>
     </api:function>
-
   </info>
   <title>Regress.TestBoxed.prototype.copy</title>
-  
-<synopsis><code mime="text/x-gjs">
-function copy():Regress.TestBoxed {
+  <synopsis><code mime="text/x-gjs">
+function copy(): <link xref="Regress.TestBoxed">Regress.TestBoxed</link> {
     // Gjs wrapper for regress_test_boxed_copy()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function copy():Regress.TestBoxed {
 </item>
 </terms>
 
-  
-  
 </page>
index 5c23da2..257a9f5 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestBoxed" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>other</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestBoxed.prototype.equals</title>
-  
-<synopsis><code mime="text/x-gjs">
-function equals(other:Regress.TestBoxed):Boolean {
+  <synopsis><code mime="text/x-gjs">
+function equals(other: <link xref="Regress.TestBoxed">Regress.TestBoxed</link>): Boolean {
     // Gjs wrapper for regress_test_boxed_equals()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>other</code></title>
@@ -45,6 +37,4 @@ function equals(other:Regress.TestBoxed):Boolean {
 </item>
 </terms>
 
-  
-  
 </page>
index 88e33de..d93d80d 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestBoxed" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_boxed_new</api:name>
     </api:function>
-
   </info>
   <title>Regress.TestBoxed.new</title>
-  
-<synopsis><code mime="text/x-gjs">
-function new():Regress.TestBoxed {
+  <synopsis><code mime="text/x-gjs">
+function new(): <link xref="Regress.TestBoxed">Regress.TestBoxed</link> {
     // Gjs wrapper for regress_test_boxed_new()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function new():Regress.TestBoxed {
 </item>
 </terms>
 
-  
-  
 </page>
index 801bad2..baf1bd7 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestBoxed" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_boxed_new_alternative_constructor1</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>i</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestBoxed.new_alternative_constructor1</title>
-  
-<synopsis><code mime="text/x-gjs">
-function new_alternative_constructor1(i:Number):Regress.TestBoxed {
+  <synopsis><code mime="text/x-gjs">
+function new_alternative_constructor1(i: Number(gint)): <link xref="Regress.TestBoxed">Regress.TestBoxed</link> {
     // Gjs wrapper for regress_test_boxed_new_alternative_constructor1()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>i</code></title>
@@ -45,6 +37,4 @@ function new_alternative_constructor1(i:Number):Regress.TestBoxed {
 </item>
 </terms>
 
-  
-  
 </page>
index 23fa672..eeb5c3c 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestBoxed" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_boxed_new_alternative_constructor2</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>i</api:name>
       </api:arg>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>j</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestBoxed.new_alternative_constructor2</title>
-  
-<synopsis><code mime="text/x-gjs">
-function new_alternative_constructor2(i:Number, j:Number):Regress.TestBoxed {
+  <synopsis><code mime="text/x-gjs">
+function new_alternative_constructor2(i: Number(gint), j: Number(gint)): <link xref="Regress.TestBoxed">Regress.TestBoxed</link> {
     // Gjs wrapper for regress_test_boxed_new_alternative_constructor2()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>i</code></title>
@@ -53,6 +45,4 @@ function new_alternative_constructor2(i:Number, j:Number):Regress.TestBoxed {
 </item>
 </terms>
 
-  
-  
 </page>
index 8f0c2d2..55b17a5 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestBoxed" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>s</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestBoxed.new_alternative_constructor3</title>
-  
-<synopsis><code mime="text/x-gjs">
-function new_alternative_constructor3(s:String):Regress.TestBoxed {
+  <synopsis><code mime="text/x-gjs">
+function new_alternative_constructor3(s: String): <link xref="Regress.TestBoxed">Regress.TestBoxed</link> {
     // Gjs wrapper for regress_test_boxed_new_alternative_constructor3()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>s</code></title>
@@ -45,6 +37,4 @@ function new_alternative_constructor3(s:String):Regress.TestBoxed {
 </item>
 </terms>
 
-  
-  
 </page>
index baa423f..d3e41a6 100644 (file)
@@ -1,25 +1,43 @@
 <?xml version="1.0"?>
 <page id="Regress.TestBoxed"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestBoxed</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let testBoxed = new Regress.TestBoxed({
+    <link xref='Regress.TestBoxed-some_int8'>some_int8</link>: value
+    <link xref='Regress.TestBoxed-nested_a'>nested_a</link>: value
+});
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB-some_int8.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB-some_int8.page
new file mode 100644 (file)
index 0000000..ff167f0
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestBoxedB-some_int8"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestBoxedB" group="field" type="guide"/>
+    <title type="link" role="topic">some_int8</title>
+  </info>
+  <title>Regress.TestBoxedB.some_int8</title>
+  <synopsis><code mime="text/x-gjs">
+TestBoxedB.some_int8: Number(gint8) (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB-some_long.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB-some_long.page
new file mode 100644 (file)
index 0000000..8d48a34
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestBoxedB-some_long"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestBoxedB" group="field" type="guide"/>
+    <title type="link" role="topic">some_long</title>
+  </info>
+  <title>Regress.TestBoxedB.some_long</title>
+  <synopsis><code mime="text/x-gjs">
+TestBoxedB.some_long: Number(glong) (Read / Write)
+  </code></synopsis>
+
+
+</page>
index 06bccc8..ecf95e3 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestBoxedB" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_boxed_b_copy</api:name>
     </api:function>
-
   </info>
   <title>Regress.TestBoxedB.prototype.copy</title>
-  
-<synopsis><code mime="text/x-gjs">
-function copy():Regress.TestBoxedB {
+  <synopsis><code mime="text/x-gjs">
+function copy(): <link xref="Regress.TestBoxedB">Regress.TestBoxedB</link> {
     // Gjs wrapper for regress_test_boxed_b_copy()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function copy():Regress.TestBoxedB {
 </item>
 </terms>
 
-  
-  
 </page>
index e71147a..3295300 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestBoxedB" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_boxed_b_new</api:name>
       <api:arg>
-        <api:type>gint8</api:type>
+        <api:type>Number(gint8)</api:type>
         <api:name>some_int8</api:name>
       </api:arg>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(glong)</api:type>
         <api:name>some_long</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestBoxedB.new</title>
-  
-<synopsis><code mime="text/x-gjs">
-function new(some_int8:gint8, some_long:Number):Regress.TestBoxedB {
+  <synopsis><code mime="text/x-gjs">
+function new(some_int8: Number(gint8), some_long: Number(glong)): <link xref="Regress.TestBoxedB">Regress.TestBoxedB</link> {
     // Gjs wrapper for regress_test_boxed_b_new()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>some_int8</code></title>
@@ -53,6 +45,4 @@ function new(some_int8:gint8, some_long:Number):Regress.TestBoxedB {
 </item>
 </terms>
 
-  
-  
 </page>
index 0e39780..a8a1240 100644 (file)
@@ -1,25 +1,43 @@
 <?xml version="1.0"?>
 <page id="Regress.TestBoxedB"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestBoxedB</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let testBoxedB = new Regress.TestBoxedB({
+    <link xref='Regress.TestBoxedB-some_int8'>some_int8</link>: value
+    <link xref='Regress.TestBoxedB-some_long'>some_long</link>: value
+});
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC-another_thing.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC-another_thing.page
new file mode 100644 (file)
index 0000000..1fdb39b
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestBoxedC-another_thing"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestBoxedC" group="field" type="guide"/>
+    <title type="link" role="topic">another_thing</title>
+  </info>
+  <title>Regress.TestBoxedC.another_thing</title>
+  <synopsis><code mime="text/x-gjs">
+TestBoxedC.another_thing: Number(guint) (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC-refcount.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC-refcount.page
new file mode 100644 (file)
index 0000000..b78ee29
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestBoxedC-refcount"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestBoxedC" group="field" type="guide"/>
+    <title type="link" role="topic">refcount</title>
+  </info>
+  <title>Regress.TestBoxedC.refcount</title>
+  <synopsis><code mime="text/x-gjs">
+TestBoxedC.refcount: Number(guint) (Read / Write)
+  </code></synopsis>
+
+
+</page>
index 542c93e..62b63cd 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestBoxedC" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_boxed_c_new</api:name>
     </api:function>
-
   </info>
   <title>Regress.TestBoxedC.new</title>
-  
-<synopsis><code mime="text/x-gjs">
-function new():Regress.TestBoxedC {
+  <synopsis><code mime="text/x-gjs">
+function new(): <link xref="Regress.TestBoxedC">Regress.TestBoxedC</link> {
     // Gjs wrapper for regress_test_boxed_c_new()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function new():Regress.TestBoxedC {
 </item>
 </terms>
 
-  
-  
 </page>
index 18b77d9..82d4fcd 100644 (file)
@@ -1,25 +1,43 @@
 <?xml version="1.0"?>
 <page id="Regress.TestBoxedC"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestBoxedC</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let testBoxedC = new Regress.TestBoxedC({
+    <link xref='Regress.TestBoxedC-refcount'>refcount</link>: value
+    <link xref='Regress.TestBoxedC-another_thing'>another_thing</link>: value
+});
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 7b51fd5..519d154 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestBoxedD" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_boxed_d_copy</api:name>
     </api:function>
-
   </info>
   <title>Regress.TestBoxedD.prototype.copy</title>
-  
-<synopsis><code mime="text/x-gjs">
-function copy():Regress.TestBoxedD {
+  <synopsis><code mime="text/x-gjs">
+function copy(): <link xref="Regress.TestBoxedD">Regress.TestBoxedD</link> {
     // Gjs wrapper for regress_test_boxed_d_copy()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function copy():Regress.TestBoxedD {
 </item>
 </terms>
 
-  
-  
 </page>
index 82df904..fd4fb6f 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestBoxedD" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_boxed_d_free</api:name>
     </api:function>
-
   </info>
   <title>Regress.TestBoxedD.prototype.free</title>
-  
-<synopsis><code mime="text/x-gjs">
-function free():void {
+  <synopsis><code mime="text/x-gjs">
+function free(): void {
     // Gjs wrapper for regress_test_boxed_d_free()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-<terms>
-</terms>
 
-  
-  
 </page>
index 0f7923e..37d6d01 100644 (file)
@@ -6,30 +6,22 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestBoxedD" group="method" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_test_boxed_d_get_magic</api:name>
     </api:function>
-
   </info>
   <title>Regress.TestBoxedD.prototype.get_magic</title>
-  
-<synopsis><code mime="text/x-gjs">
-function get_magic():Number {
+  <synopsis><code mime="text/x-gjs">
+function get_magic(): Number(gint) {
     // Gjs wrapper for regress_test_boxed_d_get_magic()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function get_magic():Number {
 </item>
 </terms>
 
-  
-  
 </page>
index cfd50c5..eecc4d2 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestBoxedD" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>a_string</api:name>
       </api:arg>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>a_int</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestBoxedD.new</title>
-  
-<synopsis><code mime="text/x-gjs">
-function new(a_string:String, a_int:Number):Regress.TestBoxedD {
+  <synopsis><code mime="text/x-gjs">
+function new(a_string: String, a_int: Number(gint)): <link xref="Regress.TestBoxedD">Regress.TestBoxedD</link> {
     // Gjs wrapper for regress_test_boxed_d_new()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>a_string</code></title>
@@ -53,6 +45,4 @@ function new(a_string:String, a_int:Number):Regress.TestBoxedD {
 </item>
 </terms>
 
-  
-  
 </page>
index 995e80d..60b0362 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.TestBoxedD"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestBoxedD</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let testBoxedD = new Regress.TestBoxedD(a_string: String, a_int: Number(gint));
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index bed84d5..13e80ca 100644 (file)
@@ -1,25 +1,25 @@
 <?xml version="1.0"?>
 <page id="Regress.TestCallback"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="callback" type="guide"/>
   </info>
   <title>Regress.TestCallback</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-gjs">
+function onTestCallback(): Number(gint) {
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index 7d3f7b8..56e48b1 100644 (file)
@@ -1,25 +1,33 @@
 <?xml version="1.0"?>
 <page id="Regress.TestCallbackArray"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="callback" type="guide"/>
   </info>
   <title>Regress.TestCallbackArray</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-gjs">
+function onTestCallbackArray(one: Array(Number(gint)), two: Array(String)): Number(gint) {
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>one</code></title>
+
+</item>
+<item>
+<title><code>two</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index 0b8fca1..edd33f3 100644 (file)
@@ -1,25 +1,37 @@
 <?xml version="1.0"?>
 <page id="Regress.TestCallbackFull"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="callback" type="guide"/>
   </info>
   <title>Regress.TestCallbackFull</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-gjs">
+function onTestCallbackFull(foo: Number(gint), bar: Number(gdouble), path: String): Number(gint) {
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>foo</code></title>
+  <p>the investment rate</p>
+</item>
+<item>
+<title><code>bar</code></title>
+  <p>how much money</p>
+</item>
+<item>
+<title><code>path</code></title>
+  <p>Path to file</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index 804382f..a5a59cc 100644 (file)
@@ -1,25 +1,25 @@
 <?xml version="1.0"?>
 <page id="Regress.TestCallbackGError"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="callback" type="guide"/>
   </info>
   <title>Regress.TestCallbackGError</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-gjs">
+function onTestCallbackGError(error: <link href="../GLib-2.0/GLib.Error.html">GLib.Error</link>): void {
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>error</code></title>
+
+</item>
+</terms>
+
 </page>
index 06ebb70..8f93a2a 100644 (file)
@@ -1,25 +1,25 @@
 <?xml version="1.0"?>
 <page id="Regress.TestCallbackHashtable"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="callback" type="guide"/>
   </info>
   <title>Regress.TestCallbackHashtable</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-gjs">
+function onTestCallbackHashtable(data: {String: Number(gint)}): void {
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>data</code></title>
+  <p>a hash table; will be modified</p>
+</item>
+</terms>
+
 </page>
index 28b21ea..0df5092 100644 (file)
@@ -1,25 +1,25 @@
 <?xml version="1.0"?>
 <page id="Regress.TestCallbackOwnedGError"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="callback" type="guide"/>
   </info>
   <title>Regress.TestCallbackOwnedGError</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-gjs">
+function onTestCallbackOwnedGError(error: <link href="../GLib-2.0/GLib.Error.html">GLib.Error</link>): void {
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>error</code></title>
+  <p>GError instance; must be freed by the callback</p>
+</item>
+</terms>
+
 </page>
index 286c830..469aa40 100644 (file)
@@ -1,25 +1,25 @@
 <?xml version="1.0"?>
 <page id="Regress.TestCallbackUserData"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="callback" type="guide"/>
   </info>
   <title>Regress.TestCallbackUserData</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-gjs">
+function onTestCallbackUserData(): Number(gint) {
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index 589059d..1451c6d 100644 (file)
@@ -1,24 +1,16 @@
 <?xml version="1.0"?>
 <page id="Regress.TestDEFError"
-      type="topic"
+      type="guide"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.TestDEFError</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
 <terms>
 <item>
 <title><code>TestDEFError.CODE0</code></title>
@@ -33,7 +25,9 @@
 
 </item>
 </terms>
-
-  
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
index 814b474..d7ac407 100644 (file)
@@ -1,32 +1,24 @@
 <?xml version="1.0"?>
 <page id="Regress.TestEnum"
-      type="topic"
+      type="guide"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.TestEnum</title>
-  
-  
-  
-    <p>By purpose, not all members have documentation</p>
-  
-  
-  
-  
+  <p>By purpose, not all members have documentation</p>
+
 <terms>
 <item>
 <title><code>TestEnum.VALUE1</code></title>
-<p>value 1</p>
+  <p>value 1</p>
 </item>
 <item>
 <title><code>TestEnum.VALUE2</code></title>
-<p>value 2</p>
+  <p>value 2</p>
 </item>
 <item>
 <title><code>TestEnum.VALUE3</code></title>
@@ -37,7 +29,9 @@
 
 </item>
 </terms>
-
-  
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
index b4dfb29..34e512d 100644 (file)
@@ -6,8 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.TestEnum" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>String</api:type>
         <api:name>e</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>param</title>
-  
-<synopsis><code mime="text/x-gjs">
-function param(e:Regress.TestEnum):String {
+  <title>Regress.TestEnum.param</title>
+  <synopsis><code mime="text/x-gjs">
+function param(e: <link xref="Regress.TestEnum">Regress.TestEnum</link>): String {
     // Gjs wrapper for regress_test_enum_param()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>e</code></title>
@@ -45,6 +37,4 @@ function param(e:Regress.TestEnum):String {
 </item>
 </terms>
 
-  
-  
 </page>
index 5c0c559..ff5505c 100644 (file)
@@ -1,24 +1,16 @@
 <?xml version="1.0"?>
 <page id="Regress.TestEnumNoGEnum"
-      type="topic"
+      type="guide"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.TestEnumNoGEnum</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
 <terms>
 <item>
 <title><code>TestEnumNoGEnum.EVALUE1</code></title>
@@ -33,7 +25,9 @@
 
 </item>
 </terms>
-
-  
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
index df3cfa1..75da794 100644 (file)
@@ -1,24 +1,16 @@
 <?xml version="1.0"?>
 <page id="Regress.TestEnumUnsigned"
-      type="topic"
+      type="guide"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.TestEnumUnsigned</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
 <terms>
 <item>
 <title><code>TestEnumUnsigned.VALUE1</code></title>
@@ -29,7 +21,9 @@
 
 </item>
 </terms>
-
-  
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
index d6a6ebb..0e6c781 100644 (file)
@@ -1,24 +1,16 @@
 <?xml version="1.0"?>
 <page id="Regress.TestError"
-      type="topic"
+      type="guide"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.TestError</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
 <terms>
 <item>
 <title><code>TestError.CODE1</code></title>
@@ -33,7 +25,9 @@
 
 </item>
 </terms>
-
-  
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
index f849bfe..d143125 100644 (file)
@@ -6,30 +6,22 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.TestError" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>GLib.Quark</api:type>
       </api:returns>
       <api:name>regress_test_error_quark</api:name>
     </api:function>
-
   </info>
-  <title>quark</title>
-  
-<synopsis><code mime="text/x-gjs">
-function quark():GLib.Quark {
+  <title>Regress.TestError.quark</title>
+  <synopsis><code mime="text/x-gjs">
+function quark(): <link href="../GLib-2.0/GLib.Quark.html">GLib.Quark</link> {
     // Gjs wrapper for regress_test_error_quark()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function quark():GLib.Quark {
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestExternallyDefinedCallback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestExternallyDefinedCallback.page
new file mode 100644 (file)
index 0000000..f9d241c
--- /dev/null
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<page id="Regress.TestExternallyDefinedCallback"
+      type="topic"
+      style="callback"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="callback" type="guide"/>
+  </info>
+  <title>Regress.TestExternallyDefinedCallback</title>
+  <synopsis><code mime="text/x-gjs">
+function onTestExternallyDefinedCallback(obj: <link xref="Regress.TestObj">Regress.TestObj</link>, someint: Number(gint)): void {
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+<item>
+<title><code>someint</code></title>
+
+</item>
+</terms>
+
+</page>
index d5bfeeb..f962b6a 100644 (file)
@@ -1,25 +1,33 @@
 <?xml version="1.0"?>
 <page id="Regress.TestFlags"
-      type="topic"
-      style="default"
+      type="guide"
+      style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.TestFlags</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+<terms>
+<item>
+<title><code>TestFlags.FLAG1</code></title>
+
+</item>
+<item>
+<title><code>TestFlags.FLAG2</code></title>
+
+</item>
+<item>
+<title><code>TestFlags.FLAG3</code></title>
+
+</item>
+</terms>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
index 94c80cf..e12720e 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestFloating" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_floating_new</api:name>
     </api:function>
-
   </info>
   <title>Regress.TestFloating.new</title>
-  
-<synopsis><code mime="text/x-gjs">
-function new():Regress.TestFloating {
+  <synopsis><code mime="text/x-gjs">
+function new(): <link xref="Regress.TestFloating">Regress.TestFloating</link> {
     // Gjs wrapper for regress_test_floating_new()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>A new floating <link xref="Regress.TestFloating"/></p>
+  <p>A new floating <link xref="Regress.TestFloating"/></p>
 </item>
 </terms>
 
-  
-  
 </page>
index 07ef3f2..d9918cc 100644 (file)
@@ -6,24 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestFloating</title>
-  
   <synopsis><code>
 const Regress = imports.gi.Regress;
 
-let test_floating = new Regress.TestFloating();
+let testFloating = new Regress.TestFloating();
   </code></synopsis>
 
-  
-    
-  
-  
-  
-  
+
   <synopsis>
     <title>Hierarchy</title>
     <tree>
@@ -38,8 +30,11 @@ let test_floating = new Regress.TestFloating();
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-gjs"
          groups="method" style="linklist">
@@ -48,7 +43,7 @@ let test_floating = new Regress.TestFloating();
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-gjs"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
@@ -59,8 +54,10 @@ let test_floating = new Regress.TestFloating();
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject-copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject-copy.page
new file mode 100644 (file)
index 0000000..53d28b7
--- /dev/null
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<page id="Regress.TestFundamentalObject-copy"
+      type="topic"
+      style="vfunc"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestFundamentalObject" group="vfunc" type="guide"/>
+  </info>
+  <title>Regress.TestFundamentalObject::copy</title>
+  <synopsis><code mime="text/x-gjs">
+function vfunc_copy(): <link xref="Regress.TestFundamentalObject">Regress.TestFundamentalObject</link> {
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject-finalize.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject-finalize.page
new file mode 100644 (file)
index 0000000..efe549b
--- /dev/null
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<page id="Regress.TestFundamentalObject-finalize"
+      type="topic"
+      style="vfunc"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestFundamentalObject" group="vfunc" type="guide"/>
+  </info>
+  <title>Regress.TestFundamentalObject::finalize</title>
+  <synopsis><code mime="text/x-gjs">
+function vfunc_finalize(): void {
+}
+  </code></synopsis>
+
+
+<terms>
+</terms>
+
+</page>
index a8cb35a..8534fc4 100644 (file)
@@ -6,24 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestFundamentalObject</title>
-  
   <synopsis><code>
 const Regress = imports.gi.Regress;
 
-let test_fundamental_object = new Regress.TestFundamentalObject();
+let testFundamentalObject = new Regress.TestFundamentalObject();
   </code></synopsis>
 
-  
-    
-  
-  
-  
-  
+
   <synopsis>
     <title>Hierarchy</title>
     <tree>
@@ -32,8 +24,11 @@ let test_fundamental_object = new Regress.TestFundamentalObject();
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-gjs"
          groups="method" style="linklist">
@@ -42,7 +37,7 @@ let test_fundamental_object = new Regress.TestFundamentalObject();
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-gjs"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
@@ -53,8 +48,10 @@ let test_fundamental_object = new Regress.TestFundamentalObject();
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
index b1c37ef..4dd081a 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestFundamentalObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_fundamental_object_ref</api:name>
     </api:function>
-
   </info>
   <title>Regress.TestFundamentalObject.prototype.ref</title>
-  
-<synopsis><code mime="text/x-gjs">
-function ref():Regress.TestFundamentalObject {
+  <synopsis><code mime="text/x-gjs">
+function ref(): <link xref="Regress.TestFundamentalObject">Regress.TestFundamentalObject</link> {
     // Gjs wrapper for regress_test_fundamental_object_ref()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>A new <link xref="Regress.TestFundamentalObject"/></p>
+  <p>A new <link xref="Regress.TestFundamentalObject"/></p>
 </item>
 </terms>
 
-  
-  
 </page>
index 758a30d..ba365e5 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestFundamentalObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_fundamental_object_unref</api:name>
     </api:function>
-
   </info>
   <title>Regress.TestFundamentalObject.prototype.unref</title>
-  
-<synopsis><code mime="text/x-gjs">
-function unref():void {
+  <synopsis><code mime="text/x-gjs">
+function unref(): void {
     // Gjs wrapper for regress_test_fundamental_object_unref()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-<terms>
-</terms>
 
-  
-  
 </page>
index 73a3328..c853dbb 100644 (file)
@@ -1,25 +1,29 @@
 <?xml version="1.0"?>
 <page id="Regress.TestFundamentalObjectCopyFunction"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="callback" type="guide"/>
   </info>
   <title>Regress.TestFundamentalObjectCopyFunction</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-gjs">
+function onTestFundamentalObjectCopyFunction(obj: <link xref="Regress.TestFundamentalObject">Regress.TestFundamentalObject</link>): <link xref="Regress.TestFundamentalObject">Regress.TestFundamentalObject</link> {
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index df0e8fb..dc9edd7 100644 (file)
@@ -1,25 +1,25 @@
 <?xml version="1.0"?>
 <page id="Regress.TestFundamentalObjectFinalizeFunction"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="callback" type="guide"/>
   </info>
   <title>Regress.TestFundamentalObjectFinalizeFunction</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-gjs">
+function onTestFundamentalObjectFinalizeFunction(obj: <link xref="Regress.TestFundamentalObject">Regress.TestFundamentalObject</link>): void {
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+</terms>
+
 </page>
index c6a31f9..8a43ee2 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestFundamentalSubObject"
       group="constructor"
       type="guide"/>
         <api:name>data</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestFundamentalSubObject.new</title>
-  
-<synopsis><code mime="text/x-gjs">
-function new(data:String):Regress.TestFundamentalSubObject {
+  <synopsis><code mime="text/x-gjs">
+function new(data: String): <link xref="Regress.TestFundamentalSubObject">Regress.TestFundamentalSubObject</link> {
     // Gjs wrapper for regress_test_fundamental_sub_object_new()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>data</code></title>
@@ -47,6 +39,4 @@ function new(data:String):Regress.TestFundamentalSubObject {
 </item>
 </terms>
 
-  
-  
 </page>
index 619eb30..8de3d7c 100644 (file)
@@ -6,24 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestFundamentalSubObject</title>
-  
   <synopsis><code>
 const Regress = imports.gi.Regress;
 
-let test_fundamental_sub_object = new Regress.TestFundamentalSubObject();
+let testFundamentalSubObject = new Regress.TestFundamentalSubObject();
   </code></synopsis>
 
-  
-    
-  
-  
-  
-  
+
   <synopsis>
     <title>Hierarchy</title>
     <tree>
@@ -35,8 +27,11 @@ let test_fundamental_sub_object = new Regress.TestFundamentalSubObject();
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-gjs"
          groups="method" style="linklist">
@@ -45,7 +40,7 @@ let test_fundamental_sub_object = new Regress.TestFundamentalSubObject();
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-gjs"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
@@ -56,8 +51,10 @@ let test_fundamental_sub_object = new Regress.TestFundamentalSubObject();
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
index 176211b..86af902 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestInheritDrawable" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_inherit_drawable_do_foo</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>x</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestInheritDrawable.prototype.do_foo</title>
-  
-<synopsis><code mime="text/x-gjs">
-function do_foo(x:Number):void {
+  <synopsis><code mime="text/x-gjs">
+function do_foo(x: Number(gint)): void {
     // Gjs wrapper for regress_test_inherit_drawable_do_foo()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>x</code></title>
@@ -41,6 +33,4 @@ function do_foo(x:Number):void {
 </item>
 </terms>
 
-  
-  
 </page>
index 038b73f..7dfeba5 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestInheritDrawable" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_inherit_drawable_do_foo_maybe_throw</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>x</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestInheritDrawable.prototype.do_foo_maybe_throw</title>
-  
-<synopsis><code mime="text/x-gjs">
-function do_foo_maybe_throw(x:Number):void {
+  <synopsis><code mime="text/x-gjs">
+function do_foo_maybe_throw(x: Number(gint)): void {
     // Gjs wrapper for regress_test_inherit_drawable_do_foo_maybe_throw()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>x</code></title>
@@ -41,6 +33,4 @@ function do_foo_maybe_throw(x:Number):void {
 </item>
 </terms>
 
-  
-  
 </page>
index 9dd2cba..9a11c9e 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestInheritDrawable" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_inherit_drawable_get_origin</api:name>
     </api:function>
-
   </info>
   <title>Regress.TestInheritDrawable.prototype.get_origin</title>
-  
-<synopsis><code mime="text/x-gjs">
-function get_origin():void {
+  <synopsis><code mime="text/x-gjs">
+function get_origin(): [x: Number(gint), y: Number(gint)] {
     // Gjs wrapper for regress_test_inherit_drawable_get_origin()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>y</code></title>
+
+</item>
 </terms>
 
-  
-  
 </page>
index 669ab1c..c4b6f95 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestInheritDrawable" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_inherit_drawable_get_size</api:name>
     </api:function>
-
   </info>
   <title>Regress.TestInheritDrawable.prototype.get_size</title>
-  
-<synopsis><code mime="text/x-gjs">
-function get_size():void {
+  <synopsis><code mime="text/x-gjs">
+function get_size(): [width: Number(guint), height: Number(guint)] {
     // Gjs wrapper for regress_test_inherit_drawable_get_size()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
+<item>
+<title><code>width</code></title>
+
+</item>
+<item>
+<title><code>height</code></title>
+
+</item>
 </terms>
 
-  
-  
 </page>
index 02fa064..27cb118 100644 (file)
@@ -6,24 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestInheritDrawable</title>
-  
   <synopsis><code>
 const Regress = imports.gi.Regress;
 
-let test_inherit_drawable = new Regress.TestInheritDrawable();
+let testInheritDrawable = new Regress.TestInheritDrawable();
   </code></synopsis>
 
-  
-    
-  
-  
-  
-  
+
   <synopsis>
     <title>Hierarchy</title>
     <tree>
@@ -35,8 +27,11 @@ let test_inherit_drawable = new Regress.TestInheritDrawable();
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-gjs"
          groups="method" style="linklist">
@@ -45,7 +40,7 @@ let test_inherit_drawable = new Regress.TestInheritDrawable();
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-gjs"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
@@ -56,8 +51,10 @@ let test_inherit_drawable = new Regress.TestInheritDrawable();
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritPixmapObjectClass-parent_class.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritPixmapObjectClass-parent_class.page
new file mode 100644 (file)
index 0000000..f5e3f31
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestInheritPixmapObjectClass-parent_class"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestInheritPixmapObjectClass" group="field" type="guide"/>
+    <title type="link" role="topic">parent_class</title>
+  </info>
+  <title>Regress.TestInheritPixmapObjectClass.parent_class</title>
+  <synopsis><code mime="text/x-gjs">
+TestInheritPixmapObjectClass.parent_class: <link xref="Regress.TestInheritDrawableClass">Regress.TestInheritDrawableClass</link> (Read)
+  </code></synopsis>
+
+
+</page>
index 0df0396..5c17e82 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.TestInheritPixmapObjectClass"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestInheritPixmapObjectClass</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let testInheritPixmapObjectClass = new Regress.TestInheritPixmapObjectClass();
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 4f39890..5fb58df 100644 (file)
@@ -1,39 +1,34 @@
 <?xml version="1.0"?>
 <page id="Regress.TestInterface"
       type="guide"
-      style="class"
+      style="interface"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="interface" type="guide"/>
   </info>
   <title>Regress.TestInterface</title>
-  
   <synopsis><code>
 const Regress = imports.gi.Regress;
 
 let test_interface = new Regress.TestInterface();
   </code></synopsis>
 
-  
-    
-  
-  
-  
-  
+
   <synopsis>
-    <title>Hierarchy</title>
-    <tree>
-      <item>
-        <code>Regress.TestInterface</code>
-      </item>
-    </tree>
+    <title>Prerequisites</title>
+    <p>TestInterface requires GObject.Object</p>
+  </synopsis>
+  <synopsis>
+    <title>Known Implementations</title>
+    <p>None</p>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-gjs"
          groups="method" style="linklist">
@@ -42,7 +37,7 @@ let test_interface = new Regress.TestInterface();
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-gjs"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
@@ -53,8 +48,10 @@ let test_interface = new Regress.TestInterface();
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
index c2d87a4..0bdbbc0 100644 (file)
@@ -6,30 +6,20 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">all</title>
-
   </info>
   <title>Regress.TestObj::all</title>
-  
-<synopsis><code mime="text/x-python">
-function callback(test_obj, ):void;
-</code></synopsis>
+  <synopsis><code mime="text/x-gjs">
+connect('all', function (testObj, ): void);
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
-<title><code>test_obj</code></title>
+<title><code>testObj</code></title>
 <p>instance of <link xref="Regress.TestObj"/> that is emitting the signal</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 3febd77..5a1830e 100644 (file)
@@ -6,30 +6,20 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="Regress.TestObj" group="vfunc" type="guide"/>
-    
+    <link xref="Regress.TestObj" group="vfunc" type="guide"/>
   </info>
   <title>Regress.TestObj::allow_none_vfunc</title>
-  
-<synopsis><code mime="text/x-gjs">
-function vfunc_allow_none_vfunc(two:Regress.TestObj):void {
+  <synopsis><code mime="text/x-gjs">
+function vfunc_allow_none_vfunc(two: <link xref="Regress.TestObj">Regress.TestObj</link>): void {
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>two</code></title>
-<p>Another object</p>
+  <p>Another object</p>
 </item>
 </terms>
 
-  
-  
 </page>
index f1f1b52..b279e01 100644 (file)
@@ -6,24 +6,13 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="property" type="guide"/>
     <title type="link" role="topic">bare</title>
-
   </info>
-  <title>Regress.TestObj:bare</title>
-  
-<synopsis><code mime="text/x-python">
-"bare"             GObject.Object                : Read / Write
-</code></synopsis>
+  <title>Regress.TestObj.bare</title>
+  <synopsis><code mime="text/x-gjs">
+TestObj.bare: <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link> (Read / Write)
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-  
-  
-  
 </page>
index a392a77..411d2b3 100644 (file)
@@ -6,24 +6,13 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="property" type="guide"/>
     <title type="link" role="topic">boxed</title>
-
   </info>
-  <title>Regress.TestObj:boxed</title>
-  
-<synopsis><code mime="text/x-python">
-"boxed"             Regress.TestBoxed                : Read / Write
-</code></synopsis>
+  <title>Regress.TestObj.boxed</title>
+  <synopsis><code mime="text/x-gjs">
+TestObj.boxed: <link xref="Regress.TestBoxed">Regress.TestBoxed</link> (Read / Write)
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-  
-  
-  
 </page>
index 8e5e2bf..9985e1d 100644 (file)
@@ -6,30 +6,20 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">cleanup</title>
-
   </info>
   <title>Regress.TestObj::cleanup</title>
-  
-<synopsis><code mime="text/x-python">
-function callback(test_obj, ):void;
-</code></synopsis>
+  <synopsis><code mime="text/x-gjs">
+connect('cleanup', function (testObj, ): void);
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
-<title><code>test_obj</code></title>
+<title><code>testObj</code></title>
 <p>instance of <link xref="Regress.TestObj"/> that is emitting the signal</p>
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-complex_vfunc.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-complex_vfunc.page
new file mode 100644 (file)
index 0000000..682d7f3
--- /dev/null
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj-complex_vfunc"
+      type="topic"
+      style="vfunc"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObj" group="vfunc" type="guide"/>
+  </info>
+  <title>Regress.TestObj::complex_vfunc</title>
+  <synopsis><code mime="text/x-gjs">
+function vfunc_complex_vfunc(someint: Number(gint)): void {
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>someint</code></title>
+
+</item>
+</terms>
+
+</page>
index 5e2df6b..0aafd80 100644 (file)
@@ -6,24 +6,13 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="property" type="guide"/>
     <title type="link" role="topic">double</title>
-
   </info>
-  <title>Regress.TestObj:double</title>
-  
-<synopsis><code mime="text/x-python">
-"double"             Number                : Read / Write
-</code></synopsis>
+  <title>Regress.TestObj.double</title>
+  <synopsis><code mime="text/x-gjs">
+TestObj.double: Number(gdouble) (Read / Write)
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-  
-  
-  
 </page>
index d0294e9..82850d2 100644 (file)
@@ -6,30 +6,20 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">first</title>
-
   </info>
   <title>Regress.TestObj::first</title>
-  
-<synopsis><code mime="text/x-python">
-function callback(test_obj, ):void;
-</code></synopsis>
+  <synopsis><code mime="text/x-gjs">
+connect('first', function (testObj, ): void);
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
-<title><code>test_obj</code></title>
+<title><code>testObj</code></title>
 <p>instance of <link xref="Regress.TestObj"/> that is emitting the signal</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 0554ba8..9a320ed 100644 (file)
@@ -6,24 +6,13 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="property" type="guide"/>
     <title type="link" role="topic">float</title>
-
   </info>
-  <title>Regress.TestObj:float</title>
-  
-<synopsis><code mime="text/x-python">
-"float"             Number                : Read / Write
-</code></synopsis>
+  <title>Regress.TestObj.float</title>
+  <synopsis><code mime="text/x-gjs">
+TestObj.float: Number(gfloat) (Read / Write)
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-  
-  
-  
 </page>
index 6b222e4..82f59fb 100644 (file)
@@ -6,24 +6,13 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="property" type="guide"/>
     <title type="link" role="topic">gtype</title>
-
   </info>
-  <title>Regress.TestObj:gtype</title>
-  
-<synopsis><code mime="text/x-python">
-"gtype"             GType                : Read / Write
-</code></synopsis>
+  <title>Regress.TestObj.gtype</title>
+  <synopsis><code mime="text/x-gjs">
+TestObj.gtype: GObject.Type (Read / Write)
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-  
-  
-  
 </page>
index 1d3c3c2..ed4abee 100644 (file)
@@ -6,24 +6,13 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="property" type="guide"/>
     <title type="link" role="topic">hash-table-old</title>
-
   </info>
-  <title>Regress.TestObj:hash-table-old</title>
-  
-<synopsis><code mime="text/x-python">
-"hash-table-old"             {String: gint8}                : Read / Write
-</code></synopsis>
+  <title>Regress.TestObj.hash_table_old</title>
+  <synopsis><code mime="text/x-gjs">
+TestObj.hash_table_old: {String: Number(gint8)} (Read / Write)
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-  
-  
-  
 </page>
index f8d3441..e4f3a37 100644 (file)
@@ -6,24 +6,13 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="property" type="guide"/>
     <title type="link" role="topic">hash-table</title>
-
   </info>
-  <title>Regress.TestObj:hash-table</title>
-  
-<synopsis><code mime="text/x-python">
-"hash-table"             {String: gint8}                : Read / Write
-</code></synopsis>
+  <title>Regress.TestObj.hash_table</title>
+  <synopsis><code mime="text/x-gjs">
+TestObj.hash_table: {String: Number(gint8)} (Read / Write)
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-  
-  
-  
 </page>
index 0c3f4cc..04ef887 100644 (file)
@@ -6,24 +6,13 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="property" type="guide"/>
     <title type="link" role="topic">int</title>
-
   </info>
-  <title>Regress.TestObj:int</title>
-  
-<synopsis><code mime="text/x-python">
-"int"             Number                : Read / Write
-</code></synopsis>
+  <title>Regress.TestObj.int</title>
+  <synopsis><code mime="text/x-gjs">
+TestObj.int: Number(gint) (Read / Write)
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-  
-  
-  
 </page>
index 9d8ea91..937dd7a 100644 (file)
@@ -6,24 +6,13 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="property" type="guide"/>
     <title type="link" role="topic">list-old</title>
-
   </info>
-  <title>Regress.TestObj:list-old</title>
-  
-<synopsis><code mime="text/x-python">
-"list-old"             [String]                : Read / Write
-</code></synopsis>
+  <title>Regress.TestObj.list_old</title>
+  <synopsis><code mime="text/x-gjs">
+TestObj.list_old: Array(String) (Read / Write)
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-  
-  
-  
 </page>
index 02638e9..49c1ec2 100644 (file)
@@ -6,24 +6,13 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="property" type="guide"/>
     <title type="link" role="topic">list</title>
-
   </info>
-  <title>Regress.TestObj:list</title>
-  
-<synopsis><code mime="text/x-python">
-"list"             [String]                : Read / Write
-</code></synopsis>
+  <title>Regress.TestObj.list</title>
+  <synopsis><code mime="text/x-gjs">
+TestObj.list: Array(String) (Read / Write)
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-  
-  
-  
 </page>
index 1d83217..3c6cc7d 100644 (file)
@@ -6,29 +6,21 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="Regress.TestObj" group="vfunc" type="guide"/>
-    
+    <link xref="Regress.TestObj" group="vfunc" type="guide"/>
   </info>
   <title>Regress.TestObj::matrix</title>
-  
-<synopsis><code mime="text/x-gjs">
-function vfunc_matrix(somestr:String):Number {
+  <synopsis><code mime="text/x-gjs">
+function vfunc_matrix(somestr: String): Number(gint) {
 }
-</code></synopsis>
-
-  
-    <p>This method is virtual.  Notably its name differs from the virtual
+  </code></synopsis>
+  <p>This method is virtual.  Notably its name differs from the virtual
 slot name, which makes it useful for testing bindings handle this
 case.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>somestr</code></title>
-<p>Meaningless string</p>
+  <p>Meaningless string</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -36,6 +28,4 @@ case.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index c359b13..6af8b35 100644 (file)
@@ -6,34 +6,24 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">sig-with-array-len-prop</title>
-
   </info>
   <title>Regress.TestObj::sig-with-array-len-prop</title>
-  
-<synopsis><code mime="text/x-python">
-function callback(test_obj, arr:[Number], ):void;
-</code></synopsis>
+  <synopsis><code mime="text/x-gjs">
+connect('sig-with-array-len-prop', function (testObj, arr: Array(Number(guint)), ): void);
+  </code></synopsis>
+  <p>This test signal similar to GSettings::change-event</p>
 
-  
-    <p>This test signal similar to GSettings::change-event</p>
-  
-  
-  
-  
 <terms>
 <item>
-<title><code>test_obj</code></title>
+<title><code>testObj</code></title>
 <p>instance of <link xref="Regress.TestObj"/> that is emitting the signal</p>
 </item>
 <item>
 <title><code>arr</code></title>
-<p>numbers, or <code>null</code></p>
+  <p>numbers, or <code>null</code></p>
 </item>
 </terms>
 
-  
-  
 </page>
index b1919f9..e3b1de6 100644 (file)
@@ -6,35 +6,25 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">sig-with-array-prop</title>
-
   </info>
   <title>Regress.TestObj::sig-with-array-prop</title>
-  
-<synopsis><code mime="text/x-python">
-function callback(test_obj, arr:[Number], ):void;
-</code></synopsis>
-
-  
-    <p>This test signal is like TelepathyGlib's
+  <synopsis><code mime="text/x-gjs">
+connect('sig-with-array-prop', function (testObj, arr: Array(Number(guint)), ): void);
+  </code></synopsis>
+  <p>This test signal is like TelepathyGlib's
  TpChannel:: group-members-changed-detailed:</p>
-  
-  
-  
-  
+
 <terms>
 <item>
-<title><code>test_obj</code></title>
+<title><code>testObj</code></title>
 <p>instance of <link xref="Regress.TestObj"/> that is emitting the signal</p>
 </item>
 <item>
 <title><code>arr</code></title>
-<p>numbers</p>
+  <p>numbers</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 31b8ca3..42194fa 100644 (file)
@@ -6,34 +6,24 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">sig-with-foreign-struct</title>
-
   </info>
   <title>Regress.TestObj::sig-with-foreign-struct</title>
-  
-<synopsis><code mime="text/x-python">
-function callback(test_obj, cr:cairo.Context, ):void;
-</code></synopsis>
+  <synopsis><code mime="text/x-gjs">
+connect('sig-with-foreign-struct', function (testObj, cr: <link href="../cairo-1.0/cairo.Context.html">cairo.Context</link>, ): void);
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
-<title><code>test_obj</code></title>
+<title><code>testObj</code></title>
 <p>instance of <link xref="Regress.TestObj"/> that is emitting the signal</p>
 </item>
 <item>
 <title><code>cr</code></title>
-<p>A cairo context.</p>
+  <p>A cairo context.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 137a413..14f7b2f 100644 (file)
@@ -6,27 +6,19 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">sig-with-hash-prop</title>
-
   </info>
   <title>Regress.TestObj::sig-with-hash-prop</title>
-  
-<synopsis><code mime="text/x-python">
-function callback(test_obj, hash:{String: GObject.Value}, ):void;
-</code></synopsis>
-
-  
-    <p>This test signal is like TelepathyGlib's
+  <synopsis><code mime="text/x-gjs">
+connect('sig-with-hash-prop', function (testObj, hash: {String: Any}, ): void);
+  </code></synopsis>
+  <p>This test signal is like TelepathyGlib's
  TpAccount::status-changed</p>
-  
-  
-  
-  
+
 <terms>
 <item>
-<title><code>test_obj</code></title>
+<title><code>testObj</code></title>
 <p>instance of <link xref="Regress.TestObj"/> that is emitting the signal</p>
 </item>
 <item>
@@ -35,6 +27,4 @@ function callback(test_obj, hash:{String: GObject.Value}, ):void;
 </item>
 </terms>
 
-  
-  
 </page>
index 6c528c0..4743d22 100644 (file)
@@ -6,32 +6,24 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">sig-with-int64-prop</title>
-
   </info>
   <title>Regress.TestObj::sig-with-int64-prop</title>
-  
-<synopsis><code mime="text/x-python">
-function callback(test_obj, i:Number, ):Number;
-</code></synopsis>
-
-  
-    <p>You can use this with regress_test_obj_emit_sig_with_int64, or raise from
+  <synopsis><code mime="text/x-gjs">
+connect('sig-with-int64-prop', function (testObj, i: Number(gint64), ): Number(gint64));
+  </code></synopsis>
+  <p>You can use this with regress_test_obj_emit_sig_with_int64, or raise from
 the introspection client langage.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
-<title><code>test_obj</code></title>
+<title><code>testObj</code></title>
 <p>instance of <link xref="Regress.TestObj"/> that is emitting the signal</p>
 </item>
 <item>
 <title><code>i</code></title>
-<p>an integer</p>
+  <p>an integer</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -39,6 +31,4 @@ the introspection client langage.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index f724bcb..cc187f7 100644 (file)
@@ -6,34 +6,24 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">sig-with-intarray-ret</title>
-
   </info>
   <title>Regress.TestObj::sig-with-intarray-ret</title>
-  
-<synopsis><code mime="text/x-python">
-function callback(test_obj, i:Number, ):[Number];
-</code></synopsis>
+  <synopsis><code mime="text/x-gjs">
+connect('sig-with-intarray-ret', function (testObj, i: Number(gint), ): Array(Number(gint)));
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
-<title><code>test_obj</code></title>
+<title><code>testObj</code></title>
 <p>instance of <link xref="Regress.TestObj"/> that is emitting the signal</p>
 </item>
 <item>
 <title><code>i</code></title>
-<p>an integer</p>
+  <p>an integer</p>
 </item>
 </terms>
 
-  
-  
 </page>
index d7e15e0..5d230bd 100644 (file)
@@ -6,35 +6,25 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">sig-with-obj</title>
-
   </info>
   <title>Regress.TestObj::sig-with-obj</title>
-  
-<synopsis><code mime="text/x-python">
-function callback(test_obj, obj:GObject.Object, ):void;
-</code></synopsis>
-
-  
-    <p>Test transfer none GObject as a param (tests refcounting).
+  <synopsis><code mime="text/x-gjs">
+connect('sig-with-obj', function (testObj, obj: <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link>, ): void);
+  </code></synopsis>
+  <p>Test transfer none GObject as a param (tests refcounting).
 Use with regress_test_obj_emit_sig_with_obj</p>
-  
-  
-  
-  
+
 <terms>
 <item>
-<title><code>test_obj</code></title>
+<title><code>testObj</code></title>
 <p>instance of <link xref="Regress.TestObj"/> that is emitting the signal</p>
 </item>
 <item>
 <title><code>obj</code></title>
-<p>A newly created RegressTestObj</p>
+  <p>A newly created RegressTestObj</p>
 </item>
 </terms>
 
-  
-  
 </page>
index a63e207..4a116ea 100644 (file)
@@ -6,34 +6,24 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">sig-with-strv</title>
-
   </info>
   <title>Regress.TestObj::sig-with-strv</title>
-  
-<synopsis><code mime="text/x-python">
-function callback(test_obj, strs:[String], ):void;
-</code></synopsis>
+  <synopsis><code mime="text/x-gjs">
+connect('sig-with-strv', function (testObj, strs: Array(String), ): void);
+  </code></synopsis>
+  <p>Test GStrv as a param.</p>
 
-  
-    <p>Test GStrv as a param.</p>
-  
-  
-  
-  
 <terms>
 <item>
-<title><code>test_obj</code></title>
+<title><code>testObj</code></title>
 <p>instance of <link xref="Regress.TestObj"/> that is emitting the signal</p>
 </item>
 <item>
 <title><code>strs</code></title>
-<p>strings</p>
+  <p>strings</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 6fbf7a0..459ab4e 100644 (file)
@@ -6,32 +6,24 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">sig-with-uint64-prop</title>
-
   </info>
   <title>Regress.TestObj::sig-with-uint64-prop</title>
-  
-<synopsis><code mime="text/x-python">
-function callback(test_obj, i:Number, ):Number;
-</code></synopsis>
-
-  
-    <p>You can use this with regress_test_obj_emit_sig_with_uint64, or raise from
+  <synopsis><code mime="text/x-gjs">
+connect('sig-with-uint64-prop', function (testObj, i: Number(guint64), ): Number(guint64));
+  </code></synopsis>
+  <p>You can use this with regress_test_obj_emit_sig_with_uint64, or raise from
 the introspection client langage.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
-<title><code>test_obj</code></title>
+<title><code>testObj</code></title>
 <p>instance of <link xref="Regress.TestObj"/> that is emitting the signal</p>
 </item>
 <item>
 <title><code>i</code></title>
-<p>an integer</p>
+  <p>an integer</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -39,6 +31,4 @@ the introspection client langage.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 2e91097..aaad476 100644 (file)
@@ -6,24 +6,13 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="property" type="guide"/>
     <title type="link" role="topic">string</title>
-
   </info>
-  <title>Regress.TestObj:string</title>
-  
-<synopsis><code mime="text/x-python">
-"string"             String                : Read / Write
-</code></synopsis>
+  <title>Regress.TestObj.string</title>
+  <synopsis><code mime="text/x-gjs">
+TestObj.string: String (Read / Write)
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-  
-  
-  
 </page>
index b19711f..0b940b1 100644 (file)
@@ -6,26 +6,18 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">test-with-static-scope-arg</title>
-
   </info>
   <title>Regress.TestObj::test-with-static-scope-arg</title>
-  
-<synopsis><code mime="text/x-python">
-function callback(test_obj, object:Regress.TestSimpleBoxedA, ):void;
-</code></synopsis>
+  <synopsis><code mime="text/x-gjs">
+connect('test-with-static-scope-arg', function (testObj, object: <link xref="Regress.TestSimpleBoxedA">Regress.TestSimpleBoxedA</link>, ): void);
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
-<title><code>test_obj</code></title>
+<title><code>testObj</code></title>
 <p>instance of <link xref="Regress.TestObj"/> that is emitting the signal</p>
 </item>
 <item>
@@ -34,6 +26,4 @@ function callback(test_obj, object:Regress.TestSimpleBoxedA, ):void;
 </item>
 </terms>
 
-  
-  
 </page>
index 9700cef..1133b31 100644 (file)
@@ -6,30 +6,20 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">test</title>
-
   </info>
   <title>Regress.TestObj::test</title>
-  
-<synopsis><code mime="text/x-python">
-function callback(test_obj, ):void;
-</code></synopsis>
+  <synopsis><code mime="text/x-gjs">
+connect('test', function (testObj, ): void);
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
-<title><code>test_obj</code></title>
+<title><code>testObj</code></title>
 <p>instance of <link xref="Regress.TestObj"/> that is emitting the signal</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 4f2183d..177defd 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_constructor</api:name>
     </api:function>
-
   </info>
   <title>Regress.TestObj.constructor</title>
-  
-<synopsis><code mime="text/x-gjs">
-function constructor():Regress.TestObj {
+  <synopsis><code mime="text/x-gjs">
+function constructor(): <link xref="Regress.TestObj">Regress.TestObj</link> {
     // Gjs wrapper for regress_constructor()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function constructor():Regress.TestObj {
 </item>
 </terms>
 
-  
-  
 </page>
index 0770d0d..f3629e2 100644 (file)
@@ -6,11 +6,10 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_test_obj_do_matrix</api:name>
       <api:arg>
         <api:name>somestr</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestObj.prototype.do_matrix</title>
-  
-<synopsis><code mime="text/x-gjs">
-function do_matrix(somestr:String):Number {
+  <synopsis><code mime="text/x-gjs">
+function do_matrix(somestr: String): Number(gint) {
     // Gjs wrapper for regress_test_obj_do_matrix()
 }
-</code></synopsis>
-
-  
-    <p>This method is virtual.  Notably its name differs from the virtual
+  </code></synopsis>
+  <p>This method is virtual.  Notably its name differs from the virtual
 slot name, which makes it useful for testing bindings handle this
 case.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>somestr</code></title>
-<p>Meaningless string</p>
+  <p>Meaningless string</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -47,6 +39,4 @@ case.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 5e71948..80b60d8 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_obj_emit_sig_with_foreign_struct</api:name>
     </api:function>
-
   </info>
   <title>Regress.TestObj.prototype.emit_sig_with_foreign_struct</title>
-  
-<synopsis><code mime="text/x-gjs">
-function emit_sig_with_foreign_struct():void {
+  <synopsis><code mime="text/x-gjs">
+function emit_sig_with_foreign_struct(): void {
     // Gjs wrapper for regress_test_obj_emit_sig_with_foreign_struct()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-<terms>
-</terms>
 
-  
-  
 </page>
index 1c46dfb..843c89d 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_obj_emit_sig_with_int64</api:name>
     </api:function>
-
   </info>
   <title>Regress.TestObj.prototype.emit_sig_with_int64</title>
-  
-<synopsis><code mime="text/x-gjs">
-function emit_sig_with_int64():void {
+  <synopsis><code mime="text/x-gjs">
+function emit_sig_with_int64(): void {
     // Gjs wrapper for regress_test_obj_emit_sig_with_int64()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-<terms>
-</terms>
 
-  
-  
 </page>
index ea33a82..cfd7dd2 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_obj_emit_sig_with_obj</api:name>
     </api:function>
-
   </info>
   <title>Regress.TestObj.prototype.emit_sig_with_obj</title>
-  
-<synopsis><code mime="text/x-gjs">
-function emit_sig_with_obj():void {
+  <synopsis><code mime="text/x-gjs">
+function emit_sig_with_obj(): void {
     // Gjs wrapper for regress_test_obj_emit_sig_with_obj()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-<terms>
-</terms>
 
-  
-  
 </page>
index 35c0678..004df97 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_obj_emit_sig_with_uint64</api:name>
     </api:function>
-
   </info>
   <title>Regress.TestObj.prototype.emit_sig_with_uint64</title>
-  
-<synopsis><code mime="text/x-gjs">
-function emit_sig_with_uint64():void {
+  <synopsis><code mime="text/x-gjs">
+function emit_sig_with_uint64(): void {
     // Gjs wrapper for regress_test_obj_emit_sig_with_uint64()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-<terms>
-</terms>
 
-  
-  
 </page>
index b3ff3bf..126b739 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_forced_method</api:name>
     </api:function>
-
   </info>
   <title>Regress.TestObj.prototype.forced_method</title>
-  
-<synopsis><code mime="text/x-gjs">
-function forced_method():void {
+  <synopsis><code mime="text/x-gjs">
+function forced_method(): void {
     // Gjs wrapper for regress_forced_method()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-<terms>
-</terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.function_ptr.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.function_ptr.page
new file mode 100644 (file)
index 0000000..d9f3754
--- /dev/null
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj.function_ptr"
+      type="topic"
+      style="callback"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="callback" type="guide"/>
+  </info>
+  <title>Regress.TestObj.function_ptr</title>
+  <synopsis><code mime="text/x-gjs">
+function onfunction_ptr(): void {
+}
+  </code></synopsis>
+
+
+
+</page>
index 9ee8768..d193fc9 100644 (file)
@@ -6,30 +6,22 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_test_obj_instance_method</api:name>
     </api:function>
-
   </info>
   <title>Regress.TestObj.prototype.instance_method</title>
-  
-<synopsis><code mime="text/x-gjs">
-function instance_method():Number {
+  <synopsis><code mime="text/x-gjs">
+function instance_method(): Number(gint) {
     // Gjs wrapper for regress_test_obj_instance_method()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function instance_method():Number {
 </item>
 </terms>
 
-  
-  
 </page>
index fe26069..73d8e53 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestObj.prototype.instance_method_callback</title>
-  
-<synopsis><code mime="text/x-gjs">
-function instance_method_callback(callback:Regress.TestCallback):void {
+  <synopsis><code mime="text/x-gjs">
+function instance_method_callback(callback: <link xref="Regress.TestCallback">Regress.TestCallback</link>): void {
     // Gjs wrapper for regress_test_obj_instance_method_callback()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -41,6 +33,4 @@ function instance_method_callback(callback:Regress.TestCallback):void {
 </item>
 </terms>
 
-  
-  
 </page>
index 024db93..8be6b74 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>obj</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestObj.new</title>
-  
-<synopsis><code mime="text/x-gjs">
-function new(obj:Regress.TestObj):Regress.TestObj {
+  <synopsis><code mime="text/x-gjs">
+function new(obj: <link xref="Regress.TestObj">Regress.TestObj</link>): <link xref="Regress.TestObj">Regress.TestObj</link> {
     // Gjs wrapper for regress_test_obj_new()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>obj</code></title>
-<p>A <link xref="Regress.TestObj"/></p>
+  <p>A <link xref="Regress.TestObj"/></p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -45,6 +37,4 @@ function new(obj:Regress.TestObj):Regress.TestObj {
 </item>
 </terms>
 
-  
-  
 </page>
index 4eaa036..0e735d0 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestObj.new_callback</title>
-  
-<synopsis><code mime="text/x-gjs">
-function new_callback(callback:Regress.TestCallbackUserData):Regress.TestObj {
+  <synopsis><code mime="text/x-gjs">
+function new_callback(callback: <link xref="Regress.TestCallbackUserData">Regress.TestCallbackUserData</link>): <link xref="Regress.TestObj">Regress.TestObj</link> {
     // Gjs wrapper for regress_test_obj_new_callback()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -45,6 +37,4 @@ function new_callback(callback:Regress.TestCallbackUserData):Regress.TestObj {
 </item>
 </terms>
 
-  
-  
 </page>
index c54fa62..2b83a34 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>x</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestObj.new_from_file</title>
-  
-<synopsis><code mime="text/x-gjs">
-function new_from_file(x:String):Regress.TestObj {
+  <synopsis><code mime="text/x-gjs">
+function new_from_file(x: String): <link xref="Regress.TestObj">Regress.TestObj</link> {
     // Gjs wrapper for regress_test_obj_new_from_file()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>x</code></title>
@@ -45,6 +37,4 @@ function new_from_file(x:String):Regress.TestObj {
 </item>
 </terms>
 
-  
-  
 </page>
index dfc9ef0..1237d49 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_obj_null_out</api:name>
     </api:function>
-
   </info>
-  <title>null_out</title>
-  
-<synopsis><code mime="text/x-gjs">
-function null_out():void {
+  <title>Regress.TestObj.null_out</title>
+  <synopsis><code mime="text/x-gjs">
+function null_out(): <link xref="Regress.TestObj">Regress.TestObj</link> {
     // Gjs wrapper for regress_test_obj_null_out()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
+<item>
+<title><code>Returns</code></title>
+  <p>A <link xref="Regress.TestObj"/></p>
+</item>
 </terms>
 
-  
-  
 </page>
index b842894..4b43596 100644 (file)
@@ -6,36 +6,17 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestObj</title>
-  
   <synopsis><code>
 const Regress = imports.gi.Regress;
 
-let test_obj = new Regress.TestObj({
-    <link xref='Regress.TestObj-bare'>bare</link>: value,
-    <link xref='Regress.TestObj-boxed'>boxed</link>: value,
-    <link xref='Regress.TestObj-double'>double</link>: value,
-    <link xref='Regress.TestObj-float'>float</link>: value,
-    <link xref='Regress.TestObj-gtype'>gtype</link>: value,
-    <link xref='Regress.TestObj-hash-table'>hash_table</link>: value,
-    <link xref='Regress.TestObj-hash-table-old'>hash_table_old</link>: value,
-    <link xref='Regress.TestObj-int'>int</link>: value,
-    <link xref='Regress.TestObj-list'>list</link>: value,
-    <link xref='Regress.TestObj-list-old'>list_old</link>: value,
-    <link xref='Regress.TestObj-string'>string</link>: value,
+let testObj = new Regress.TestObj({
 });
   </code></synopsis>
 
-  
-    
-  
-  
-  
-  
+
   <synopsis>
     <title>Hierarchy</title>
     <tree>
@@ -47,8 +28,11 @@ let test_obj = new Regress.TestObj({
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-gjs"
          groups="method" style="linklist">
@@ -57,7 +41,7 @@ let test_obj = new Regress.TestObj({
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-gjs"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
@@ -68,8 +52,10 @@ let test_obj = new Regress.TestObj({
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
index dca89e8..2e5d07f 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>bare</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestObj.prototype.set_bare</title>
-  
-<synopsis><code mime="text/x-gjs">
-function set_bare(bare:GObject.Object):void {
+  <synopsis><code mime="text/x-gjs">
+function set_bare(bare: <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link>): void {
     // Gjs wrapper for regress_test_obj_set_bare()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>bare</code></title>
@@ -41,6 +33,4 @@ function set_bare(bare:GObject.Object):void {
 </item>
 </terms>
 
-  
-  
 </page>
index aee3f2c..f253cce 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_obj_skip_inout_param</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>a</api:name>
       </api:arg>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gdouble)</api:type>
         <api:name>c</api:name>
       </api:arg>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>inout_d</api:name>
       </api:arg>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>num1</api:name>
       </api:arg>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>num2</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestObj.prototype.skip_inout_param</title>
-  
-<synopsis><code mime="text/x-gjs">
-function skip_inout_param(a:Number, c:Number, inout_d:Number, num1:Number, num2:Number):Boolean {
+  <synopsis><code mime="text/x-gjs">
+function skip_inout_param(a: Number(gint), c: Number(gdouble), inout_d: Number(gint), num1: Number(gint), num2: Number(gint)): [ok: Boolean, out_b: Number(gint), inout_d: Number(gint), out_sum: Number(gint)] {
     // Gjs wrapper for regress_test_obj_skip_inout_param()
 }
-</code></synopsis>
+  </code></synopsis>
+  <p>Check that the out value is skipped</p>
 
-  
-    <p>Check that the out value is skipped</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>a</code></title>
-<p>Parameter.</p>
+  <p>Parameter.</p>
 </item>
 <item>
 <title><code>c</code></title>
-<p>Other parameter.</p>
+  <p>Other parameter.</p>
 </item>
 <item>
 <title><code>inout_d</code></title>
-<p>Will be incremented.</p>
+  <p>Will be incremented.</p>
 </item>
 <item>
 <title><code>num1</code></title>
-<p>Number.</p>
+  <p>Number.</p>
 </item>
 <item>
 <title><code>num2</code></title>
-<p>Number.</p>
+  <p>Number.</p>
+</item>
+<item>
+<title><code>ok</code></title>
+  <p><code>true</code> if the call succeeds, <code>false</code> if @error is set.</p>
+</item>
+<item>
+<title><code>out_b</code></title>
+  <p>Return value.</p>
+</item>
+<item>
+<title><code>inout_d (out)</code></title>
+  <p>Will be incremented.</p>
 </item>
 <item>
-<title><code>Returns</code></title>
-<p><code>true</code> if the call succeeds, <code>false</code> if @error is set.</p>
+<title><code>out_sum</code></title>
+  <p>Return value.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 75b7bb2..2f27e86 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_obj_skip_out_param</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>a</api:name>
       </api:arg>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gdouble)</api:type>
         <api:name>c</api:name>
       </api:arg>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>inout_d</api:name>
       </api:arg>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>num1</api:name>
       </api:arg>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>num2</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestObj.prototype.skip_out_param</title>
-  
-<synopsis><code mime="text/x-gjs">
-function skip_out_param(a:Number, c:Number, inout_d:Number, num1:Number, num2:Number):Boolean {
+  <synopsis><code mime="text/x-gjs">
+function skip_out_param(a: Number(gint), c: Number(gdouble), inout_d: Number(gint), num1: Number(gint), num2: Number(gint)): [ok: Boolean, out_b: Number(gint), inout_d: Number(gint), out_sum: Number(gint)] {
     // Gjs wrapper for regress_test_obj_skip_out_param()
 }
-</code></synopsis>
+  </code></synopsis>
+  <p>Check that the out value is skipped</p>
 
-  
-    <p>Check that the out value is skipped</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>a</code></title>
-<p>Parameter.</p>
+  <p>Parameter.</p>
 </item>
 <item>
 <title><code>c</code></title>
-<p>Other parameter.</p>
+  <p>Other parameter.</p>
 </item>
 <item>
 <title><code>inout_d</code></title>
-<p>Will be incremented.</p>
+  <p>Will be incremented.</p>
 </item>
 <item>
 <title><code>num1</code></title>
-<p>Number.</p>
+  <p>Number.</p>
 </item>
 <item>
 <title><code>num2</code></title>
-<p>Number.</p>
+  <p>Number.</p>
+</item>
+<item>
+<title><code>ok</code></title>
+  <p><code>true</code> if the call succeeds, <code>false</code> if @error is set.</p>
+</item>
+<item>
+<title><code>out_b</code></title>
+  <p>Return value.</p>
+</item>
+<item>
+<title><code>inout_d (out)</code></title>
+  <p>Will be incremented.</p>
 </item>
 <item>
-<title><code>Returns</code></title>
-<p><code>true</code> if the call succeeds, <code>false</code> if @error is set.</p>
+<title><code>out_sum</code></title>
+  <p>Return value.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index cd2081f..bd193a0 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_obj_skip_param</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>a</api:name>
       </api:arg>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gdouble)</api:type>
         <api:name>c</api:name>
       </api:arg>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>inout_d</api:name>
       </api:arg>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>num1</api:name>
       </api:arg>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>num2</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestObj.prototype.skip_param</title>
-  
-<synopsis><code mime="text/x-gjs">
-function skip_param(a:Number, c:Number, inout_d:Number, num1:Number, num2:Number):Boolean {
+  <synopsis><code mime="text/x-gjs">
+function skip_param(a: Number(gint), c: Number(gdouble), inout_d: Number(gint), num1: Number(gint), num2: Number(gint)): [ok: Boolean, out_b: Number(gint), inout_d: Number(gint), out_sum: Number(gint)] {
     // Gjs wrapper for regress_test_obj_skip_param()
 }
-</code></synopsis>
+  </code></synopsis>
+  <p>Check that a parameter is skipped</p>
 
-  
-    <p>Check that a parameter is skipped</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>a</code></title>
-<p>Parameter.</p>
+  <p>Parameter.</p>
 </item>
 <item>
 <title><code>c</code></title>
-<p>Other parameter.</p>
+  <p>Other parameter.</p>
 </item>
 <item>
 <title><code>inout_d</code></title>
-<p>Will be incremented.</p>
+  <p>Will be incremented.</p>
 </item>
 <item>
 <title><code>num1</code></title>
-<p>Number.</p>
+  <p>Number.</p>
 </item>
 <item>
 <title><code>num2</code></title>
-<p>Number.</p>
+  <p>Number.</p>
+</item>
+<item>
+<title><code>ok</code></title>
+  <p><code>true</code> if the call succeeds, <code>false</code> if @error is set.</p>
+</item>
+<item>
+<title><code>out_b</code></title>
+  <p>Return value.</p>
+</item>
+<item>
+<title><code>inout_d (out)</code></title>
+  <p>Will be incremented.</p>
 </item>
 <item>
-<title><code>Returns</code></title>
-<p><code>true</code> if the call succeeds, <code>false</code> if @error is set.</p>
+<title><code>out_sum</code></title>
+  <p>Return value.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 22ec572..b7a3a87 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_obj_skip_return_val</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>a</api:name>
       </api:arg>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gdouble)</api:type>
         <api:name>c</api:name>
       </api:arg>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>inout_d</api:name>
       </api:arg>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>num1</api:name>
       </api:arg>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>num2</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestObj.prototype.skip_return_val</title>
-  
-<synopsis><code mime="text/x-gjs">
-function skip_return_val(a:Number, c:Number, inout_d:Number, num1:Number, num2:Number):Boolean {
+  <synopsis><code mime="text/x-gjs">
+function skip_return_val(a: Number(gint), c: Number(gdouble), inout_d: Number(gint), num1: Number(gint), num2: Number(gint)): [ok: Boolean, out_b: Number(gint), inout_d: Number(gint), out_sum: Number(gint)] {
     // Gjs wrapper for regress_test_obj_skip_return_val()
 }
-</code></synopsis>
+  </code></synopsis>
+  <p>Check that the return value is skipped</p>
 
-  
-    <p>Check that the return value is skipped</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>a</code></title>
-<p>Parameter.</p>
+  <p>Parameter.</p>
 </item>
 <item>
 <title><code>c</code></title>
-<p>Other parameter.</p>
+  <p>Other parameter.</p>
 </item>
 <item>
 <title><code>inout_d</code></title>
-<p>Will be incremented.</p>
+  <p>Will be incremented.</p>
 </item>
 <item>
 <title><code>num1</code></title>
-<p>Number.</p>
+  <p>Number.</p>
 </item>
 <item>
 <title><code>num2</code></title>
-<p>Number.</p>
+  <p>Number.</p>
+</item>
+<item>
+<title><code>ok</code></title>
+  <p><code>true</code> if the call succeeds, <code>false</code> if @error is set.</p>
+</item>
+<item>
+<title><code>out_b</code></title>
+  <p>A return value.</p>
+</item>
+<item>
+<title><code>inout_d (out)</code></title>
+  <p>Will be incremented.</p>
 </item>
 <item>
-<title><code>Returns</code></title>
-<p><code>true</code> if the call succeeds, <code>false</code> if @error is set.</p>
+<title><code>out_sum</code></title>
+  <p>Return value.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 74701f7..2558aa7 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_obj_skip_return_val_no_out</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>a</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestObj.prototype.skip_return_val_no_out</title>
-  
-<synopsis><code mime="text/x-gjs">
-function skip_return_val_no_out(a:Number):Boolean {
+  <synopsis><code mime="text/x-gjs">
+function skip_return_val_no_out(a: Number(gint)): Boolean {
     // Gjs wrapper for regress_test_obj_skip_return_val_no_out()
 }
-</code></synopsis>
-
-  
-    <p>Check that the return value is skipped. Succeed if a is nonzero, otherwise
+  </code></synopsis>
+  <p>Check that the return value is skipped. Succeed if a is nonzero, otherwise
 raise an error.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>a</code></title>
-<p>Parameter.</p>
+  <p>Parameter.</p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p><code>true</code> if the call succeeds, <code>false</code> if @error is set.</p>
+  <p><code>true</code> if the call succeeds, <code>false</code> if @error is set.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index d1f2e59..a2256ce 100644 (file)
@@ -6,34 +6,26 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gdouble)</api:type>
       </api:returns>
       <api:name>regress_test_obj_static_method</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>x</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>static_method</title>
-  
-<synopsis><code mime="text/x-gjs">
-function static_method(x:Number):Number {
+  <title>Regress.TestObj.static_method</title>
+  <synopsis><code mime="text/x-gjs">
+function static_method(x: Number(gint)): Number(gdouble) {
     // Gjs wrapper for regress_test_obj_static_method()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>x</code></title>
@@ -45,6 +37,4 @@ function static_method(x:Number):Number {
 </item>
 </terms>
 
-  
-  
 </page>
index 13e917e..57371f2 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>static_method_callback</title>
-  
-<synopsis><code mime="text/x-gjs">
-function static_method_callback(callback:Regress.TestCallback):void {
+  <title>Regress.TestObj.static_method_callback</title>
+  <synopsis><code mime="text/x-gjs">
+function static_method_callback(callback: <link xref="Regress.TestCallback">Regress.TestCallback</link>): void {
     // Gjs wrapper for regress_test_obj_static_method_callback()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -41,6 +33,4 @@ function static_method_callback(callback:Regress.TestCallback):void {
 </item>
 </terms>
 
-  
-  
 </page>
index 78bf63b..050a326 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
@@ -14,7 +13,7 @@
       </api:returns>
       <api:name>regress_test_obj_torture_signature_0</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>x</api:name>
       </api:arg>
       <api:arg>
         <api:name>foo</api:name>
       </api:arg>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(guint)</api:type>
         <api:name>m</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestObj.prototype.torture_signature_0</title>
-  
-<synopsis><code mime="text/x-gjs">
-function torture_signature_0(x:Number, foo:String, m:Number):void {
+  <synopsis><code mime="text/x-gjs">
+function torture_signature_0(x: Number(gint), foo: String, m: Number(guint)): [y: Number(gdouble), z: Number(gint), q: Number(gint)] {
     // Gjs wrapper for regress_test_obj_torture_signature_0()
 }
-</code></synopsis>
-
-  
-    
-  
-  
-  
-  
+  </code></synopsis>
+
+
 <terms>
 <item>
 <title><code>x</code></title>
@@ -55,8 +47,18 @@ function torture_signature_0(x:Number, foo:String, m:Number):void {
 <title><code>m</code></title>
 
 </item>
+<item>
+<title><code>y</code></title>
+
+</item>
+<item>
+<title><code>z</code></title>
+
+</item>
+<item>
+<title><code>q</code></title>
+
+</item>
 </terms>
 
-  
-  
 </page>
index 553ddd2..378efdc 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
@@ -14,7 +13,7 @@
       </api:returns>
       <api:name>regress_test_obj_torture_signature_1</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>x</api:name>
       </api:arg>
       <api:arg>
         <api:name>foo</api:name>
       </api:arg>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(guint)</api:type>
         <api:name>m</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestObj.prototype.torture_signature_1</title>
-  
-<synopsis><code mime="text/x-gjs">
-function torture_signature_1(x:Number, foo:String, m:Number):Boolean {
+  <synopsis><code mime="text/x-gjs">
+function torture_signature_1(x: Number(gint), foo: String, m: Number(guint)): [ok: Boolean, y: Number(gdouble), z: Number(gint), q: Number(gint)] {
     // Gjs wrapper for regress_test_obj_torture_signature_1()
 }
-</code></synopsis>
+  </code></synopsis>
+  <p>This function throws an error if m is odd.</p>
 
-  
-    <p>This function throws an error if m is odd.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>x</code></title>
@@ -56,11 +48,21 @@ function torture_signature_1(x:Number, foo:String, m:Number):Boolean {
 
 </item>
 <item>
-<title><code>Returns</code></title>
+<title><code>ok</code></title>
+
+</item>
+<item>
+<title><code>y</code></title>
+
+</item>
+<item>
+<title><code>z</code></title>
+
+</item>
+<item>
+<title><code>q</code></title>
 
 </item>
 </terms>
 
-  
-  
 </page>
index 858e58a..da0844e 100644 (file)
@@ -1,24 +1,16 @@
 <?xml version="1.0"?>
 <page id="Regress.TestOtherError"
-      type="topic"
+      type="guide"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.TestOtherError</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
 <terms>
 <item>
 <title><code>TestOtherError.CODE1</code></title>
@@ -33,7 +25,9 @@
 
 </item>
 </terms>
-
-  
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
index d75b6aa..98efd78 100644 (file)
@@ -6,30 +6,22 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.TestOtherError" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>GLib.Quark</api:type>
       </api:returns>
       <api:name>regress_test_unconventional_error_quark</api:name>
     </api:function>
-
   </info>
-  <title>quark</title>
-  
-<synopsis><code mime="text/x-gjs">
-function quark():GLib.Quark {
+  <title>Regress.TestOtherError.quark</title>
+  <synopsis><code mime="text/x-gjs">
+function quark(): <link href="../GLib-2.0/GLib.Quark.html">GLib.Quark</link> {
     // Gjs wrapper for regress_test_unconventional_error_quark()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function quark():GLib.Quark {
 </item>
 </terms>
 
-  
-  
 </page>
index 66b477d..b4cf900 100644 (file)
@@ -1,25 +1,29 @@
 <?xml version="1.0"?>
 <page id="Regress.TestPrivateEnum"
-      type="topic"
-      style="default"
+      type="guide"
+      style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.TestPrivateEnum</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+<terms>
+<item>
+<title><code>TestPrivateEnum.PUBLIC_ENUM_BEFORE</code></title>
+
+</item>
+<item>
+<title><code>TestPrivateEnum.PUBLIC_ENUM_AFTER</code></title>
+
+</item>
+</terms>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateStruct-this_is_public_after.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateStruct-this_is_public_after.page
new file mode 100644 (file)
index 0000000..812c2f9
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestPrivateStruct-this_is_public_after"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestPrivateStruct" group="field" type="guide"/>
+    <title type="link" role="topic">this_is_public_after</title>
+  </info>
+  <title>Regress.TestPrivateStruct.this_is_public_after</title>
+  <synopsis><code mime="text/x-gjs">
+TestPrivateStruct.this_is_public_after: Number(gint) (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateStruct-this_is_public_before.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateStruct-this_is_public_before.page
new file mode 100644 (file)
index 0000000..465be84
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestPrivateStruct-this_is_public_before"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestPrivateStruct" group="field" type="guide"/>
+    <title type="link" role="topic">this_is_public_before</title>
+  </info>
+  <title>Regress.TestPrivateStruct.this_is_public_before</title>
+  <synopsis><code mime="text/x-gjs">
+TestPrivateStruct.this_is_public_before: Number(gint) (Read / Write)
+  </code></synopsis>
+
+
+</page>
index 7b1309d..7ce2a7c 100644 (file)
@@ -1,25 +1,43 @@
 <?xml version="1.0"?>
 <page id="Regress.TestPrivateStruct"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestPrivateStruct</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let testPrivateStruct = new Regress.TestPrivateStruct({
+    <link xref='Regress.TestPrivateStruct-this_is_public_before'>this_is_public_before</link>: value
+    <link xref='Regress.TestPrivateStruct-this_is_public_after'>this_is_public_after</link>: value
+});
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 2c8b1ab..2394ff1 100644 (file)
@@ -1,24 +1,16 @@
 <?xml version="1.0"?>
 <page id="Regress.TestReferenceEnum"
-      type="topic"
+      type="guide"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.TestReferenceEnum</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
 <terms>
 <item>
 <title><code>TestReferenceEnum.0</code></title>
@@ -45,7 +37,9 @@
 
 </item>
 </terms>
-
-  
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA-some_double.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA-some_double.page
new file mode 100644 (file)
index 0000000..bbbc3a2
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestSimpleBoxedA-some_double"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestSimpleBoxedA" group="field" type="guide"/>
+    <title type="link" role="topic">some_double</title>
+  </info>
+  <title>Regress.TestSimpleBoxedA.some_double</title>
+  <synopsis><code mime="text/x-gjs">
+TestSimpleBoxedA.some_double: Number(gdouble) (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA-some_enum.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA-some_enum.page
new file mode 100644 (file)
index 0000000..770423f
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestSimpleBoxedA-some_enum"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestSimpleBoxedA" group="field" type="guide"/>
+    <title type="link" role="topic">some_enum</title>
+  </info>
+  <title>Regress.TestSimpleBoxedA.some_enum</title>
+  <synopsis><code mime="text/x-gjs">
+TestSimpleBoxedA.some_enum: <link xref="Regress.TestEnum">Regress.TestEnum</link> (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA-some_int.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA-some_int.page
new file mode 100644 (file)
index 0000000..03d94f6
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestSimpleBoxedA-some_int"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestSimpleBoxedA" group="field" type="guide"/>
+    <title type="link" role="topic">some_int</title>
+  </info>
+  <title>Regress.TestSimpleBoxedA.some_int</title>
+  <synopsis><code mime="text/x-gjs">
+TestSimpleBoxedA.some_int: Number(gint) (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA-some_int8.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA-some_int8.page
new file mode 100644 (file)
index 0000000..ec643f6
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestSimpleBoxedA-some_int8"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestSimpleBoxedA" group="field" type="guide"/>
+    <title type="link" role="topic">some_int8</title>
+  </info>
+  <title>Regress.TestSimpleBoxedA.some_int8</title>
+  <synopsis><code mime="text/x-gjs">
+TestSimpleBoxedA.some_int8: Number(gint8) (Read / Write)
+  </code></synopsis>
+
+
+</page>
index 7f5dfde..d096c27 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestSimpleBoxedA" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_simple_boxed_a_const_return</api:name>
     </api:function>
-
   </info>
-  <title>const_return</title>
-  
-<synopsis><code mime="text/x-gjs">
-function const_return():Regress.TestSimpleBoxedA {
+  <title>Regress.TestSimpleBoxedA.const_return</title>
+  <synopsis><code mime="text/x-gjs">
+function const_return(): <link xref="Regress.TestSimpleBoxedA">Regress.TestSimpleBoxedA</link> {
     // Gjs wrapper for regress_test_simple_boxed_a_const_return()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function const_return():Regress.TestSimpleBoxedA {
 </item>
 </terms>
 
-  
-  
 </page>
index 6aa0974..c5d349b 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestSimpleBoxedA" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_simple_boxed_a_copy</api:name>
     </api:function>
-
   </info>
   <title>Regress.TestSimpleBoxedA.prototype.copy</title>
-  
-<synopsis><code mime="text/x-gjs">
-function copy():Regress.TestSimpleBoxedA {
+  <synopsis><code mime="text/x-gjs">
+function copy(): <link xref="Regress.TestSimpleBoxedA">Regress.TestSimpleBoxedA</link> {
     // Gjs wrapper for regress_test_simple_boxed_a_copy()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function copy():Regress.TestSimpleBoxedA {
 </item>
 </terms>
 
-  
-  
 </page>
index 52e5877..7420b30 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestSimpleBoxedA" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>other_a</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestSimpleBoxedA.prototype.equals</title>
-  
-<synopsis><code mime="text/x-gjs">
-function equals(other_a:Regress.TestSimpleBoxedA):Boolean {
+  <synopsis><code mime="text/x-gjs">
+function equals(other_a: <link xref="Regress.TestSimpleBoxedA">Regress.TestSimpleBoxedA</link>): Boolean {
     // Gjs wrapper for regress_test_simple_boxed_a_equals()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>other_a</code></title>
@@ -45,6 +37,4 @@ function equals(other_a:Regress.TestSimpleBoxedA):Boolean {
 </item>
 </terms>
 
-  
-  
 </page>
index 9117ddb..1ba157a 100644 (file)
@@ -1,25 +1,45 @@
 <?xml version="1.0"?>
 <page id="Regress.TestSimpleBoxedA"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestSimpleBoxedA</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let testSimpleBoxedA = new Regress.TestSimpleBoxedA({
+    <link xref='Regress.TestSimpleBoxedA-some_int'>some_int</link>: value
+    <link xref='Regress.TestSimpleBoxedA-some_int8'>some_int8</link>: value
+    <link xref='Regress.TestSimpleBoxedA-some_double'>some_double</link>: value
+    <link xref='Regress.TestSimpleBoxedA-some_enum'>some_enum</link>: value
+});
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB-nested_a.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB-nested_a.page
new file mode 100644 (file)
index 0000000..932f958
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestSimpleBoxedB-nested_a"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestSimpleBoxedB" group="field" type="guide"/>
+    <title type="link" role="topic">nested_a</title>
+  </info>
+  <title>Regress.TestSimpleBoxedB.nested_a</title>
+  <synopsis><code mime="text/x-gjs">
+TestSimpleBoxedB.nested_a: <link xref="Regress.TestSimpleBoxedA">Regress.TestSimpleBoxedA</link> (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB-some_int8.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB-some_int8.page
new file mode 100644 (file)
index 0000000..9238e12
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestSimpleBoxedB-some_int8"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestSimpleBoxedB" group="field" type="guide"/>
+    <title type="link" role="topic">some_int8</title>
+  </info>
+  <title>Regress.TestSimpleBoxedB.some_int8</title>
+  <synopsis><code mime="text/x-gjs">
+TestSimpleBoxedB.some_int8: Number(gint8) (Read / Write)
+  </code></synopsis>
+
+
+</page>
index b1bd51a..7c6abac 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestSimpleBoxedB" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_simple_boxed_b_copy</api:name>
     </api:function>
-
   </info>
   <title>Regress.TestSimpleBoxedB.prototype.copy</title>
-  
-<synopsis><code mime="text/x-gjs">
-function copy():Regress.TestSimpleBoxedB {
+  <synopsis><code mime="text/x-gjs">
+function copy(): <link xref="Regress.TestSimpleBoxedB">Regress.TestSimpleBoxedB</link> {
     // Gjs wrapper for regress_test_simple_boxed_b_copy()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function copy():Regress.TestSimpleBoxedB {
 </item>
 </terms>
 
-  
-  
 </page>
index 7ecc623..34d830a 100644 (file)
@@ -1,25 +1,43 @@
 <?xml version="1.0"?>
 <page id="Regress.TestSimpleBoxedB"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestSimpleBoxedB</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let testSimpleBoxedB = new Regress.TestSimpleBoxedB({
+    <link xref='Regress.TestSimpleBoxedB-some_int8'>some_int8</link>: value
+    <link xref='Regress.TestSimpleBoxedB-nested_a'>nested_a</link>: value
+});
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index f815782..6e31d3d 100644 (file)
@@ -1,25 +1,19 @@
 <?xml version="1.0"?>
 <page id="Regress.TestSimpleCallback"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="callback" type="guide"/>
   </info>
   <title>Regress.TestSimpleCallback</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-gjs">
+function onTestSimpleCallback(): void {
+}
+  </code></synopsis>
+
+
+
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA-some_double.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA-some_double.page
new file mode 100644 (file)
index 0000000..d305919
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructA-some_double"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructA" group="field" type="guide"/>
+    <title type="link" role="topic">some_double</title>
+  </info>
+  <title>Regress.TestStructA.some_double</title>
+  <synopsis><code mime="text/x-gjs">
+TestStructA.some_double: Number(gdouble) (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA-some_enum.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA-some_enum.page
new file mode 100644 (file)
index 0000000..80dd331
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructA-some_enum"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructA" group="field" type="guide"/>
+    <title type="link" role="topic">some_enum</title>
+  </info>
+  <title>Regress.TestStructA.some_enum</title>
+  <synopsis><code mime="text/x-gjs">
+TestStructA.some_enum: <link xref="Regress.TestEnum">Regress.TestEnum</link> (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA-some_int.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA-some_int.page
new file mode 100644 (file)
index 0000000..ab7790d
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructA-some_int"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructA" group="field" type="guide"/>
+    <title type="link" role="topic">some_int</title>
+  </info>
+  <title>Regress.TestStructA.some_int</title>
+  <synopsis><code mime="text/x-gjs">
+TestStructA.some_int: Number(gint) (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA-some_int8.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA-some_int8.page
new file mode 100644 (file)
index 0000000..0e1611e
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructA-some_int8"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructA" group="field" type="guide"/>
+    <title type="link" role="topic">some_int8</title>
+  </info>
+  <title>Regress.TestStructA.some_int8</title>
+  <synopsis><code mime="text/x-gjs">
+TestStructA.some_int8: Number(gint8) (Read / Write)
+  </code></synopsis>
+
+
+</page>
index ded4a79..0be40a4 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestStructA" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_struct_a_clone</api:name>
     </api:function>
-
   </info>
   <title>Regress.TestStructA.prototype.clone</title>
-  
-<synopsis><code mime="text/x-gjs">
-function clone():void {
+  <synopsis><code mime="text/x-gjs">
+function clone(): <link xref="Regress.TestStructA">Regress.TestStructA</link> {
     // Gjs wrapper for regress_test_struct_a_clone()
 }
-</code></synopsis>
+  </code></synopsis>
+  <p>Make a copy of a RegressTestStructA</p>
 
-  
-    <p>Make a copy of a RegressTestStructA</p>
-  
-  
-  
-  
 <terms>
+<item>
+<title><code>Returns</code></title>
+  <p>the cloned structure</p>
+</item>
 </terms>
 
-  
-  
 </page>
index a6a9817..3f27491 100644 (file)
@@ -1,25 +1,45 @@
 <?xml version="1.0"?>
 <page id="Regress.TestStructA"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestStructA</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let testStructA = new Regress.TestStructA({
+    <link xref='Regress.TestStructA-some_int'>some_int</link>: value
+    <link xref='Regress.TestStructA-some_int8'>some_int8</link>: value
+    <link xref='Regress.TestStructA-some_double'>some_double</link>: value
+    <link xref='Regress.TestStructA-some_enum'>some_enum</link>: value
+});
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 38406e6..6904c43 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestStructA" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>string</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>parse</title>
-  
-<synopsis><code mime="text/x-gjs">
-function parse(string:String):void {
+  <title>Regress.TestStructA.parse</title>
+  <synopsis><code mime="text/x-gjs">
+function parse(string: String): <link xref="Regress.TestStructA">Regress.TestStructA</link> {
     // Gjs wrapper for regress_test_struct_a_parse()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>string</code></title>
-<p>ignored</p>
+  <p>ignored</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+  <p>the structure that is to be filled</p>
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB-nested_a.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB-nested_a.page
new file mode 100644 (file)
index 0000000..4f414af
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructB-nested_a"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructB" group="field" type="guide"/>
+    <title type="link" role="topic">nested_a</title>
+  </info>
+  <title>Regress.TestStructB.nested_a</title>
+  <synopsis><code mime="text/x-gjs">
+TestStructB.nested_a: <link xref="Regress.TestStructA">Regress.TestStructA</link> (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB-some_int8.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB-some_int8.page
new file mode 100644 (file)
index 0000000..ba646c6
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructB-some_int8"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructB" group="field" type="guide"/>
+    <title type="link" role="topic">some_int8</title>
+  </info>
+  <title>Regress.TestStructB.some_int8</title>
+  <synopsis><code mime="text/x-gjs">
+TestStructB.some_int8: Number(gint8) (Read / Write)
+  </code></synopsis>
+
+
+</page>
index 20278cd..93b9d45 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestStructB" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_struct_b_clone</api:name>
     </api:function>
-
   </info>
   <title>Regress.TestStructB.prototype.clone</title>
-  
-<synopsis><code mime="text/x-gjs">
-function clone():void {
+  <synopsis><code mime="text/x-gjs">
+function clone(): <link xref="Regress.TestStructB">Regress.TestStructB</link> {
     // Gjs wrapper for regress_test_struct_b_clone()
 }
-</code></synopsis>
+  </code></synopsis>
+  <p>Make a copy of a RegressTestStructB</p>
 
-  
-    <p>Make a copy of a RegressTestStructB</p>
-  
-  
-  
-  
 <terms>
+<item>
+<title><code>Returns</code></title>
+  <p>the cloned structure</p>
+</item>
 </terms>
 
-  
-  
 </page>
index 21d8626..0fa28db 100644 (file)
@@ -1,25 +1,43 @@
 <?xml version="1.0"?>
 <page id="Regress.TestStructB"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestStructB</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let testStructB = new Regress.TestStructB({
+    <link xref='Regress.TestStructB-some_int8'>some_int8</link>: value
+    <link xref='Regress.TestStructB-nested_a'>nested_a</link>: value
+});
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC-another_int.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC-another_int.page
new file mode 100644 (file)
index 0000000..b8f022f
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructC-another_int"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructC" group="field" type="guide"/>
+    <title type="link" role="topic">another_int</title>
+  </info>
+  <title>Regress.TestStructC.another_int</title>
+  <synopsis><code mime="text/x-gjs">
+TestStructC.another_int: Number(gint) (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC-obj.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC-obj.page
new file mode 100644 (file)
index 0000000..1ead3fc
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructC-obj"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructC" group="field" type="guide"/>
+    <title type="link" role="topic">obj</title>
+  </info>
+  <title>Regress.TestStructC.obj</title>
+  <synopsis><code mime="text/x-gjs">
+TestStructC.obj: <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link> (Read)
+  </code></synopsis>
+
+
+</page>
index 6bd5812..82e0ae4 100644 (file)
@@ -1,25 +1,42 @@
 <?xml version="1.0"?>
 <page id="Regress.TestStructC"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestStructC</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let testStructC = new Regress.TestStructC({
+    <link xref='Regress.TestStructC-another_int'>another_int</link>: value
+});
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-array1.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-array1.page
new file mode 100644 (file)
index 0000000..d957af3
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructD-array1"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructD" group="field" type="guide"/>
+    <title type="link" role="topic">array1</title>
+  </info>
+  <title>Regress.TestStructD.array1</title>
+  <synopsis><code mime="text/x-gjs">
+TestStructD.array1: Array(<link xref="Regress.TestStructA">Regress.TestStructA</link>) (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-array2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-array2.page
new file mode 100644 (file)
index 0000000..13d7e87
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructD-array2"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructD" group="field" type="guide"/>
+    <title type="link" role="topic">array2</title>
+  </info>
+  <title>Regress.TestStructD.array2</title>
+  <synopsis><code mime="text/x-gjs">
+TestStructD.array2: Array(<link xref="Regress.TestObj">Regress.TestObj</link>) (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-field.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-field.page
new file mode 100644 (file)
index 0000000..4797612
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructD-field"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructD" group="field" type="guide"/>
+    <title type="link" role="topic">field</title>
+  </info>
+  <title>Regress.TestStructD.field</title>
+  <synopsis><code mime="text/x-gjs">
+TestStructD.field: <link xref="Regress.TestObj">Regress.TestObj</link> (Read)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-garray.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-garray.page
new file mode 100644 (file)
index 0000000..1eca3f3
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructD-garray"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructD" group="field" type="guide"/>
+    <title type="link" role="topic">garray</title>
+  </info>
+  <title>Regress.TestStructD.garray</title>
+  <synopsis><code mime="text/x-gjs">
+TestStructD.garray: Array(<link xref="Regress.TestObj">Regress.TestObj</link>) (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-list.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-list.page
new file mode 100644 (file)
index 0000000..655b312
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructD-list"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructD" group="field" type="guide"/>
+    <title type="link" role="topic">list</title>
+  </info>
+  <title>Regress.TestStructD.list</title>
+  <synopsis><code mime="text/x-gjs">
+TestStructD.list: Array(<link xref="Regress.TestObj">Regress.TestObj</link>) (Read / Write)
+  </code></synopsis>
+
+
+</page>
index aa9f131..b8222c8 100644 (file)
@@ -1,25 +1,45 @@
 <?xml version="1.0"?>
 <page id="Regress.TestStructD"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestStructD</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let testStructD = new Regress.TestStructD({
+    <link xref='Regress.TestStructD-array1'>array1</link>: value
+    <link xref='Regress.TestStructD-array2'>array2</link>: value
+    <link xref='Regress.TestStructD-list'>list</link>: value
+    <link xref='Regress.TestStructD-garray'>garray</link>: value
+});
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE-some_type.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE-some_type.page
new file mode 100644 (file)
index 0000000..74909cf
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructE-some_type"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructE" group="field" type="guide"/>
+    <title type="link" role="topic">some_type</title>
+  </info>
+  <title>Regress.TestStructE.some_type</title>
+  <synopsis><code mime="text/x-gjs">
+TestStructE.some_type: GObject.Type (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE-some_union.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE-some_union.page
new file mode 100644 (file)
index 0000000..cafd678
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructE-some_union"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructE" group="field" type="guide"/>
+    <title type="link" role="topic">some_union</title>
+  </info>
+  <title>Regress.TestStructE.some_union</title>
+  <synopsis><code mime="text/x-gjs">
+TestStructE.some_union: Array(<link xref="Regress.TestStructE__some_union__union">Regress.TestStructE__some_union__union</link>) (Read / Write)
+  </code></synopsis>
+
+
+</page>
index b931c36..788803f 100644 (file)
@@ -1,25 +1,43 @@
 <?xml version="1.0"?>
 <page id="Regress.TestStructE"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestStructE</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let testStructE = new Regress.TestStructE({
+    <link xref='Regress.TestStructE-some_type'>some_type</link>: value
+    <link xref='Regress.TestStructE-some_union'>some_union</link>: value
+});
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 3b81e62..493e96d 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.TestStructE__some_union__union"
-      type="topic"
-      style="default"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestStructE__some_union__union</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let testStructE__some_union__union = new Regress.TestStructE__some_union__union();
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data1.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data1.page
new file mode 100644 (file)
index 0000000..8b5d725
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructF-data1"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructF" group="field" type="guide"/>
+    <title type="link" role="topic">data1</title>
+  </info>
+  <title>Regress.TestStructF.data1</title>
+  <synopsis><code mime="text/x-gjs">
+TestStructF.data1: Number(gint) (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data2.page
new file mode 100644 (file)
index 0000000..0c49cda
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructF-data2"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructF" group="field" type="guide"/>
+    <title type="link" role="topic">data2</title>
+  </info>
+  <title>Regress.TestStructF.data2</title>
+  <synopsis><code mime="text/x-gjs">
+TestStructF.data2: Number(gint) (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data3.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data3.page
new file mode 100644 (file)
index 0000000..7c14530
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructF-data3"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructF" group="field" type="guide"/>
+    <title type="link" role="topic">data3</title>
+  </info>
+  <title>Regress.TestStructF.data3</title>
+  <synopsis><code mime="text/x-gjs">
+TestStructF.data3: Number(gint) (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data4.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data4.page
new file mode 100644 (file)
index 0000000..8783146
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructF-data4"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructF" group="field" type="guide"/>
+    <title type="link" role="topic">data4</title>
+  </info>
+  <title>Regress.TestStructF.data4</title>
+  <synopsis><code mime="text/x-gjs">
+TestStructF.data4: Number(gint) (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data5.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data5.page
new file mode 100644 (file)
index 0000000..84f5878
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructF-data5"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructF" group="field" type="guide"/>
+    <title type="link" role="topic">data5</title>
+  </info>
+  <title>Regress.TestStructF.data5</title>
+  <synopsis><code mime="text/x-gjs">
+TestStructF.data5: Number(gint) (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data6.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data6.page
new file mode 100644 (file)
index 0000000..6662c2e
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructF-data6"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructF" group="field" type="guide"/>
+    <title type="link" role="topic">data6</title>
+  </info>
+  <title>Regress.TestStructF.data6</title>
+  <synopsis><code mime="text/x-gjs">
+TestStructF.data6: Number(gint) (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-ref_count.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-ref_count.page
new file mode 100644 (file)
index 0000000..85be6dd
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructF-ref_count"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructF" group="field" type="guide"/>
+    <title type="link" role="topic">ref_count</title>
+  </info>
+  <title>Regress.TestStructF.ref_count</title>
+  <synopsis><code mime="text/x-gjs">
+TestStructF.ref_count: Number(gint) (Read / Write)
+  </code></synopsis>
+
+
+</page>
index cfb434b..feae9a2 100644 (file)
@@ -1,25 +1,48 @@
 <?xml version="1.0"?>
 <page id="Regress.TestStructF"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestStructF</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let testStructF = new Regress.TestStructF({
+    <link xref='Regress.TestStructF-ref_count'>ref_count</link>: value
+    <link xref='Regress.TestStructF-data1'>data1</link>: value
+    <link xref='Regress.TestStructF-data2'>data2</link>: value
+    <link xref='Regress.TestStructF-data3'>data3</link>: value
+    <link xref='Regress.TestStructF-data4'>data4</link>: value
+    <link xref='Regress.TestStructF-data5'>data5</link>: value
+    <link xref='Regress.TestStructF-data6'>data6</link>: value
+});
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray-array.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray-array.page
new file mode 100644 (file)
index 0000000..b065f89
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructFixedArray-array"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructFixedArray" group="field" type="guide"/>
+    <title type="link" role="topic">array</title>
+  </info>
+  <title>Regress.TestStructFixedArray.array</title>
+  <synopsis><code mime="text/x-gjs">
+TestStructFixedArray.array: Array(Number(gint)) (Read / Write)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray-just_int.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray-just_int.page
new file mode 100644 (file)
index 0000000..75e1e60
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructFixedArray-just_int"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructFixedArray" group="field" type="guide"/>
+    <title type="link" role="topic">just_int</title>
+  </info>
+  <title>Regress.TestStructFixedArray.just_int</title>
+  <synopsis><code mime="text/x-gjs">
+TestStructFixedArray.just_int: Number(gint) (Read / Write)
+  </code></synopsis>
+
+
+</page>
index f0edd05..4896e33 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestStructFixedArray" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_struct_fixed_array_frob</api:name>
     </api:function>
-
   </info>
   <title>Regress.TestStructFixedArray.prototype.frob</title>
-  
-<synopsis><code mime="text/x-gjs">
-function frob():void {
+  <synopsis><code mime="text/x-gjs">
+function frob(): void {
     // Gjs wrapper for regress_test_struct_fixed_array_frob()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-<terms>
-</terms>
 
-  
-  
 </page>
index db6e789..12b81be 100644 (file)
@@ -1,25 +1,43 @@
 <?xml version="1.0"?>
 <page id="Regress.TestStructFixedArray"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestStructFixedArray</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let testStructFixedArray = new Regress.TestStructFixedArray({
+    <link xref='Regress.TestStructFixedArray-just_int'>just_int</link>: value
+    <link xref='Regress.TestStructFixedArray-array'>array</link>: value
+});
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 26fc790..f2ff527 100644 (file)
@@ -6,30 +6,22 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestSubObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_test_sub_obj_instance_method</api:name>
     </api:function>
-
   </info>
   <title>Regress.TestSubObj.prototype.instance_method</title>
-  
-<synopsis><code mime="text/x-gjs">
-function instance_method():Number {
+  <synopsis><code mime="text/x-gjs">
+function instance_method(): Number(gint) {
     // Gjs wrapper for regress_test_sub_obj_instance_method()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function instance_method():Number {
 </item>
 </terms>
 
-  
-  
 </page>
index 31deab7..833ed23 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestSubObj" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_sub_obj_new</api:name>
     </api:function>
-
   </info>
   <title>Regress.TestSubObj.new</title>
-  
-<synopsis><code mime="text/x-gjs">
-function new():Regress.TestObj {
+  <synopsis><code mime="text/x-gjs">
+function new(): <link xref="Regress.TestObj">Regress.TestObj</link> {
     // Gjs wrapper for regress_test_sub_obj_new()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function new():Regress.TestObj {
 </item>
 </terms>
 
-  
-  
 </page>
index 7147da1..d9f0885 100644 (file)
@@ -6,24 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestSubObj</title>
-  
   <synopsis><code>
 const Regress = imports.gi.Regress;
 
-let test_sub_obj = new Regress.TestSubObj();
+let testSubObj = new Regress.TestSubObj();
   </code></synopsis>
 
-  
-    
-  
-  
-  
-  
+
   <synopsis>
     <title>Hierarchy</title>
     <tree>
@@ -38,8 +30,11 @@ let test_sub_obj = new Regress.TestSubObj();
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-gjs"
          groups="method" style="linklist">
@@ -48,7 +43,7 @@ let test_sub_obj = new Regress.TestSubObj();
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-gjs"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
@@ -59,8 +54,10 @@ let test_sub_obj = new Regress.TestSubObj();
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
index a632f8f..c2f4aa7 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestSubObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_sub_obj_unset_bare</api:name>
     </api:function>
-
   </info>
   <title>Regress.TestSubObj.prototype.unset_bare</title>
-  
-<synopsis><code mime="text/x-gjs">
-function unset_bare():void {
+  <synopsis><code mime="text/x-gjs">
+function unset_bare(): void {
     // Gjs wrapper for regress_test_sub_obj_unset_bare()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-<terms>
-</terms>
 
-  
-  
 </page>
index e0a7bc0..fcb2f3b 100644 (file)
@@ -6,20 +6,9 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="default" type="guide"/>
   </info>
   <title>Regress.TestTypeGUInt64</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
index 256dbb6..90d74f6 100644 (file)
@@ -6,24 +6,13 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestWi8021x" group="property" type="guide"/>
     <title type="link" role="topic">testbool</title>
-
   </info>
-  <title>Regress.TestWi8021x:testbool</title>
-  
-<synopsis><code mime="text/x-python">
-"testbool"             Boolean                : Read / Write
-</code></synopsis>
+  <title>Regress.TestWi8021x.testbool</title>
+  <synopsis><code mime="text/x-gjs">
+TestWi8021x.testbool: Boolean (Read / Write)
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-  
-  
-  
 </page>
index e42b0d7..3d83f91 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestWi8021x" group="method" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_wi_802_1x_get_testbool</api:name>
     </api:function>
-
   </info>
   <title>Regress.TestWi8021x.prototype.get_testbool</title>
-  
-<synopsis><code mime="text/x-gjs">
-function get_testbool():Boolean {
+  <synopsis><code mime="text/x-gjs">
+function get_testbool(): Boolean {
     // Gjs wrapper for regress_test_wi_802_1x_get_testbool()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function get_testbool():Boolean {
 </item>
 </terms>
 
-  
-  
 </page>
index b8b162c..3d041a1 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestWi8021x" group="constructor" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_wi_802_1x_new</api:name>
     </api:function>
-
   </info>
   <title>Regress.TestWi8021x.new</title>
-  
-<synopsis><code mime="text/x-gjs">
-function new():Regress.TestWi8021x {
+  <synopsis><code mime="text/x-gjs">
+function new(): <link xref="Regress.TestWi8021x">Regress.TestWi8021x</link> {
     // Gjs wrapper for regress_test_wi_802_1x_new()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function new():Regress.TestWi8021x {
 </item>
 </terms>
 
-  
-  
 </page>
index d69548f..eb70245 100644 (file)
@@ -6,26 +6,17 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestWi8021x</title>
-  
   <synopsis><code>
 const Regress = imports.gi.Regress;
 
-let test_wi8021x = new Regress.TestWi8021x({
-    <link xref='Regress.TestWi8021x-testbool'>testbool</link>: value,
+let testWi8021x = new Regress.TestWi8021x({
 });
   </code></synopsis>
 
-  
-    
-  
-  
-  
-  
+
   <synopsis>
     <title>Hierarchy</title>
     <tree>
@@ -37,8 +28,11 @@ let test_wi8021x = new Regress.TestWi8021x({
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-gjs"
          groups="method" style="linklist">
@@ -47,7 +41,7 @@ let test_wi8021x = new Regress.TestWi8021x({
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-gjs"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
@@ -58,8 +52,10 @@ let test_wi8021x = new Regress.TestWi8021x({
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
index e052ed5..0c42f37 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestWi8021x" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>v</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestWi8021x.prototype.set_testbool</title>
-  
-<synopsis><code mime="text/x-gjs">
-function set_testbool(v:Boolean):void {
+  <synopsis><code mime="text/x-gjs">
+function set_testbool(v: Boolean): void {
     // Gjs wrapper for regress_test_wi_802_1x_set_testbool()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>v</code></title>
@@ -41,6 +33,4 @@ function set_testbool(v:Boolean):void {
 </item>
 </terms>
 
-  
-  
 </page>
index ccfe04c..1771833 100644 (file)
@@ -6,34 +6,26 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestWi8021x" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_test_wi_802_1x_static_method</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>x</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>static_method</title>
-  
-<synopsis><code mime="text/x-gjs">
-function static_method(x:Number):Number {
+  <title>Regress.TestWi8021x.static_method</title>
+  <synopsis><code mime="text/x-gjs">
+function static_method(x: Number(gint)): Number(gint) {
     // Gjs wrapper for regress_test_wi_802_1x_static_method()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>x</code></title>
@@ -45,6 +37,4 @@ function static_method(x:Number):Number {
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.UTF8_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.UTF8_CONSTANT.page
new file mode 100644 (file)
index 0000000..343ad00
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.UTF8_CONSTANT"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.UTF8_CONSTANT</title>
+
+
+</page>
index de2b93b..ebc301c 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_aliased_caller_alloc</api:name>
     </api:function>
-
   </info>
-  <title>aliased_caller_alloc</title>
-  
-<synopsis><code mime="text/x-gjs">
-function aliased_caller_alloc():void {
+  <title>Regress.aliased_caller_alloc</title>
+  <synopsis><code mime="text/x-gjs">
+function aliased_caller_alloc(): <link xref="Regress.AliasedTestBoxed">Regress.AliasedTestBoxed</link> {
     // Gjs wrapper for regress_aliased_caller_alloc()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
 </terms>
 
-  
-  
 </page>
index 8f00a10..da3a39c 100644 (file)
@@ -6,11 +6,10 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_annotation_attribute_func</api:name>
       <api:arg>
         <api:name>data</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>annotation_attribute_func</title>
-  
-<synopsis><code mime="text/x-gjs">
-function annotation_attribute_func(object:Regress.AnnotationObject, data:String):Number {
+  <title>Regress.annotation_attribute_func</title>
+  <synopsis><code mime="text/x-gjs">
+function annotation_attribute_func(object: <link xref="Regress.AnnotationObject">Regress.AnnotationObject</link>, data: String): Number(gint) {
     // Gjs wrapper for regress_annotation_attribute_func()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
-<p>A <link xref="Regress.AnnotationObject"/>.</p>
+  <p>A <link xref="Regress.AnnotationObject"/>.</p>
 </item>
 <item>
 <title><code>data</code></title>
-<p>Some data.</p>
+  <p>Some data.</p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>The return value.</p>
+  <p>The return value.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index c3e9653..cf5bc93 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>annotation_custom_destroy</title>
-  
-<synopsis><code mime="text/x-gjs">
-function annotation_custom_destroy(callback:Regress.AnnotationCallback):void {
+  <title>Regress.annotation_custom_destroy</title>
+  <synopsis><code mime="text/x-gjs">
+function annotation_custom_destroy(callback: <link xref="Regress.AnnotationCallback">Regress.AnnotationCallback</link>): void {
     // Gjs wrapper for regress_annotation_custom_destroy()
 }
-</code></synopsis>
-
-  
-    <p>Test messing up the heuristic of closure/destroy-notification
+  </code></synopsis>
+  <p>Test messing up the heuristic of closure/destroy-notification
 detection, and fixing it via annotations.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>callback</code></title>
-<p>Destroy notification</p>
+  <p>Destroy notification</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 39f6c14..d86c65e 100644 (file)
@@ -6,37 +6,27 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>filename</api:type>
+        <api:type>String</api:type>
       </api:returns>
       <api:name>regress_annotation_get_source_file</api:name>
     </api:function>
-
   </info>
-  <title>annotation_get_source_file</title>
-  
-<synopsis><code mime="text/x-gjs">
-function annotation_get_source_file():filename {
+  <title>Regress.annotation_get_source_file</title>
+  <synopsis><code mime="text/x-gjs">
+function annotation_get_source_file(): String {
     // Gjs wrapper for regress_annotation_get_source_file()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>Source file</p>
+  <p>Source file</p>
 </item>
 </terms>
 
-  
-  
 </page>
index c75d9c2..2cd2a0e 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_init</api:name>
       <api:arg>
-        <api:type>[String]</api:type>
+        <api:type>Array(String)</api:type>
         <api:name>argv</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>annotation_init</title>
-  
-<synopsis><code mime="text/x-gjs">
-function annotation_init(argv:[String]):void {
+  <title>Regress.annotation_init</title>
+  <synopsis><code mime="text/x-gjs">
+function annotation_init(argv: Array(String)): Array(String) {
     // Gjs wrapper for regress_annotation_init()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
-<title><code>argv</code></title>
-<p>The arguments.</p>
+<title><code>Returns</code></title>
+  <p>The arguments.</p>
+</item>
+<item>
+<title><code>Returns (out)</code></title>
+  <p>The arguments.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 1997a4d..08bf226 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_invalid_regress_annotation</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>foo</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>annotation_invalid_regress_annotation</title>
-  
-<synopsis><code mime="text/x-gjs">
-function annotation_invalid_regress_annotation(foo:Number):void {
+  <title>Regress.annotation_invalid_regress_annotation</title>
+  <synopsis><code mime="text/x-gjs">
+function annotation_invalid_regress_annotation(foo: Number(gint)): void {
     // Gjs wrapper for regress_annotation_invalid_regress_annotation()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>foo</code></title>
-<p>some text (e.g. example) or else</p>
+  <p>some text (e.g. example) or else</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 9bfb168..1d6d51e 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_ptr_array</api:name>
       <api:arg>
-        <api:type>[GObject.Value]</api:type>
+        <api:type>Array(Any)</api:type>
         <api:name>array</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>annotation_ptr_array</title>
-  
-<synopsis><code mime="text/x-gjs">
-function annotation_ptr_array(array:[GObject.Value]):void {
+  <title>Regress.annotation_ptr_array</title>
+  <synopsis><code mime="text/x-gjs">
+function annotation_ptr_array(array: Array(Any)): void {
     // Gjs wrapper for regress_annotation_ptr_array()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>array</code></title>
-<p>the array</p>
+  <p>the array</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 3f63c9a..0ca05e7 100644 (file)
@@ -6,37 +6,31 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>[String]</api:type>
+        <api:type>Array(String)</api:type>
       </api:returns>
       <api:name>regress_annotation_return_array</api:name>
     </api:function>
-
   </info>
-  <title>annotation_return_array</title>
-  
-<synopsis><code mime="text/x-gjs">
-function annotation_return_array():[String] {
+  <title>Regress.annotation_return_array</title>
+  <synopsis><code mime="text/x-gjs">
+function annotation_return_array(): [return_value: Array(String), length: Number(gint)] {
     // Gjs wrapper for regress_annotation_return_array()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
-<title><code>Returns</code></title>
-<p>The return value</p>
+<title><code>return_value</code></title>
+  <p>The return value</p>
+</item>
+<item>
+<title><code>length</code></title>
+  <p>Number of return values</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 8641945..3cc04b9 100644 (file)
@@ -6,37 +6,27 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>filename</api:type>
+        <api:type>String</api:type>
       </api:returns>
       <api:name>regress_annotation_return_filename</api:name>
     </api:function>
-
   </info>
-  <title>annotation_return_filename</title>
-  
-<synopsis><code mime="text/x-gjs">
-function annotation_return_filename():filename {
+  <title>Regress.annotation_return_filename</title>
+  <synopsis><code mime="text/x-gjs">
+function annotation_return_filename(): String {
     // Gjs wrapper for regress_annotation_return_filename()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>An annotated filename</p>
+  <p>An annotated filename</p>
 </item>
 </terms>
 
-  
-  
 </page>
index a5977b8..a2705af 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_set_source_file</api:name>
       <api:arg>
-        <api:type>filename</api:type>
+        <api:type>String</api:type>
         <api:name>fname</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>annotation_set_source_file</title>
-  
-<synopsis><code mime="text/x-gjs">
-function annotation_set_source_file(fname:filename):void {
+  <title>Regress.annotation_set_source_file</title>
+  <synopsis><code mime="text/x-gjs">
+function annotation_set_source_file(fname: String): void {
     // Gjs wrapper for regress_annotation_set_source_file()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>fname</code></title>
-<p>Source file</p>
+  <p>Source file</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 675e00d..094bef2 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_space_after_comment_bug631690</api:name>
     </api:function>
-
   </info>
-  <title>annotation_space_after_comment_bug631690</title>
-  
-<synopsis><code mime="text/x-gjs">
-function annotation_space_after_comment_bug631690():void {
+  <title>Regress.annotation_space_after_comment_bug631690</title>
+  <synopsis><code mime="text/x-gjs">
+function annotation_space_after_comment_bug631690(): void {
     // Gjs wrapper for regress_annotation_space_after_comment_bug631690()
 }
-</code></synopsis>
+  </code></synopsis>
+  <p>Explicitly test having a space after the ** here.</p>
 
-  
-    <p>Explicitly test having a space after the ** here.</p>
-  
-  
-  
-  
-<terms>
-</terms>
 
-  
-  
 </page>
index 347eb6d..07c6358 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_string_array_length</api:name>
       <api:arg>
-        <api:type>[String]</api:type>
+        <api:type>Array(String)</api:type>
         <api:name>properties</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>annotation_string_array_length</title>
-  
-<synopsis><code mime="text/x-gjs">
-function annotation_string_array_length(properties:[String]):void {
+  <title>Regress.annotation_string_array_length</title>
+  <synopsis><code mime="text/x-gjs">
+function annotation_string_array_length(properties: Array(String)): void {
     // Gjs wrapper for regress_annotation_string_array_length()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>properties</code></title>
@@ -41,6 +33,4 @@ function annotation_string_array_length(properties:[String]):void {
 </item>
 </terms>
 
-  
-  
 </page>
index 741447e..e27b53b 100644 (file)
@@ -6,37 +6,27 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>[String]</api:type>
+        <api:type>Array(String)</api:type>
       </api:returns>
       <api:name>regress_annotation_string_zero_terminated</api:name>
     </api:function>
-
   </info>
-  <title>annotation_string_zero_terminated</title>
-  
-<synopsis><code mime="text/x-gjs">
-function annotation_string_zero_terminated():[String] {
+  <title>Regress.annotation_string_zero_terminated</title>
+  <synopsis><code mime="text/x-gjs">
+function annotation_string_zero_terminated(): Array(String) {
     // Gjs wrapper for regress_annotation_string_zero_terminated()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>The return value</p>
+  <p>The return value</p>
 </item>
 </terms>
 
-  
-  
 </page>
index cd4d8be..00b2e39 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_string_zero_terminated_out</api:name>
       <api:arg>
-        <api:type>[String]</api:type>
+        <api:type>Array(String)</api:type>
         <api:name>out</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>annotation_string_zero_terminated_out</title>
-  
-<synopsis><code mime="text/x-gjs">
-function annotation_string_zero_terminated_out(out:[String]):void {
+  <title>Regress.annotation_string_zero_terminated_out</title>
+  <synopsis><code mime="text/x-gjs">
+function annotation_string_zero_terminated_out(out: Array(String)): Array(String) {
     // Gjs wrapper for regress_annotation_string_zero_terminated_out()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
-<title><code>out</code></title>
+<title><code>Returns</code></title>
+
+</item>
+<item>
+<title><code>Returns (out)</code></title>
 
 </item>
 </terms>
 
-  
-  
 </page>
index edade5b..5ed7f14 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_test_parsing_bug630862</api:name>
     </api:function>
-
   </info>
-  <title>annotation_test_parsing_bug630862</title>
-  
-<synopsis><code mime="text/x-gjs">
-function annotation_test_parsing_bug630862():GObject.Object {
+  <title>Regress.annotation_test_parsing_bug630862</title>
+  <synopsis><code mime="text/x-gjs">
+function annotation_test_parsing_bug630862(): <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link> {
     // Gjs wrapper for regress_annotation_test_parsing_bug630862()
 }
-</code></synopsis>
+  </code></synopsis>
+  <p>See https://bugzilla.gnome.org/show_bug.cgi?id=630862</p>
 
-  
-    <p>See https://bugzilla.gnome.org/show_bug.cgi?id=630862</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>An object, note the colon:in here</p>
+  <p>An object, note the colon:in here</p>
 </item>
 </terms>
 
-  
-  
 </page>
index a4fceaf..be5134b 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_transfer_floating</api:name>
     </api:function>
-
   </info>
-  <title>annotation_transfer_floating</title>
-  
-<synopsis><code mime="text/x-gjs">
-function annotation_transfer_floating():GObject.Object {
+  <title>Regress.annotation_transfer_floating</title>
+  <synopsis><code mime="text/x-gjs">
+function annotation_transfer_floating(): <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link> {
     // Gjs wrapper for regress_annotation_transfer_floating()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>A floating object</p>
+  <p>A floating object</p>
 </item>
 </terms>
 
-  
-  
 </page>
index f1d5700..52028b0 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_versioned</api:name>
     </api:function>
-
   </info>
-  <title>annotation_versioned</title>
-  
-<synopsis><code mime="text/x-gjs">
-function annotation_versioned():void {
+  <title>Regress.annotation_versioned</title>
+  <synopsis><code mime="text/x-gjs">
+function annotation_versioned(): void {
     // Gjs wrapper for regress_annotation_versioned()
 }
-</code></synopsis>
+  </code></synopsis>
 
-  
-    
-  
-  
-    <p>Since 0.6</p>
-  
-  
-<terms>
-</terms>
+  <p>Since 0.6</p>
 
-  
-  
 </page>
index 3aade3c..2d81ed0 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_atest_error_quark</api:name>
     </api:function>
-
   </info>
-  <title>atest_error_quark</title>
-  
-<synopsis><code mime="text/x-gjs">
-function atest_error_quark():GLib.Quark {
+  <title>Regress.atest_error_quark</title>
+  <synopsis><code mime="text/x-gjs">
+function atest_error_quark(): <link href="../GLib-2.0/GLib.Quark.html">GLib.Quark</link> {
     // Gjs wrapper for regress_atest_error_quark()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function atest_error_quark():GLib.Quark {
 </item>
 </terms>
 
-  
-  
 </page>
index 980a930..d285f4e 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>foo_async_ready_callback</title>
-  
-<synopsis><code mime="text/x-gjs">
-function foo_async_ready_callback(cancellable:Gio.Cancellable, callback:Gio.AsyncReadyCallback):void {
+  <title>Regress.foo_async_ready_callback</title>
+  <synopsis><code mime="text/x-gjs">
+function foo_async_ready_callback(cancellable: <link href="../Gio-2.0/Gio.Cancellable.html">Gio.Cancellable</link>, callback: <link href="../Gio-2.0/Gio.AsyncReadyCallback.html">Gio.AsyncReadyCallback</link>): void {
     // Gjs wrapper for regress_foo_async_ready_callback()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>cancellable</code></title>
@@ -49,6 +41,4 @@ function foo_async_ready_callback(cancellable:Gio.Cancellable, callback:Gio.Asyn
 </item>
 </terms>
 
-  
-  
 </page>
index d5cff2a..3276082 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>foo_destroy_notify_callback</title>
-  
-<synopsis><code mime="text/x-gjs">
-function foo_destroy_notify_callback(callback:Regress.FooCallback):void {
+  <title>Regress.foo_destroy_notify_callback</title>
+  <synopsis><code mime="text/x-gjs">
+function foo_destroy_notify_callback(callback: <link xref="Regress.FooCallback">Regress.FooCallback</link>): void {
     // Gjs wrapper for regress_foo_destroy_notify_callback()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -41,6 +33,4 @@ function foo_destroy_notify_callback(callback:Regress.FooCallback):void {
 </item>
 </terms>
 
-  
-  
 </page>
index 20eb206..cfecea5 100644 (file)
@@ -6,30 +6,22 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_foo_init</api:name>
     </api:function>
-
   </info>
-  <title>foo_init</title>
-  
-<synopsis><code mime="text/x-gjs">
-function foo_init():Number {
+  <title>Regress.foo_init</title>
+  <synopsis><code mime="text/x-gjs">
+function foo_init(): Number(gint) {
     // Gjs wrapper for regress_foo_init()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function foo_init():Number {
 </item>
 </terms>
 
-  
-  
 </page>
index 10876aa..00ff1f9 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>s</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>foo_method_external_references</title>
-  
-<synopsis><code mime="text/x-gjs">
-function foo_method_external_references(object:Utility.Object, e:Utility.EnumType, f:Utility.FlagType, s:Utility.Struct):void {
+  <title>Regress.foo_method_external_references</title>
+  <synopsis><code mime="text/x-gjs">
+function foo_method_external_references(object: <link href="../Utility-1.0/Utility.Object.html">Utility.Object</link>, e: <link href="../Utility-1.0/Utility.EnumType.html">Utility.EnumType</link>, f: <link href="../Utility-1.0/Utility.FlagType.html">Utility.FlagType</link>, s: <link href="../Utility-1.0/Utility.Struct.html">Utility.Struct</link>): void {
     // Gjs wrapper for regress_foo_method_external_references()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
@@ -65,6 +57,4 @@ function foo_method_external_references(object:Utility.Object, e:Utility.EnumTyp
 </item>
 </terms>
 
-  
-  
 </page>
index 31f881b..0ffa89c 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_not_a_constructor_new</api:name>
     </api:function>
-
   </info>
-  <title>foo_not_a_constructor_new</title>
-  
-<synopsis><code mime="text/x-gjs">
-function foo_not_a_constructor_new():Regress.FooObject {
+  <title>Regress.foo_not_a_constructor_new</title>
+  <synopsis><code mime="text/x-gjs">
+function foo_not_a_constructor_new(): <link xref="Regress.FooObject">Regress.FooObject</link> {
     // Gjs wrapper for regress_foo_not_a_constructor_new()
 }
-</code></synopsis>
-
-  
-    <p>This should be scanned as a top-level function, and shouldn't cause
+  </code></synopsis>
+  <p>This should be scanned as a top-level function, and shouldn't cause
 a "Can't find matching type for constructor" warning.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -38,6 +30,4 @@ a "Can't find matching type for constructor" warning.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 989084b..3fbf325 100644 (file)
@@ -6,30 +6,22 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>[String]</api:type>
+        <api:type>Array(String)</api:type>
       </api:returns>
       <api:name>regress_foo_test_array</api:name>
     </api:function>
-
   </info>
-  <title>foo_test_array</title>
-  
-<synopsis><code mime="text/x-gjs">
-function foo_test_array():[String] {
+  <title>Regress.foo_test_array</title>
+  <synopsis><code mime="text/x-gjs">
+function foo_test_array(): Array(String) {
     // Gjs wrapper for regress_foo_test_array()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function foo_test_array():[String] {
 </item>
 </terms>
 
-  
-  
 </page>
index 4f09562..7b62728 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>param</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>foo_test_const_char_param</title>
-  
-<synopsis><code mime="text/x-gjs">
-function foo_test_const_char_param(param:String):void {
+  <title>Regress.foo_test_const_char_param</title>
+  <synopsis><code mime="text/x-gjs">
+function foo_test_const_char_param(param: String): void {
     // Gjs wrapper for regress_foo_test_const_char_param()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>param</code></title>
@@ -41,6 +33,4 @@ function foo_test_const_char_param(param:String):void {
 </item>
 </terms>
 
-  
-  
 </page>
index 3ff9265..79984f6 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_test_const_char_retval</api:name>
     </api:function>
-
   </info>
-  <title>foo_test_const_char_retval</title>
-  
-<synopsis><code mime="text/x-gjs">
-function foo_test_const_char_retval():String {
+  <title>Regress.foo_test_const_char_retval</title>
+  <synopsis><code mime="text/x-gjs">
+function foo_test_const_char_retval(): String {
     // Gjs wrapper for regress_foo_test_const_char_retval()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function foo_test_const_char_retval():String {
 </item>
 </terms>
 
-  
-  
 </page>
index da103fb..4965c70 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>param</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>foo_test_const_struct_param</title>
-  
-<synopsis><code mime="text/x-gjs">
-function foo_test_const_struct_param(param:Regress.FooStruct):void {
+  <title>Regress.foo_test_const_struct_param</title>
+  <synopsis><code mime="text/x-gjs">
+function foo_test_const_struct_param(param: <link xref="Regress.FooStruct">Regress.FooStruct</link>): void {
     // Gjs wrapper for regress_foo_test_const_struct_param()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>param</code></title>
@@ -41,6 +33,4 @@ function foo_test_const_struct_param(param:Regress.FooStruct):void {
 </item>
 </terms>
 
-  
-  
 </page>
index 9c7539c..1495882 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_test_const_struct_retval</api:name>
     </api:function>
-
   </info>
-  <title>foo_test_const_struct_retval</title>
-  
-<synopsis><code mime="text/x-gjs">
-function foo_test_const_struct_retval():Regress.FooStruct {
+  <title>Regress.foo_test_const_struct_retval</title>
+  <synopsis><code mime="text/x-gjs">
+function foo_test_const_struct_retval(): <link xref="Regress.FooStruct">Regress.FooStruct</link> {
     // Gjs wrapper for regress_foo_test_const_struct_retval()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function foo_test_const_struct_retval():Regress.FooStruct {
 </item>
 </terms>
 
-  
-  
 </page>
index fe3b85a..36a5f7c 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_test_string_array</api:name>
       <api:arg>
-        <api:type>[String]</api:type>
+        <api:type>Array(String)</api:type>
         <api:name>array</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>foo_test_string_array</title>
-  
-<synopsis><code mime="text/x-gjs">
-function foo_test_string_array(array:[String]):void {
+  <title>Regress.foo_test_string_array</title>
+  <synopsis><code mime="text/x-gjs">
+function foo_test_string_array(array: Array(String)): void {
     // Gjs wrapper for regress_foo_test_string_array()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>array</code></title>
@@ -41,6 +33,4 @@ function foo_test_string_array(array:[String]):void {
 </item>
 </terms>
 
-  
-  
 </page>
index 8b5c901..daf7ac9 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_test_string_array_with_g</api:name>
       <api:arg>
-        <api:type>[String]</api:type>
+        <api:type>Array(String)</api:type>
         <api:name>array</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>foo_test_string_array_with_g</title>
-  
-<synopsis><code mime="text/x-gjs">
-function foo_test_string_array_with_g(array:[String]):void {
+  <title>Regress.foo_test_string_array_with_g</title>
+  <synopsis><code mime="text/x-gjs">
+function foo_test_string_array_with_g(array: Array(String)): void {
     // Gjs wrapper for regress_foo_test_string_array_with_g()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>array</code></title>
@@ -41,6 +33,4 @@ function foo_test_string_array_with_g(array:[String]):void {
 </item>
 </terms>
 
-  
-  
 </page>
index c35d3e9..15ef4d5 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_test_unsigned_qualifier</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(guint)</api:type>
         <api:name>unsigned_param</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>foo_test_unsigned_qualifier</title>
-  
-<synopsis><code mime="text/x-gjs">
-function foo_test_unsigned_qualifier(unsigned_param:Number):void {
+  <title>Regress.foo_test_unsigned_qualifier</title>
+  <synopsis><code mime="text/x-gjs">
+function foo_test_unsigned_qualifier(unsigned_param: Number(guint)): void {
     // Gjs wrapper for regress_foo_test_unsigned_qualifier()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>unsigned_param</code></title>
@@ -41,6 +33,4 @@ function foo_test_unsigned_qualifier(unsigned_param:Number):void {
 </item>
 </terms>
 
-  
-  
 </page>
index 9f68b51..a09d4ad 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_test_unsigned_type</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(guint)</api:type>
         <api:name>unsigned_param</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>foo_test_unsigned_type</title>
-  
-<synopsis><code mime="text/x-gjs">
-function foo_test_unsigned_type(unsigned_param:Number):void {
+  <title>Regress.foo_test_unsigned_type</title>
+  <synopsis><code mime="text/x-gjs">
+function foo_test_unsigned_type(unsigned_param: Number(guint)): void {
     // Gjs wrapper for regress_foo_test_unsigned_type()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>unsigned_param</code></title>
@@ -41,6 +33,4 @@ function foo_test_unsigned_type(unsigned_param:Number):void {
 </item>
 </terms>
 
-  
-  
 </page>
index 446001a..c149b29 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>obj</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>func_obj_null_in</title>
-  
-<synopsis><code mime="text/x-gjs">
-function func_obj_null_in(obj:Regress.TestObj):void {
+  <title>Regress.func_obj_null_in</title>
+  <synopsis><code mime="text/x-gjs">
+function func_obj_null_in(obj: <link xref="Regress.TestObj">Regress.TestObj</link>): void {
     // Gjs wrapper for regress_func_obj_null_in()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>obj</code></title>
-<p>A <link xref="Regress.TestObj"/></p>
+  <p>A <link xref="Regress.TestObj"/></p>
 </item>
 </terms>
 
-  
-  
 </page>
index bafa541..04ded51 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_global_get_flags_out</api:name>
     </api:function>
-
   </info>
-  <title>global_get_flags_out</title>
-  
-<synopsis><code mime="text/x-gjs">
-function global_get_flags_out():void {
+  <title>Regress.global_get_flags_out</title>
+  <synopsis><code mime="text/x-gjs">
+function global_get_flags_out(): <link xref="Regress.TestFlags">Regress.TestFlags</link> {
     // Gjs wrapper for regress_global_get_flags_out()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
+<item>
+<title><code>Returns</code></title>
+  <p>A flags value</p>
+</item>
 </terms>
 
-  
-  
 </page>
index d4f673d..bd6dbd7 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_has_parameter_named_attrs</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>foo</api:name>
       </api:arg>
       <api:arg>
-        <api:type>[guint32]</api:type>
+        <api:type>Array(Number(guint32))</api:type>
         <api:name>attributes</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>has_parameter_named_attrs</title>
-  
-<synopsis><code mime="text/x-gjs">
-function has_parameter_named_attrs(foo:Number, attributes:[guint32]):void {
+  <title>Regress.has_parameter_named_attrs</title>
+  <synopsis><code mime="text/x-gjs">
+function has_parameter_named_attrs(foo: Number(gint), attributes: Array(Number(guint32))): void {
     // Gjs wrapper for regress_has_parameter_named_attrs()
 }
-</code></synopsis>
-
-  
-    <p>This test case mirrors GnomeKeyringPasswordSchema from
+  </code></synopsis>
+  <p>This test case mirrors GnomeKeyringPasswordSchema from
 libgnome-keyring.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>foo</code></title>
-<p>some int</p>
+  <p>some int</p>
 </item>
 <item>
 <title><code>attributes</code></title>
-<p>list of attributes</p>
+  <p>list of attributes</p>
 </item>
 </terms>
 
-  
-  
 </page>
index aa2baa6..486b889 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>data</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>introspectable_via_alias</title>
-  
-<synopsis><code mime="text/x-gjs">
-function introspectable_via_alias(data:Regress.PtrArrayAlias):void {
+  <title>Regress.introspectable_via_alias</title>
+  <synopsis><code mime="text/x-gjs">
+function introspectable_via_alias(data: <link xref="Regress.PtrArrayAlias">Regress.PtrArrayAlias</link>): void {
     // Gjs wrapper for regress_introspectable_via_alias()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>data</code></title>
@@ -41,6 +33,4 @@ function introspectable_via_alias(data:Regress.PtrArrayAlias):void {
 </item>
 </terms>
 
-  
-  
 </page>
index 9b300e1..e0fd8c0 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>abort_on_error</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>set_abort_on_error</title>
-  
-<synopsis><code mime="text/x-gjs">
-function set_abort_on_error(abort_on_error:Boolean):void {
+  <title>Regress.set_abort_on_error</title>
+  <synopsis><code mime="text/x-gjs">
+function set_abort_on_error(abort_on_error: Boolean): void {
     // Gjs wrapper for regress_set_abort_on_error()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>abort_on_error</code></title>
@@ -41,6 +33,4 @@ function set_abort_on_error(abort_on_error:Boolean):void {
 </item>
 </terms>
 
-  
-  
 </page>
index 112cd23..e1b4e02 100644 (file)
@@ -6,11 +6,10 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_test_array_callback</api:name>
       <api:arg>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_array_callback</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_array_callback(callback:Regress.TestCallbackArray):Number {
+  <title>Regress.test_array_callback</title>
+  <synopsis><code mime="text/x-gjs">
+function test_array_callback(callback: <link xref="Regress.TestCallbackArray">Regress.TestCallbackArray</link>): Number(gint) {
     // Gjs wrapper for regress_test_array_callback()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -45,6 +37,4 @@ function test_array_callback(callback:Regress.TestCallbackArray):Number {
 </item>
 </terms>
 
-  
-  
 </page>
index 51026b5..21ae53e 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_array_fixed_out_objects</api:name>
     </api:function>
-
   </info>
-  <title>test_array_fixed_out_objects</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_array_fixed_out_objects():void {
+  <title>Regress.test_array_fixed_out_objects</title>
+  <synopsis><code mime="text/x-gjs">
+function test_array_fixed_out_objects(): Array(<link xref="Regress.TestObj">Regress.TestObj</link>) {
     // Gjs wrapper for regress_test_array_fixed_out_objects()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
+<item>
+<title><code>Returns</code></title>
+  <p>An array of <link xref="Regress.TestObj"/></p>
+</item>
 </terms>
 
-  
-  
 </page>
index 14a6e66..22d6a35 100644 (file)
@@ -6,45 +6,35 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_test_array_fixed_size_int_in</api:name>
       <api:arg>
-        <api:type>[Number]</api:type>
+        <api:type>Array(Number(gint))</api:type>
         <api:name>ints</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_array_fixed_size_int_in</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_array_fixed_size_int_in(ints:[Number]):Number {
+  <title>Regress.test_array_fixed_size_int_in</title>
+  <synopsis><code mime="text/x-gjs">
+function test_array_fixed_size_int_in(ints: Array(Number(gint))): Number(gint) {
     // Gjs wrapper for regress_test_array_fixed_size_int_in()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>ints</code></title>
-<p>a list of 5 integers</p>
+  <p>a list of 5 integers</p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>the sum of the items in <code>ints</code></p>
+  <p>the sum of the items in <code>ints</code></p>
 </item>
 </terms>
 
-  
-  
 </page>
index ce62153..ff1479a 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_array_fixed_size_int_out</api:name>
     </api:function>
-
   </info>
-  <title>test_array_fixed_size_int_out</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_array_fixed_size_int_out():void {
+  <title>Regress.test_array_fixed_size_int_out</title>
+  <synopsis><code mime="text/x-gjs">
+function test_array_fixed_size_int_out(): Array(Number(gint)) {
     // Gjs wrapper for regress_test_array_fixed_size_int_out()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
+<item>
+<title><code>Returns</code></title>
+  <p>a list of 5 integers ranging from 0 to 4</p>
+</item>
 </terms>
 
-  
-  
 </page>
index 1e2c678..d899ec2 100644 (file)
@@ -6,37 +6,27 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>[Number]</api:type>
+        <api:type>Array(Number(gint))</api:type>
       </api:returns>
       <api:name>regress_test_array_fixed_size_int_return</api:name>
     </api:function>
-
   </info>
-  <title>test_array_fixed_size_int_return</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_array_fixed_size_int_return():[Number] {
+  <title>Regress.test_array_fixed_size_int_return</title>
+  <synopsis><code mime="text/x-gjs">
+function test_array_fixed_size_int_return(): Array(Number(gint)) {
     // Gjs wrapper for regress_test_array_fixed_size_int_return()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>a list of 5 integers ranging from 0 to 4</p>
+  <p>a list of 5 integers ranging from 0 to 4</p>
 </item>
 </terms>
 
-  
-  
 </page>
index e4b957e..a1d52a4 100644 (file)
@@ -6,38 +6,30 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_test_array_gint16_in</api:name>
       <api:arg>
-        <api:type>[gint16]</api:type>
+        <api:type>Array(Number(gint16))</api:type>
         <api:name>ints</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_array_gint16_in</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_array_gint16_in(ints:[gint16]):Number {
+  <title>Regress.test_array_gint16_in</title>
+  <synopsis><code mime="text/x-gjs">
+function test_array_gint16_in(ints: Array(Number(gint16))): Number(gint) {
     // Gjs wrapper for regress_test_array_gint16_in()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>ints</code></title>
-<p>List of ints</p>
+  <p>List of ints</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -45,6 +37,4 @@ function test_array_gint16_in(ints:[gint16]):Number {
 </item>
 </terms>
 
-  
-  
 </page>
index 171ad11..a578d56 100644 (file)
@@ -6,38 +6,30 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>gint32</api:type>
+        <api:type>Number(gint32)</api:type>
       </api:returns>
       <api:name>regress_test_array_gint32_in</api:name>
       <api:arg>
-        <api:type>[gint32]</api:type>
+        <api:type>Array(Number(gint32))</api:type>
         <api:name>ints</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_array_gint32_in</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_array_gint32_in(ints:[gint32]):gint32 {
+  <title>Regress.test_array_gint32_in</title>
+  <synopsis><code mime="text/x-gjs">
+function test_array_gint32_in(ints: Array(Number(gint32))): Number(gint32) {
     // Gjs wrapper for regress_test_array_gint32_in()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>ints</code></title>
-<p>List of ints</p>
+  <p>List of ints</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -45,6 +37,4 @@ function test_array_gint32_in(ints:[gint32]):gint32 {
 </item>
 </terms>
 
-  
-  
 </page>
index a8b51a6..da730c8 100644 (file)
@@ -6,38 +6,30 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint64)</api:type>
       </api:returns>
       <api:name>regress_test_array_gint64_in</api:name>
       <api:arg>
-        <api:type>[Number]</api:type>
+        <api:type>Array(Number(gint64))</api:type>
         <api:name>ints</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_array_gint64_in</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_array_gint64_in(ints:[Number]):Number {
+  <title>Regress.test_array_gint64_in</title>
+  <synopsis><code mime="text/x-gjs">
+function test_array_gint64_in(ints: Array(Number(gint64))): Number(gint64) {
     // Gjs wrapper for regress_test_array_gint64_in()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>ints</code></title>
-<p>List of ints</p>
+  <p>List of ints</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -45,6 +37,4 @@ function test_array_gint64_in(ints:[Number]):Number {
 </item>
 </terms>
 
-  
-  
 </page>
index 16ddc7c..b60ee63 100644 (file)
@@ -6,38 +6,30 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_test_array_gint8_in</api:name>
       <api:arg>
-        <api:type>[gint8]</api:type>
+        <api:type>ByteArray</api:type>
         <api:name>ints</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_array_gint8_in</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_array_gint8_in(ints:[gint8]):Number {
+  <title>Regress.test_array_gint8_in</title>
+  <synopsis><code mime="text/x-gjs">
+function test_array_gint8_in(ints: ByteArray): Number(gint) {
     // Gjs wrapper for regress_test_array_gint8_in()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>ints</code></title>
-<p>List of ints</p>
+  <p>List of ints</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -45,6 +37,4 @@ function test_array_gint8_in(ints:[gint8]):Number {
 </item>
 </terms>
 
-  
-  
 </page>
index 61e1d0a..7f4e5ac 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_array_gtype_in</api:name>
       <api:arg>
-        <api:type>[GType]</api:type>
+        <api:type>Array(GObject.Type)</api:type>
         <api:name>types</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_array_gtype_in</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_array_gtype_in(types:[GType]):String {
+  <title>Regress.test_array_gtype_in</title>
+  <synopsis><code mime="text/x-gjs">
+function test_array_gtype_in(types: Array(GObject.Type)): String {
     // Gjs wrapper for regress_test_array_gtype_in()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>types</code></title>
-<p>List of types</p>
+  <p>List of types</p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>string representation of provided types</p>
+  <p>string representation of provided types</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 5f580ad..e526457 100644 (file)
@@ -6,37 +6,31 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>[Number]</api:type>
+        <api:type>Array(Number(gint))</api:type>
       </api:returns>
       <api:name>regress_test_array_int_full_out</api:name>
     </api:function>
-
   </info>
-  <title>test_array_int_full_out</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_array_int_full_out():[Number] {
+  <title>Regress.test_array_int_full_out</title>
+  <synopsis><code mime="text/x-gjs">
+function test_array_int_full_out(): [return_value: Array(Number(gint)), len: Number(gint)] {
     // Gjs wrapper for regress_test_array_int_full_out()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
-<title><code>Returns</code></title>
-<p>a new array of integers.</p>
+<title><code>return_value</code></title>
+  <p>a new array of integers.</p>
+</item>
+<item>
+<title><code>len</code></title>
+  <p>length of the returned array.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 3d41dca..af070d4 100644 (file)
@@ -6,38 +6,30 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_test_array_int_in</api:name>
       <api:arg>
-        <api:type>[Number]</api:type>
+        <api:type>Array(Number(gint))</api:type>
         <api:name>ints</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_array_int_in</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_array_int_in(ints:[Number]):Number {
+  <title>Regress.test_array_int_in</title>
+  <synopsis><code mime="text/x-gjs">
+function test_array_int_in(ints: Array(Number(gint))): Number(gint) {
     // Gjs wrapper for regress_test_array_int_in()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>ints</code></title>
-<p>List of ints</p>
+  <p>List of ints</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -45,6 +37,4 @@ function test_array_int_in(ints:[Number]):Number {
 </item>
 </terms>
 
-  
-  
 </page>
index b4094cd..a9ee022 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_array_int_inout</api:name>
       <api:arg>
-        <api:type>[Number]</api:type>
+        <api:type>Array(Number(gint))</api:type>
         <api:name>ints</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_array_int_inout</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_array_int_inout(ints:[Number]):void {
+  <title>Regress.test_array_int_inout</title>
+  <synopsis><code mime="text/x-gjs">
+function test_array_int_inout(ints: Array(Number(gint))): Array(Number(gint)) {
     // Gjs wrapper for regress_test_array_int_inout()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
-<title><code>ints</code></title>
-<p>a list of integers whose items will be increased by 1, except the first that will be dropped</p>
+<title><code>Returns</code></title>
+  <p>a list of integers whose items will be increased by 1, except the first that will be dropped</p>
+</item>
+<item>
+<title><code>Returns (out)</code></title>
+  <p>a list of integers whose items will be increased by 1, except the first that will be dropped</p>
 </item>
 </terms>
 
-  
-  
 </page>
index ac10521..809e64e 100644 (file)
@@ -6,37 +6,31 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>[Number]</api:type>
+        <api:type>Array(Number(gint))</api:type>
       </api:returns>
       <api:name>regress_test_array_int_none_out</api:name>
     </api:function>
-
   </info>
-  <title>test_array_int_none_out</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_array_int_none_out():[Number] {
+  <title>Regress.test_array_int_none_out</title>
+  <synopsis><code mime="text/x-gjs">
+function test_array_int_none_out(): [return_value: Array(Number(gint)), len: Number(gint)] {
     // Gjs wrapper for regress_test_array_int_none_out()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
-<title><code>Returns</code></title>
-<p>a static array of integers.</p>
+<title><code>return_value</code></title>
+  <p>a static array of integers.</p>
+</item>
+<item>
+<title><code>len</code></title>
+  <p>length of the returned array.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 33b27a0..05059f4 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_array_int_null_in</api:name>
       <api:arg>
-        <api:type>[Number]</api:type>
+        <api:type>Array(Number(gint))</api:type>
         <api:name>arr</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_array_int_null_in</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_array_int_null_in(arr:[Number]):void {
+  <title>Regress.test_array_int_null_in</title>
+  <synopsis><code mime="text/x-gjs">
+function test_array_int_null_in(arr: Array(Number(gint))): void {
     // Gjs wrapper for regress_test_array_int_null_in()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>arr</code></title>
@@ -41,6 +33,4 @@ function test_array_int_null_in(arr:[Number]):void {
 </item>
 </terms>
 
-  
-  
 </page>
index 1e1a364..35368ec 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_array_int_null_out</api:name>
     </api:function>
-
   </info>
-  <title>test_array_int_null_out</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_array_int_null_out():void {
+  <title>Regress.test_array_int_null_out</title>
+  <synopsis><code mime="text/x-gjs">
+function test_array_int_null_out(): Array(Number(gint)) {
     // Gjs wrapper for regress_test_array_int_null_out()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
 </terms>
 
-  
-  
 </page>
index 78953ec..947f162 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_array_int_out</api:name>
     </api:function>
-
   </info>
-  <title>test_array_int_out</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_array_int_out():void {
+  <title>Regress.test_array_int_out</title>
+  <synopsis><code mime="text/x-gjs">
+function test_array_int_out(): Array(Number(gint)) {
     // Gjs wrapper for regress_test_array_int_out()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
+<item>
+<title><code>Returns</code></title>
+  <p>a list of 5 integers, from 0 to 4 in consecutive order</p>
+</item>
 </terms>
 
-  
-  
 </page>
index 89d737c..00b92ad 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_async_ready_callback</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_async_ready_callback(callback:Gio.AsyncReadyCallback):void {
+  <title>Regress.test_async_ready_callback</title>
+  <synopsis><code mime="text/x-gjs">
+function test_async_ready_callback(callback: <link href="../Gio-2.0/Gio.AsyncReadyCallback.html">Gio.AsyncReadyCallback</link>): void {
     // Gjs wrapper for regress_test_async_ready_callback()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -41,6 +33,4 @@ function test_async_ready_callback(callback:Gio.AsyncReadyCallback):void {
 </item>
 </terms>
 
-  
-  
 </page>
index e165db2..cfa8f10 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_boolean</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_boolean(in:Boolean):Boolean {
+  <title>Regress.test_boolean</title>
+  <synopsis><code mime="text/x-gjs">
+function test_boolean(in: Boolean): Boolean {
     // Gjs wrapper for regress_test_boolean()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -45,6 +37,4 @@ function test_boolean(in:Boolean):Boolean {
 </item>
 </terms>
 
-  
-  
 </page>
index 21e169c..bc6d239 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_boolean_false</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_boolean_false(in:Boolean):Boolean {
+  <title>Regress.test_boolean_false</title>
+  <synopsis><code mime="text/x-gjs">
+function test_boolean_false(in: Boolean): Boolean {
     // Gjs wrapper for regress_test_boolean_false()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -45,6 +37,4 @@ function test_boolean_false(in:Boolean):Boolean {
 </item>
 </terms>
 
-  
-  
 </page>
index e525a2f..b4b9f6f 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_boolean_true</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_boolean_true(in:Boolean):Boolean {
+  <title>Regress.test_boolean_true</title>
+  <synopsis><code mime="text/x-gjs">
+function test_boolean_true(in: Boolean): Boolean {
     // Gjs wrapper for regress_test_boolean_true()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -45,6 +37,4 @@ function test_boolean_true(in:Boolean):Boolean {
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boxeds_not_a_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boxeds_not_a_method.page
new file mode 100644 (file)
index 0000000..27bda3f
--- /dev/null
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<page id="Regress.test_boxeds_not_a_method"
+      type="topic"
+      style="function"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="function" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>void</api:type>
+      </api:returns>
+      <api:name>regress_test_boxeds_not_a_method</api:name>
+      <api:arg>
+        <api:type>Regress.TestBoxed</api:type>
+        <api:name>boxed</api:name>
+      </api:arg>
+    </api:function>
+  </info>
+  <title>Regress.test_boxeds_not_a_method</title>
+  <synopsis><code mime="text/x-gjs">
+function test_boxeds_not_a_method(boxed: <link xref="Regress.TestBoxed">Regress.TestBoxed</link>): void {
+    // Gjs wrapper for regress_test_boxeds_not_a_method()
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>boxed</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boxeds_not_a_static.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boxeds_not_a_static.page
new file mode 100644 (file)
index 0000000..2d7eb0b
--- /dev/null
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<page id="Regress.test_boxeds_not_a_static"
+      type="topic"
+      style="function"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="function" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>void</api:type>
+      </api:returns>
+      <api:name>regress_test_boxeds_not_a_static</api:name>
+    </api:function>
+  </info>
+  <title>Regress.test_boxeds_not_a_static</title>
+  <synopsis><code mime="text/x-gjs">
+function test_boxeds_not_a_static(): void {
+    // Gjs wrapper for regress_test_boxeds_not_a_static()
+}
+  </code></synopsis>
+
+
+
+</page>
index 1c222c6..d46fdff 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_cairo_context_full_return</api:name>
     </api:function>
-
   </info>
-  <title>test_cairo_context_full_return</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_cairo_context_full_return():cairo.Context {
+  <title>Regress.test_cairo_context_full_return</title>
+  <synopsis><code mime="text/x-gjs">
+function test_cairo_context_full_return(): <link href="../cairo-1.0/cairo.Context.html">cairo.Context</link> {
     // Gjs wrapper for regress_test_cairo_context_full_return()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function test_cairo_context_full_return():cairo.Context {
 </item>
 </terms>
 
-  
-  
 </page>
index f710ac0..99dc4dc 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>context</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_cairo_context_none_in</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_cairo_context_none_in(context:cairo.Context):void {
+  <title>Regress.test_cairo_context_none_in</title>
+  <synopsis><code mime="text/x-gjs">
+function test_cairo_context_none_in(context: <link href="../cairo-1.0/cairo.Context.html">cairo.Context</link>): void {
     // Gjs wrapper for regress_test_cairo_context_none_in()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>context</code></title>
@@ -41,6 +33,4 @@ function test_cairo_context_none_in(context:cairo.Context):void {
 </item>
 </terms>
 
-  
-  
 </page>
index dcec607..8c2876a 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_cairo_surface_full_out</api:name>
     </api:function>
-
   </info>
-  <title>test_cairo_surface_full_out</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_cairo_surface_full_out():void {
+  <title>Regress.test_cairo_surface_full_out</title>
+  <synopsis><code mime="text/x-gjs">
+function test_cairo_surface_full_out(): <link href="../cairo-1.0/cairo.Surface.html">cairo.Surface</link> {
     // Gjs wrapper for regress_test_cairo_surface_full_out()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
 </terms>
 
-  
-  
 </page>
index f1b0f96..54bd146 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_cairo_surface_full_return</api:name>
     </api:function>
-
   </info>
-  <title>test_cairo_surface_full_return</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_cairo_surface_full_return():cairo.Surface {
+  <title>Regress.test_cairo_surface_full_return</title>
+  <synopsis><code mime="text/x-gjs">
+function test_cairo_surface_full_return(): <link href="../cairo-1.0/cairo.Surface.html">cairo.Surface</link> {
     // Gjs wrapper for regress_test_cairo_surface_full_return()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function test_cairo_surface_full_return():cairo.Surface {
 </item>
 </terms>
 
-  
-  
 </page>
index 783576a..f61da52 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>surface</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_cairo_surface_none_in</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_cairo_surface_none_in(surface:cairo.Surface):void {
+  <title>Regress.test_cairo_surface_none_in</title>
+  <synopsis><code mime="text/x-gjs">
+function test_cairo_surface_none_in(surface: <link href="../cairo-1.0/cairo.Surface.html">cairo.Surface</link>): void {
     // Gjs wrapper for regress_test_cairo_surface_none_in()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>surface</code></title>
@@ -41,6 +33,4 @@ function test_cairo_surface_none_in(surface:cairo.Surface):void {
 </item>
 </terms>
 
-  
-  
 </page>
index 72e602e..81f9a55 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_cairo_surface_none_return</api:name>
     </api:function>
-
   </info>
-  <title>test_cairo_surface_none_return</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_cairo_surface_none_return():cairo.Surface {
+  <title>Regress.test_cairo_surface_none_return</title>
+  <synopsis><code mime="text/x-gjs">
+function test_cairo_surface_none_return(): <link href="../cairo-1.0/cairo.Surface.html">cairo.Surface</link> {
     // Gjs wrapper for regress_test_cairo_surface_none_return()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function test_cairo_surface_none_return():cairo.Surface {
 </item>
 </terms>
 
-  
-  
 </page>
index 869dd98..d63f467 100644 (file)
@@ -6,11 +6,10 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_test_callback</api:name>
       <api:arg>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_callback</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_callback(callback:Regress.TestCallback):Number {
+  <title>Regress.test_callback</title>
+  <synopsis><code mime="text/x-gjs">
+function test_callback(callback: <link xref="Regress.TestCallback">Regress.TestCallback</link>): Number(gint) {
     // Gjs wrapper for regress_test_callback()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -45,6 +37,4 @@ function test_callback(callback:Regress.TestCallback):Number {
 </item>
 </terms>
 
-  
-  
 </page>
index 7b9ef5b..f4a3142 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_callback_async</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_callback_async(callback:Regress.TestCallbackUserData):void {
+  <title>Regress.test_callback_async</title>
+  <synopsis><code mime="text/x-gjs">
+function test_callback_async(callback: <link xref="Regress.TestCallbackUserData">Regress.TestCallbackUserData</link>): void {
     // Gjs wrapper for regress_test_callback_async()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -41,6 +33,4 @@ function test_callback_async(callback:Regress.TestCallbackUserData):void {
 </item>
 </terms>
 
-  
-  
 </page>
index d147c97..654a4c1 100644 (file)
@@ -6,11 +6,10 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_test_callback_destroy_notify</api:name>
       <api:arg>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_callback_destroy_notify</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_callback_destroy_notify(callback:Regress.TestCallbackUserData):Number {
+  <title>Regress.test_callback_destroy_notify</title>
+  <synopsis><code mime="text/x-gjs">
+function test_callback_destroy_notify(callback: <link xref="Regress.TestCallbackUserData">Regress.TestCallbackUserData</link>): Number(gint) {
     // Gjs wrapper for regress_test_callback_destroy_notify()
 }
-</code></synopsis>
-
-  
-    <p>Notified - callback persists until a DestroyNotify delegate
+  </code></synopsis>
+  <p>Notified - callback persists until a DestroyNotify delegate
 is invoked.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -46,6 +38,4 @@ is invoked.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 7fa31a3..c674140 100644 (file)
@@ -6,11 +6,10 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_test_callback_destroy_notify_no_user_data</api:name>
       <api:arg>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_callback_destroy_notify_no_user_data</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_callback_destroy_notify_no_user_data(callback:Regress.TestCallbackUserData):Number {
+  <title>Regress.test_callback_destroy_notify_no_user_data</title>
+  <synopsis><code mime="text/x-gjs">
+function test_callback_destroy_notify_no_user_data(callback: <link xref="Regress.TestCallbackUserData">Regress.TestCallbackUserData</link>): Number(gint) {
     // Gjs wrapper for regress_test_callback_destroy_notify_no_user_data()
 }
-</code></synopsis>
-
-  
-    <p>Adds a scope notified callback with no user data. This can invoke an error
+  </code></synopsis>
+  <p>Adds a scope notified callback with no user data. This can invoke an error
 condition in bindings which needs to be tested.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -46,6 +38,4 @@ condition in bindings which needs to be tested.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 66dec18..011b9e9 100644 (file)
@@ -6,30 +6,22 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_test_callback_thaw_async</api:name>
     </api:function>
-
   </info>
-  <title>test_callback_thaw_async</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_callback_thaw_async():Number {
+  <title>Regress.test_callback_thaw_async</title>
+  <synopsis><code mime="text/x-gjs">
+function test_callback_thaw_async(): Number(gint) {
     // Gjs wrapper for regress_test_callback_thaw_async()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function test_callback_thaw_async():Number {
 </item>
 </terms>
 
-  
-  
 </page>
index 9a8b57e..a0b463a 100644 (file)
@@ -6,39 +6,29 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_test_callback_thaw_notifications</api:name>
     </api:function>
-
   </info>
-  <title>test_callback_thaw_notifications</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_callback_thaw_notifications():Number {
+  <title>Regress.test_callback_thaw_notifications</title>
+  <synopsis><code mime="text/x-gjs">
+function test_callback_thaw_notifications(): Number(gint) {
     // Gjs wrapper for regress_test_callback_thaw_notifications()
 }
-</code></synopsis>
-
-  
-    <p>Invokes all callbacks installed by #test_callback_destroy_notify(),
+  </code></synopsis>
+  <p>Invokes all callbacks installed by #test_callback_destroy_notify(),
 adding up their return values, and removes them, invoking the
 corresponding destroy notfications.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>Sum of the return values of the invoked callbacks.</p>
+  <p>Sum of the return values of the invoked callbacks.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index dd9f597..bae0cbc 100644 (file)
@@ -6,11 +6,10 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_test_callback_user_data</api:name>
       <api:arg>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_callback_user_data</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_callback_user_data(callback:Regress.TestCallbackUserData):Number {
+  <title>Regress.test_callback_user_data</title>
+  <synopsis><code mime="text/x-gjs">
+function test_callback_user_data(callback: <link xref="Regress.TestCallbackUserData">Regress.TestCallbackUserData</link>): Number(gint) {
     // Gjs wrapper for regress_test_callback_user_data()
 }
-</code></synopsis>
-
-  
-    <p>Call - callback parameter persists for the duration of the method
+  </code></synopsis>
+  <p>Call - callback parameter persists for the duration of the method
 call and can be released on return.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -46,6 +38,4 @@ call and can be released on return.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index a954544..df02862 100644 (file)
@@ -6,34 +6,26 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_test_closure</api:name>
       <api:arg>
-        <api:type>GObject.Closure</api:type>
+        <api:type>Function</api:type>
         <api:name>closure</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_closure</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_closure(closure:GObject.Closure):Number {
+  <title>Regress.test_closure</title>
+  <synopsis><code mime="text/x-gjs">
+function test_closure(closure: Function): Number(gint) {
     // Gjs wrapper for regress_test_closure()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>closure</code></title>
@@ -45,6 +37,4 @@ function test_closure(closure:GObject.Closure):Number {
 </item>
 </terms>
 
-  
-  
 </page>
index 3c37f7a..86282fd 100644 (file)
@@ -6,38 +6,30 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_test_closure_one_arg</api:name>
       <api:arg>
-        <api:type>GObject.Closure</api:type>
+        <api:type>Function</api:type>
         <api:name>closure</api:name>
       </api:arg>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>arg</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_closure_one_arg</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_closure_one_arg(closure:GObject.Closure, arg:Number):Number {
+  <title>Regress.test_closure_one_arg</title>
+  <synopsis><code mime="text/x-gjs">
+function test_closure_one_arg(closure: Function, arg: Number(gint)): Number(gint) {
     // Gjs wrapper for regress_test_closure_one_arg()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>closure</code></title>
@@ -53,6 +45,4 @@ function test_closure_one_arg(closure:GObject.Closure, arg:Number):Number {
 </item>
 </terms>
 
-  
-  
 </page>
index 2bdbfe6..b226c3d 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
@@ -14,7 +13,7 @@
       </api:returns>
       <api:name>regress_test_closure_variant</api:name>
       <api:arg>
-        <api:type>GObject.Closure</api:type>
+        <api:type>Function</api:type>
         <api:name>closure</api:name>
       </api:arg>
       <api:arg>
         <api:name>arg</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_closure_variant</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_closure_variant(closure:GObject.Closure, arg:GLib.Variant):GLib.Variant {
+  <title>Regress.test_closure_variant</title>
+  <synopsis><code mime="text/x-gjs">
+function test_closure_variant(closure: Function, arg: <link href="../GLib-2.0/GLib.Variant.html">GLib.Variant</link>): <link href="../GLib-2.0/GLib.Variant.html">GLib.Variant</link> {
     // Gjs wrapper for regress_test_closure_variant()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>closure</code></title>
-<p>GClosure which takes one GVariant and returns a GVariant</p>
+  <p>GClosure which takes one GVariant and returns a GVariant</p>
 </item>
 <item>
 <title><code>arg</code></title>
-<p>a GVariant passed as argument to <code>closure</code></p>
+  <p>a GVariant passed as argument to <code>closure</code></p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>the return value of <code>closure</code></p>
+  <p>the return value of <code>closure</code></p>
 </item>
 </terms>
 
-  
-  
 </page>
index acb379e..3a2e342 100644 (file)
@@ -6,30 +6,22 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>GObject.Value</api:type>
+        <api:type>Any</api:type>
       </api:returns>
       <api:name>regress_test_date_in_gvalue</api:name>
     </api:function>
-
   </info>
-  <title>test_date_in_gvalue</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_date_in_gvalue():GObject.Value {
+  <title>Regress.test_date_in_gvalue</title>
+  <synopsis><code mime="text/x-gjs">
+function test_date_in_gvalue(): Any {
     // Gjs wrapper for regress_test_date_in_gvalue()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function test_date_in_gvalue():GObject.Value {
 </item>
 </terms>
 
-  
-  
 </page>
index 5a82a3f..055ea75 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_def_error_quark</api:name>
     </api:function>
-
   </info>
-  <title>test_def_error_quark</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_def_error_quark():GLib.Quark {
+  <title>Regress.test_def_error_quark</title>
+  <synopsis><code mime="text/x-gjs">
+function test_def_error_quark(): <link href="../GLib-2.0/GLib.Quark.html">GLib.Quark</link> {
     // Gjs wrapper for regress_test_def_error_quark()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function test_def_error_quark():GLib.Quark {
 </item>
 </terms>
 
-  
-  
 </page>
index 0ed75f6..6656080 100644 (file)
@@ -6,34 +6,26 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gdouble)</api:type>
       </api:returns>
       <api:name>regress_test_double</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gdouble)</api:type>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_double</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_double(in:Number):Number {
+  <title>Regress.test_double</title>
+  <synopsis><code mime="text/x-gjs">
+function test_double(in: Number(gdouble)): Number(gdouble) {
     // Gjs wrapper for regress_test_double()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -45,6 +37,4 @@ function test_double(in:Number):Number {
 </item>
 </terms>
 
-  
-  
 </page>
index b26b613..7454760 100644 (file)
@@ -6,37 +6,27 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>[filename]</api:type>
+        <api:type>Array(String)</api:type>
       </api:returns>
       <api:name>regress_test_filename_return</api:name>
     </api:function>
-
   </info>
-  <title>test_filename_return</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_filename_return():[filename] {
+  <title>Regress.test_filename_return</title>
+  <synopsis><code mime="text/x-gjs">
+function test_filename_return(): Array(String) {
     // Gjs wrapper for regress_test_filename_return()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>list of strings</p>
+  <p>list of strings</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 30f2ef7..a9430d5 100644 (file)
@@ -6,34 +6,26 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gfloat)</api:type>
       </api:returns>
       <api:name>regress_test_float</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gfloat)</api:type>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_float</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_float(in:Number):Number {
+  <title>Regress.test_float</title>
+  <synopsis><code mime="text/x-gjs">
+function test_float(in: Number(gfloat)): Number(gfloat) {
     // Gjs wrapper for regress_test_float()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -45,6 +37,4 @@ function test_float(in:Number):Number {
 </item>
 </terms>
 
-  
-  
 </page>
index a419628..5c19831 100644 (file)
@@ -6,30 +6,22 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>[String]</api:type>
+        <api:type>Array(String)</api:type>
       </api:returns>
       <api:name>regress_test_garray_container_return</api:name>
     </api:function>
-
   </info>
-  <title>test_garray_container_return</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_garray_container_return():[String] {
+  <title>Regress.test_garray_container_return</title>
+  <synopsis><code mime="text/x-gjs">
+function test_garray_container_return(): Array(String) {
     // Gjs wrapper for regress_test_garray_container_return()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function test_garray_container_return():[String] {
 </item>
 </terms>
 
-  
-  
 </page>
index 86b1b78..eb46a61 100644 (file)
@@ -6,30 +6,22 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>[String]</api:type>
+        <api:type>Array(String)</api:type>
       </api:returns>
       <api:name>regress_test_garray_full_return</api:name>
     </api:function>
-
   </info>
-  <title>test_garray_full_return</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_garray_full_return():[String] {
+  <title>Regress.test_garray_full_return</title>
+  <synopsis><code mime="text/x-gjs">
+function test_garray_full_return(): Array(String) {
     // Gjs wrapper for regress_test_garray_full_return()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function test_garray_full_return():[String] {
 </item>
 </terms>
 
-  
-  
 </page>
index 31ab83c..d59da0f 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_gerror_callback</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_gerror_callback(callback:Regress.TestCallbackGError):void {
+  <title>Regress.test_gerror_callback</title>
+  <synopsis><code mime="text/x-gjs">
+function test_gerror_callback(callback: <link xref="Regress.TestCallbackGError">Regress.TestCallbackGError</link>): void {
     // Gjs wrapper for regress_test_gerror_callback()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -41,6 +33,4 @@ function test_gerror_callback(callback:Regress.TestCallbackGError):void {
 </item>
 </terms>
 
-  
-  
 </page>
index b002deb..44e46f9 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_ghash_container_return</api:name>
     </api:function>
-
   </info>
-  <title>test_ghash_container_return</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_ghash_container_return():{String: String} {
+  <title>Regress.test_ghash_container_return</title>
+  <synopsis><code mime="text/x-gjs">
+function test_ghash_container_return(): {String: String} {
     // Gjs wrapper for regress_test_ghash_container_return()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function test_ghash_container_return():{String: String} {
 </item>
 </terms>
 
-  
-  
 </page>
index 1c1a0a9..d12e41a 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_ghash_everything_return</api:name>
     </api:function>
-
   </info>
-  <title>test_ghash_everything_return</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_ghash_everything_return():{String: String} {
+  <title>Regress.test_ghash_everything_return</title>
+  <synopsis><code mime="text/x-gjs">
+function test_ghash_everything_return(): {String: String} {
     // Gjs wrapper for regress_test_ghash_everything_return()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function test_ghash_everything_return():{String: String} {
 </item>
 </terms>
 
-  
-  
 </page>
index b12b8f8..bebf0cc 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_ghash_gvalue_in</api:name>
       <api:arg>
-        <api:type>{String: GObject.Value}</api:type>
+        <api:type>{String: Any}</api:type>
         <api:name>hash</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_ghash_gvalue_in</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_ghash_gvalue_in(hash:{String: GObject.Value}):void {
+  <title>Regress.test_ghash_gvalue_in</title>
+  <synopsis><code mime="text/x-gjs">
+function test_ghash_gvalue_in(hash: {String: Any}): void {
     // Gjs wrapper for regress_test_ghash_gvalue_in()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>hash</code></title>
-<p>the hash table returned by
+  <p>the hash table returned by
 <link xref="Regress.test_ghash_gvalue_return"/>.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 08748ea..728f723 100644 (file)
@@ -6,30 +6,22 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>{String: GObject.Value}</api:type>
+        <api:type>{String: Any}</api:type>
       </api:returns>
       <api:name>regress_test_ghash_gvalue_return</api:name>
     </api:function>
-
   </info>
-  <title>test_ghash_gvalue_return</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_ghash_gvalue_return():{String: GObject.Value} {
+  <title>Regress.test_ghash_gvalue_return</title>
+  <synopsis><code mime="text/x-gjs">
+function test_ghash_gvalue_return(): {String: Any} {
     // Gjs wrapper for regress_test_ghash_gvalue_return()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function test_ghash_gvalue_return():{String: GObject.Value} {
 </item>
 </terms>
 
-  
-  
 </page>
index 4dece43..b885843 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_ghash_nested_everything_return</api:name>
     </api:function>
-
   </info>
-  <title>test_ghash_nested_everything_return</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_ghash_nested_everything_return():{String: {String: String}} {
+  <title>Regress.test_ghash_nested_everything_return</title>
+  <synopsis><code mime="text/x-gjs">
+function test_ghash_nested_everything_return(): {String: {String: String}} {
     // Gjs wrapper for regress_test_ghash_nested_everything_return()
 }
-</code></synopsis>
+  </code></synopsis>
+  <p>Specify nested parameterized types directly with the (type ) annotation.</p>
 
-  
-    <p>Specify nested parameterized types directly with the (type ) annotation.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function test_ghash_nested_everything_return():{String: {String: String}} {
 </item>
 </terms>
 
-  
-  
 </page>
index 8aa4da3..e422fe5 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_ghash_nested_everything_return2</api:name>
     </api:function>
-
   </info>
-  <title>test_ghash_nested_everything_return2</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_ghash_nested_everything_return2():{String: {String: String}} {
+  <title>Regress.test_ghash_nested_everything_return2</title>
+  <synopsis><code mime="text/x-gjs">
+function test_ghash_nested_everything_return2(): {String: {String: String}} {
     // Gjs wrapper for regress_test_ghash_nested_everything_return2()
 }
-</code></synopsis>
-
-  
-    <p>Another way of specifying nested parameterized types: using the
+  </code></synopsis>
+  <p>Another way of specifying nested parameterized types: using the
 element-type annotation.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -38,6 +30,4 @@ element-type annotation.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 62990fc..e1ced28 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_ghash_nothing_in</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_ghash_nothing_in(in:{String: String}):void {
+  <title>Regress.test_ghash_nothing_in</title>
+  <synopsis><code mime="text/x-gjs">
+function test_ghash_nothing_in(in: {String: String}): void {
     // Gjs wrapper for regress_test_ghash_nothing_in()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -41,6 +33,4 @@ function test_ghash_nothing_in(in:{String: String}):void {
 </item>
 </terms>
 
-  
-  
 </page>
index 72d774d..15a291a 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_ghash_nothing_in2</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_ghash_nothing_in2(in:{String: String}):void {
+  <title>Regress.test_ghash_nothing_in2</title>
+  <synopsis><code mime="text/x-gjs">
+function test_ghash_nothing_in2(in: {String: String}): void {
     // Gjs wrapper for regress_test_ghash_nothing_in2()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -41,6 +33,4 @@ function test_ghash_nothing_in2(in:{String: String}):void {
 </item>
 </terms>
 
-  
-  
 </page>
index e3729a5..2f1e2f9 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_ghash_nothing_return</api:name>
     </api:function>
-
   </info>
-  <title>test_ghash_nothing_return</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_ghash_nothing_return():{String: String} {
+  <title>Regress.test_ghash_nothing_return</title>
+  <synopsis><code mime="text/x-gjs">
+function test_ghash_nothing_return(): {String: String} {
     // Gjs wrapper for regress_test_ghash_nothing_return()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function test_ghash_nothing_return():{String: String} {
 </item>
 </terms>
 
-  
-  
 </page>
index 7777ab4..e0319aa 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_ghash_nothing_return2</api:name>
     </api:function>
-
   </info>
-  <title>test_ghash_nothing_return2</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_ghash_nothing_return2():{String: String} {
+  <title>Regress.test_ghash_nothing_return2</title>
+  <synopsis><code mime="text/x-gjs">
+function test_ghash_nothing_return2(): {String: String} {
     // Gjs wrapper for regress_test_ghash_nothing_return2()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function test_ghash_nothing_return2():{String: String} {
 </item>
 </terms>
 
-  
-  
 </page>
index 413a75b..091d9e0 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_ghash_null_in</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_ghash_null_in(in:{String: String}):void {
+  <title>Regress.test_ghash_null_in</title>
+  <synopsis><code mime="text/x-gjs">
+function test_ghash_null_in(in: {String: String}): void {
     // Gjs wrapper for regress_test_ghash_null_in()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -41,6 +33,4 @@ function test_ghash_null_in(in:{String: String}):void {
 </item>
 </terms>
 
-  
-  
 </page>
index 2c27253..c8585e0 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_ghash_null_out</api:name>
     </api:function>
-
   </info>
-  <title>test_ghash_null_out</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_ghash_null_out():void {
+  <title>Regress.test_ghash_null_out</title>
+  <synopsis><code mime="text/x-gjs">
+function test_ghash_null_out(): {String: String} {
     // Gjs wrapper for regress_test_ghash_null_out()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
 </terms>
 
-  
-  
 </page>
index df6d686..8f4de6e 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_ghash_null_return</api:name>
     </api:function>
-
   </info>
-  <title>test_ghash_null_return</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_ghash_null_return():{String: String} {
+  <title>Regress.test_ghash_null_return</title>
+  <synopsis><code mime="text/x-gjs">
+function test_ghash_null_return(): {String: String} {
     // Gjs wrapper for regress_test_ghash_null_return()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function test_ghash_null_return():{String: String} {
 </item>
 </terms>
 
-  
-  
 </page>
index c3ac7cb..f6bc25a 100644 (file)
@@ -6,30 +6,22 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>[String]</api:type>
+        <api:type>Array(String)</api:type>
       </api:returns>
       <api:name>regress_test_glist_container_return</api:name>
     </api:function>
-
   </info>
-  <title>test_glist_container_return</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_glist_container_return():[String] {
+  <title>Regress.test_glist_container_return</title>
+  <synopsis><code mime="text/x-gjs">
+function test_glist_container_return(): Array(String) {
     // Gjs wrapper for regress_test_glist_container_return()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function test_glist_container_return():[String] {
 </item>
 </terms>
 
-  
-  
 </page>
index fb31f77..e560ff0 100644 (file)
@@ -6,30 +6,22 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>[String]</api:type>
+        <api:type>Array(String)</api:type>
       </api:returns>
       <api:name>regress_test_glist_everything_return</api:name>
     </api:function>
-
   </info>
-  <title>test_glist_everything_return</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_glist_everything_return():[String] {
+  <title>Regress.test_glist_everything_return</title>
+  <synopsis><code mime="text/x-gjs">
+function test_glist_everything_return(): Array(String) {
     // Gjs wrapper for regress_test_glist_everything_return()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function test_glist_everything_return():[String] {
 </item>
 </terms>
 
-  
-  
 </page>
index 3c85d19..952f527 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_glist_nothing_in</api:name>
       <api:arg>
-        <api:type>[String]</api:type>
+        <api:type>Array(String)</api:type>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_glist_nothing_in</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_glist_nothing_in(in:[String]):void {
+  <title>Regress.test_glist_nothing_in</title>
+  <synopsis><code mime="text/x-gjs">
+function test_glist_nothing_in(in: Array(String)): void {
     // Gjs wrapper for regress_test_glist_nothing_in()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -41,6 +33,4 @@ function test_glist_nothing_in(in:[String]):void {
 </item>
 </terms>
 
-  
-  
 </page>
index f160d12..ae7f182 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_glist_nothing_in2</api:name>
       <api:arg>
-        <api:type>[String]</api:type>
+        <api:type>Array(String)</api:type>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_glist_nothing_in2</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_glist_nothing_in2(in:[String]):void {
+  <title>Regress.test_glist_nothing_in2</title>
+  <synopsis><code mime="text/x-gjs">
+function test_glist_nothing_in2(in: Array(String)): void {
     // Gjs wrapper for regress_test_glist_nothing_in2()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -41,6 +33,4 @@ function test_glist_nothing_in2(in:[String]):void {
 </item>
 </terms>
 
-  
-  
 </page>
index e741d90..65b4463 100644 (file)
@@ -6,30 +6,22 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>[String]</api:type>
+        <api:type>Array(String)</api:type>
       </api:returns>
       <api:name>regress_test_glist_nothing_return</api:name>
     </api:function>
-
   </info>
-  <title>test_glist_nothing_return</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_glist_nothing_return():[String] {
+  <title>Regress.test_glist_nothing_return</title>
+  <synopsis><code mime="text/x-gjs">
+function test_glist_nothing_return(): Array(String) {
     // Gjs wrapper for regress_test_glist_nothing_return()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function test_glist_nothing_return():[String] {
 </item>
 </terms>
 
-  
-  
 </page>
index 0fccdbb..8b91dc3 100644 (file)
@@ -6,30 +6,22 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>[String]</api:type>
+        <api:type>Array(String)</api:type>
       </api:returns>
       <api:name>regress_test_glist_nothing_return2</api:name>
     </api:function>
-
   </info>
-  <title>test_glist_nothing_return2</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_glist_nothing_return2():[String] {
+  <title>Regress.test_glist_nothing_return2</title>
+  <synopsis><code mime="text/x-gjs">
+function test_glist_nothing_return2(): Array(String) {
     // Gjs wrapper for regress_test_glist_nothing_return2()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function test_glist_nothing_return2():[String] {
 </item>
 </terms>
 
-  
-  
 </page>
index dfedc28..5725aea 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_glist_null_in</api:name>
       <api:arg>
-        <api:type>[String]</api:type>
+        <api:type>Array(String)</api:type>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_glist_null_in</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_glist_null_in(in:[String]):void {
+  <title>Regress.test_glist_null_in</title>
+  <synopsis><code mime="text/x-gjs">
+function test_glist_null_in(in: Array(String)): void {
     // Gjs wrapper for regress_test_glist_null_in()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -41,6 +33,4 @@ function test_glist_null_in(in:[String]):void {
 </item>
 </terms>
 
-  
-  
 </page>
index a1c7c68..89ea91e 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_glist_null_out</api:name>
     </api:function>
-
   </info>
-  <title>test_glist_null_out</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_glist_null_out():void {
+  <title>Regress.test_glist_null_out</title>
+  <synopsis><code mime="text/x-gjs">
+function test_glist_null_out(): Array(String) {
     // Gjs wrapper for regress_test_glist_null_out()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
 </terms>
 
-  
-  
 </page>
index 5133d11..1d53539 100644 (file)
@@ -6,30 +6,22 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>[String]</api:type>
+        <api:type>Array(String)</api:type>
       </api:returns>
       <api:name>regress_test_gslist_container_return</api:name>
     </api:function>
-
   </info>
-  <title>test_gslist_container_return</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_gslist_container_return():[String] {
+  <title>Regress.test_gslist_container_return</title>
+  <synopsis><code mime="text/x-gjs">
+function test_gslist_container_return(): Array(String) {
     // Gjs wrapper for regress_test_gslist_container_return()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function test_gslist_container_return():[String] {
 </item>
 </terms>
 
-  
-  
 </page>
index f82b1ce..159a968 100644 (file)
@@ -6,30 +6,22 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>[String]</api:type>
+        <api:type>Array(String)</api:type>
       </api:returns>
       <api:name>regress_test_gslist_everything_return</api:name>
     </api:function>
-
   </info>
-  <title>test_gslist_everything_return</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_gslist_everything_return():[String] {
+  <title>Regress.test_gslist_everything_return</title>
+  <synopsis><code mime="text/x-gjs">
+function test_gslist_everything_return(): Array(String) {
     // Gjs wrapper for regress_test_gslist_everything_return()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function test_gslist_everything_return():[String] {
 </item>
 </terms>
 
-  
-  
 </page>
index 3409619..fc97e1c 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_gslist_nothing_in</api:name>
       <api:arg>
-        <api:type>[String]</api:type>
+        <api:type>Array(String)</api:type>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_gslist_nothing_in</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_gslist_nothing_in(in:[String]):void {
+  <title>Regress.test_gslist_nothing_in</title>
+  <synopsis><code mime="text/x-gjs">
+function test_gslist_nothing_in(in: Array(String)): void {
     // Gjs wrapper for regress_test_gslist_nothing_in()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -41,6 +33,4 @@ function test_gslist_nothing_in(in:[String]):void {
 </item>
 </terms>
 
-  
-  
 </page>
index 05e0b56..2cf15e9 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_gslist_nothing_in2</api:name>
       <api:arg>
-        <api:type>[String]</api:type>
+        <api:type>Array(String)</api:type>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_gslist_nothing_in2</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_gslist_nothing_in2(in:[String]):void {
+  <title>Regress.test_gslist_nothing_in2</title>
+  <synopsis><code mime="text/x-gjs">
+function test_gslist_nothing_in2(in: Array(String)): void {
     // Gjs wrapper for regress_test_gslist_nothing_in2()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -41,6 +33,4 @@ function test_gslist_nothing_in2(in:[String]):void {
 </item>
 </terms>
 
-  
-  
 </page>
index 03597fb..c85963a 100644 (file)
@@ -6,30 +6,22 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>[String]</api:type>
+        <api:type>Array(String)</api:type>
       </api:returns>
       <api:name>regress_test_gslist_nothing_return</api:name>
     </api:function>
-
   </info>
-  <title>test_gslist_nothing_return</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_gslist_nothing_return():[String] {
+  <title>Regress.test_gslist_nothing_return</title>
+  <synopsis><code mime="text/x-gjs">
+function test_gslist_nothing_return(): Array(String) {
     // Gjs wrapper for regress_test_gslist_nothing_return()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function test_gslist_nothing_return():[String] {
 </item>
 </terms>
 
-  
-  
 </page>
index 0331f92..92c39d2 100644 (file)
@@ -6,30 +6,22 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>[String]</api:type>
+        <api:type>Array(String)</api:type>
       </api:returns>
       <api:name>regress_test_gslist_nothing_return2</api:name>
     </api:function>
-
   </info>
-  <title>test_gslist_nothing_return2</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_gslist_nothing_return2():[String] {
+  <title>Regress.test_gslist_nothing_return2</title>
+  <synopsis><code mime="text/x-gjs">
+function test_gslist_nothing_return2(): Array(String) {
     // Gjs wrapper for regress_test_gslist_nothing_return2()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function test_gslist_nothing_return2():[String] {
 </item>
 </terms>
 
-  
-  
 </page>
index 34168c8..6942e10 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_gslist_null_in</api:name>
       <api:arg>
-        <api:type>[String]</api:type>
+        <api:type>Array(String)</api:type>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_gslist_null_in</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_gslist_null_in(in:[String]):void {
+  <title>Regress.test_gslist_null_in</title>
+  <synopsis><code mime="text/x-gjs">
+function test_gslist_null_in(in: Array(String)): void {
     // Gjs wrapper for regress_test_gslist_null_in()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -41,6 +33,4 @@ function test_gslist_null_in(in:[String]):void {
 </item>
 </terms>
 
-  
-  
 </page>
index 4c9f3ca..e79e1ad 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_gslist_null_out</api:name>
     </api:function>
-
   </info>
-  <title>test_gslist_null_out</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_gslist_null_out():void {
+  <title>Regress.test_gslist_null_out</title>
+  <synopsis><code mime="text/x-gjs">
+function test_gslist_null_out(): Array(String) {
     // Gjs wrapper for regress_test_gslist_null_out()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
 </terms>
 
-  
-  
 </page>
index 824689a..ed44d94 100644 (file)
@@ -6,34 +6,26 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>GType</api:type>
+        <api:type>GObject.Type</api:type>
       </api:returns>
       <api:name>regress_test_gtype</api:name>
       <api:arg>
-        <api:type>GType</api:type>
+        <api:type>GObject.Type</api:type>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_gtype</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_gtype(in:GType):GType {
+  <title>Regress.test_gtype</title>
+  <synopsis><code mime="text/x-gjs">
+function test_gtype(in: GObject.Type): GObject.Type {
     // Gjs wrapper for regress_test_gtype()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -45,6 +37,4 @@ function test_gtype(in:GType):GType {
 </item>
 </terms>
 
-  
-  
 </page>
index 1eedc34..e838bdc 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_gvariant_as</api:name>
     </api:function>
-
   </info>
-  <title>test_gvariant_as</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_gvariant_as():GLib.Variant {
+  <title>Regress.test_gvariant_as</title>
+  <synopsis><code mime="text/x-gjs">
+function test_gvariant_as(): <link href="../GLib-2.0/GLib.Variant.html">GLib.Variant</link> {
     // Gjs wrapper for regress_test_gvariant_as()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>New variant</p>
+  <p>New variant</p>
 </item>
 </terms>
 
-  
-  
 </page>
index a5709df..5079886 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_gvariant_asv</api:name>
     </api:function>
-
   </info>
-  <title>test_gvariant_asv</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_gvariant_asv():GLib.Variant {
+  <title>Regress.test_gvariant_asv</title>
+  <synopsis><code mime="text/x-gjs">
+function test_gvariant_asv(): <link href="../GLib-2.0/GLib.Variant.html">GLib.Variant</link> {
     // Gjs wrapper for regress_test_gvariant_asv()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>New variant</p>
+  <p>New variant</p>
 </item>
 </terms>
 
-  
-  
 </page>
index e1e7dc0..15bceed 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_gvariant_i</api:name>
     </api:function>
-
   </info>
-  <title>test_gvariant_i</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_gvariant_i():GLib.Variant {
+  <title>Regress.test_gvariant_i</title>
+  <synopsis><code mime="text/x-gjs">
+function test_gvariant_i(): <link href="../GLib-2.0/GLib.Variant.html">GLib.Variant</link> {
     // Gjs wrapper for regress_test_gvariant_i()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>New variant</p>
+  <p>New variant</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 139e0c6..5ece5f9 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_gvariant_s</api:name>
     </api:function>
-
   </info>
-  <title>test_gvariant_s</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_gvariant_s():GLib.Variant {
+  <title>Regress.test_gvariant_s</title>
+  <synopsis><code mime="text/x-gjs">
+function test_gvariant_s(): <link href="../GLib-2.0/GLib.Variant.html">GLib.Variant</link> {
     // Gjs wrapper for regress_test_gvariant_s()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>New variant</p>
+  <p>New variant</p>
 </item>
 </terms>
 
-  
-  
 </page>
index cec12de..e2eebbd 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_gvariant_v</api:name>
     </api:function>
-
   </info>
-  <title>test_gvariant_v</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_gvariant_v():GLib.Variant {
+  <title>Regress.test_gvariant_v</title>
+  <synopsis><code mime="text/x-gjs">
+function test_gvariant_v(): <link href="../GLib-2.0/GLib.Variant.html">GLib.Variant</link> {
     // Gjs wrapper for regress_test_gvariant_v()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>New variant</p>
+  <p>New variant</p>
 </item>
 </terms>
 
-  
-  
 </page>
index a49c65c..2ac3ba7 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
@@ -14,7 +13,7 @@
       </api:returns>
       <api:name>regress_test_hash_table_callback</api:name>
       <api:arg>
-        <api:type>{String: Number}</api:type>
+        <api:type>{String: Number(gint)}</api:type>
         <api:name>data</api:name>
       </api:arg>
       <api:arg>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_hash_table_callback</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_hash_table_callback(data:{String: Number}, callback:Regress.TestCallbackHashtable):void {
+  <title>Regress.test_hash_table_callback</title>
+  <synopsis><code mime="text/x-gjs">
+function test_hash_table_callback(data: {String: Number(gint)}, callback: <link xref="Regress.TestCallbackHashtable">Regress.TestCallbackHashtable</link>): void {
     // Gjs wrapper for regress_test_hash_table_callback()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>data</code></title>
-<p>GHashTable that gets passed to callback</p>
+  <p>GHashTable that gets passed to callback</p>
 </item>
 <item>
 <title><code>callback</code></title>
@@ -49,6 +41,4 @@ function test_hash_table_callback(data:{String: Number}, callback:Regress.TestCa
 </item>
 </terms>
 
-  
-  
 </page>
index 6193dd8..3bb1e7e 100644 (file)
@@ -6,34 +6,26 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_test_int</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_int</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_int(in:Number):Number {
+  <title>Regress.test_int</title>
+  <synopsis><code mime="text/x-gjs">
+function test_int(in: Number(gint)): Number(gint) {
     // Gjs wrapper for regress_test_int()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -45,6 +37,4 @@ function test_int(in:Number):Number {
 </item>
 </terms>
 
-  
-  
 </page>
index d8efb0b..d34ea70 100644 (file)
@@ -6,34 +6,26 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>gint16</api:type>
+        <api:type>Number(gint16)</api:type>
       </api:returns>
       <api:name>regress_test_int16</api:name>
       <api:arg>
-        <api:type>gint16</api:type>
+        <api:type>Number(gint16)</api:type>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_int16</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_int16(in:gint16):gint16 {
+  <title>Regress.test_int16</title>
+  <synopsis><code mime="text/x-gjs">
+function test_int16(in: Number(gint16)): Number(gint16) {
     // Gjs wrapper for regress_test_int16()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -45,6 +37,4 @@ function test_int16(in:gint16):gint16 {
 </item>
 </terms>
 
-  
-  
 </page>
index 8015b37..044fa80 100644 (file)
@@ -6,34 +6,26 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>gint32</api:type>
+        <api:type>Number(gint32)</api:type>
       </api:returns>
       <api:name>regress_test_int32</api:name>
       <api:arg>
-        <api:type>gint32</api:type>
+        <api:type>Number(gint32)</api:type>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_int32</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_int32(in:gint32):gint32 {
+  <title>Regress.test_int32</title>
+  <synopsis><code mime="text/x-gjs">
+function test_int32(in: Number(gint32)): Number(gint32) {
     // Gjs wrapper for regress_test_int32()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -45,6 +37,4 @@ function test_int32(in:gint32):gint32 {
 </item>
 </terms>
 
-  
-  
 </page>
index 24a69e9..79f3e63 100644 (file)
@@ -6,34 +6,26 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint64)</api:type>
       </api:returns>
       <api:name>regress_test_int64</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint64)</api:type>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_int64</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_int64(in:Number):Number {
+  <title>Regress.test_int64</title>
+  <synopsis><code mime="text/x-gjs">
+function test_int64(in: Number(gint64)): Number(gint64) {
     // Gjs wrapper for regress_test_int64()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -45,6 +37,4 @@ function test_int64(in:Number):Number {
 </item>
 </terms>
 
-  
-  
 </page>
index ab573a0..0f18bca 100644 (file)
@@ -6,34 +6,26 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>gint8</api:type>
+        <api:type>Number(gint8)</api:type>
       </api:returns>
       <api:name>regress_test_int8</api:name>
       <api:arg>
-        <api:type>gint8</api:type>
+        <api:type>Number(gint8)</api:type>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_int8</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_int8(in:gint8):gint8 {
+  <title>Regress.test_int8</title>
+  <synopsis><code mime="text/x-gjs">
+function test_int8(in: Number(gint8)): Number(gint8) {
     // Gjs wrapper for regress_test_int8()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -45,6 +37,4 @@ function test_int8(in:gint8):gint8 {
 </item>
 </terms>
 
-  
-  
 </page>
index 020f9e2..534ea11 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_int_out_utf8</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_int_out_utf8(in:String):void {
+  <title>Regress.test_int_out_utf8</title>
+  <synopsis><code mime="text/x-gjs">
+function test_int_out_utf8(in: String): Number(gint) {
     // Gjs wrapper for regress_test_int_out_utf8()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
 
 </item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
 </terms>
 
-  
-  
 </page>
index cb84a3c..9caddd6 100644 (file)
@@ -6,34 +6,26 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_test_int_value_arg</api:name>
       <api:arg>
-        <api:type>GObject.Value</api:type>
+        <api:type>Any</api:type>
         <api:name>v</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_int_value_arg</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_int_value_arg(v:GObject.Value):Number {
+  <title>Regress.test_int_value_arg</title>
+  <synopsis><code mime="text/x-gjs">
+function test_int_value_arg(v: Any): Number(gint) {
     // Gjs wrapper for regress_test_int_value_arg()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>v</code></title>
@@ -45,6 +37,4 @@ function test_int_value_arg(v:GObject.Value):Number {
 </item>
 </terms>
 
-  
-  
 </page>
index 12bc1ae..d043206 100644 (file)
@@ -6,34 +6,26 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(glong)</api:type>
       </api:returns>
       <api:name>regress_test_long</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(glong)</api:type>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_long</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_long(in:Number):Number {
+  <title>Regress.test_long</title>
+  <synopsis><code mime="text/x-gjs">
+function test_long(in: Number(glong)): Number(glong) {
     // Gjs wrapper for regress_test_long()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -45,6 +37,4 @@ function test_long(in:Number):Number {
 </item>
 </terms>
 
-  
-  
 </page>
index ea0646f..18c89ee 100644 (file)
@@ -6,11 +6,10 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
       </api:returns>
       <api:name>regress_test_multi_callback</api:name>
       <api:arg>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_multi_callback</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_multi_callback(callback:Regress.TestCallback):Number {
+  <title>Regress.test_multi_callback</title>
+  <synopsis><code mime="text/x-gjs">
+function test_multi_callback(callback: <link xref="Regress.TestCallback">Regress.TestCallback</link>): Number(gint) {
     // Gjs wrapper for regress_test_multi_callback()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -45,6 +37,4 @@ function test_multi_callback(callback:Regress.TestCallback):Number {
 </item>
 </terms>
 
-  
-  
 </page>
index 378ace7..c5d1f8c 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_multi_double_args</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gdouble)</api:type>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_multi_double_args</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_multi_double_args(in:Number):void {
+  <title>Regress.test_multi_double_args</title>
+  <synopsis><code mime="text/x-gjs">
+function test_multi_double_args(in: Number(gdouble)): [one: Number(gdouble), two: Number(gdouble)] {
     // Gjs wrapper for regress_test_multi_double_args()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
 
 </item>
+<item>
+<title><code>one</code></title>
+
+</item>
+<item>
+<title><code>two</code></title>
+
+</item>
 </terms>
 
-  
-  
 </page>
index 38a75e7..828f584 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_multiline_doc_comments</api:name>
     </api:function>
-
   </info>
-  <title>test_multiline_doc_comments</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_multiline_doc_comments():void {
+  <title>Regress.test_multiline_doc_comments</title>
+  <synopsis><code mime="text/x-gjs">
+function test_multiline_doc_comments(): void {
     // Gjs wrapper for regress_test_multiline_doc_comments()
 }
-</code></synopsis>
+  </code></synopsis>
+  <p>This is a function.</p>  <p>It has multiple lines in the documentation.</p>  <p>The sky is blue.</p>  <p>You will give me your credit card number.</p>
 
-  
-    <p>This is a function.</p><p>It has multiple lines in the documentation.</p><p>The sky is blue.</p><p>You will give me your credit card number.</p>
-  
-  
-  
-  
-<terms>
-</terms>
 
-  
-  
 </page>
index 54bda89..a436fa7 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_nested_parameter</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>a</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_nested_parameter</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_nested_parameter(a:Number):void {
+  <title>Regress.test_nested_parameter</title>
+  <synopsis><code mime="text/x-gjs">
+function test_nested_parameter(a: Number(gint)): void {
     // Gjs wrapper for regress_test_nested_parameter()
 }
-</code></synopsis>
-
-  
-    <p>&lt;informaltable&gt;
+  </code></synopsis>
+  <p>&lt;informaltable&gt;
   &lt;tgroup cols="3"&gt;
     &lt;thead&gt;
       &lt;row&gt;
@@ -54,18 +49,13 @@ rgb(20%, 30%, 0%)&lt;/literallayout&gt;&lt;/entry&gt;
       &lt;/row&gt;
    &lt;/tbody&gt;
  &lt;/tgroup&gt;
-&lt;/informaltable&gt;</p><p>What we're testing here is that the scanner ignores the <code>a</code> nested inside XML.</p>
-  
-  
-  
-  
+&lt;/informaltable&gt;</p>  <p>What we're testing here is that the scanner ignores the <code>a</code> nested inside XML.</p>
+
 <terms>
 <item>
 <title><code>a</code></title>
-<p>An integer</p>
+  <p>An integer</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 5af4d58..da0ee2b 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_null_gerror_callback</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_null_gerror_callback(callback:Regress.TestCallbackGError):void {
+  <title>Regress.test_null_gerror_callback</title>
+  <synopsis><code mime="text/x-gjs">
+function test_null_gerror_callback(callback: <link xref="Regress.TestCallbackGError">Regress.TestCallbackGError</link>): void {
     // Gjs wrapper for regress_test_null_gerror_callback()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -41,6 +33,4 @@ function test_null_gerror_callback(callback:Regress.TestCallbackGError):void {
 </item>
 </terms>
 
-  
-  
 </page>
index 206ac21..00e7f0e 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_owned_gerror_callback</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_owned_gerror_callback(callback:Regress.TestCallbackOwnedGError):void {
+  <title>Regress.test_owned_gerror_callback</title>
+  <synopsis><code mime="text/x-gjs">
+function test_owned_gerror_callback(callback: <link xref="Regress.TestCallbackOwnedGError">Regress.TestCallbackOwnedGError</link>): void {
     // Gjs wrapper for regress_test_owned_gerror_callback()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -41,6 +33,4 @@ function test_owned_gerror_callback(callback:Regress.TestCallbackOwnedGError):vo
 </item>
 </terms>
 
-  
-  
 </page>
index 59381ae..55262c7 100644 (file)
@@ -6,34 +6,26 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>gshort</api:type>
+        <api:type>Number(gshort)</api:type>
       </api:returns>
       <api:name>regress_test_short</api:name>
       <api:arg>
-        <api:type>gshort</api:type>
+        <api:type>Number(gshort)</api:type>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_short</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_short(in:gshort):gshort {
+  <title>Regress.test_short</title>
+  <synopsis><code mime="text/x-gjs">
+function test_short(in: Number(gshort)): Number(gshort) {
     // Gjs wrapper for regress_test_short()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -45,6 +37,4 @@ function test_short(in:gshort):gshort {
 </item>
 </terms>
 
-  
-  
 </page>
index 9d8198f..741b80d 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_simple_callback</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_simple_callback(callback:Regress.TestSimpleCallback):void {
+  <title>Regress.test_simple_callback</title>
+  <synopsis><code mime="text/x-gjs">
+function test_simple_callback(callback: <link xref="Regress.TestSimpleCallback">Regress.TestSimpleCallback</link>): void {
     // Gjs wrapper for regress_test_simple_callback()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -41,6 +33,4 @@ function test_simple_callback(callback:Regress.TestSimpleCallback):void {
 </item>
 </terms>
 
-  
-  
 </page>
index bc6896d..75b7063 100644 (file)
@@ -6,34 +6,26 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>gsize</api:type>
+        <api:type>Number(gsize)</api:type>
       </api:returns>
       <api:name>regress_test_size</api:name>
       <api:arg>
-        <api:type>gsize</api:type>
+        <api:type>Number(gsize)</api:type>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_size</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_size(in:gsize):gsize {
+  <title>Regress.test_size</title>
+  <synopsis><code mime="text/x-gjs">
+function test_size(in: Number(gsize)): Number(gsize) {
     // Gjs wrapper for regress_test_size()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -45,6 +37,4 @@ function test_size(in:gsize):gsize {
 </item>
 </terms>
 
-  
-  
 </page>
index ccc011d..bed4167 100644 (file)
@@ -6,34 +6,26 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>gssize</api:type>
+        <api:type>Number(gssize)</api:type>
       </api:returns>
       <api:name>regress_test_ssize</api:name>
       <api:arg>
-        <api:type>gssize</api:type>
+        <api:type>Number(gssize)</api:type>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_ssize</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_ssize(in:gssize):gssize {
+  <title>Regress.test_ssize</title>
+  <synopsis><code mime="text/x-gjs">
+function test_ssize(in: Number(gssize)): Number(gssize) {
     // Gjs wrapper for regress_test_ssize()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -45,6 +37,4 @@ function test_ssize(in:gssize):gssize {
 </item>
 </terms>
 
-  
-  
 </page>
index 7659a72..224203c 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_strv_in</api:name>
       <api:arg>
-        <api:type>[String]</api:type>
+        <api:type>Array(String)</api:type>
         <api:name>arr</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_strv_in</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_strv_in(arr:[String]):Boolean {
+  <title>Regress.test_strv_in</title>
+  <synopsis><code mime="text/x-gjs">
+function test_strv_in(arr: Array(String)): Boolean {
     // Gjs wrapper for regress_test_strv_in()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>arr</code></title>
@@ -45,6 +37,4 @@ function test_strv_in(arr:[String]):Boolean {
 </item>
 </terms>
 
-  
-  
 </page>
index 20617c0..65e159f 100644 (file)
@@ -6,30 +6,22 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>GObject.Value</api:type>
+        <api:type>Any</api:type>
       </api:returns>
       <api:name>regress_test_strv_in_gvalue</api:name>
     </api:function>
-
   </info>
-  <title>test_strv_in_gvalue</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_strv_in_gvalue():GObject.Value {
+  <title>Regress.test_strv_in_gvalue</title>
+  <synopsis><code mime="text/x-gjs">
+function test_strv_in_gvalue(): Any {
     // Gjs wrapper for regress_test_strv_in_gvalue()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function test_strv_in_gvalue():GObject.Value {
 </item>
 </terms>
 
-  
-  
 </page>
index 477a46f..3df6079 100644 (file)
@@ -6,30 +6,22 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>[String]</api:type>
+        <api:type>Array(String)</api:type>
       </api:returns>
       <api:name>regress_test_strv_out</api:name>
     </api:function>
-
   </info>
-  <title>test_strv_out</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_strv_out():[String] {
+  <title>Regress.test_strv_out</title>
+  <synopsis><code mime="text/x-gjs">
+function test_strv_out(): Array(String) {
     // Gjs wrapper for regress_test_strv_out()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function test_strv_out():[String] {
 </item>
 </terms>
 
-  
-  
 </page>
index d393946..824d190 100644 (file)
@@ -6,30 +6,22 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>[String]</api:type>
+        <api:type>Array(String)</api:type>
       </api:returns>
       <api:name>regress_test_strv_out_c</api:name>
     </api:function>
-
   </info>
-  <title>test_strv_out_c</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_strv_out_c():[String] {
+  <title>Regress.test_strv_out_c</title>
+  <synopsis><code mime="text/x-gjs">
+function test_strv_out_c(): Array(String) {
     // Gjs wrapper for regress_test_strv_out_c()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function test_strv_out_c():[String] {
 </item>
 </terms>
 
-  
-  
 </page>
index f9bec39..ba50c9f 100644 (file)
@@ -6,30 +6,22 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>[String]</api:type>
+        <api:type>Array(String)</api:type>
       </api:returns>
       <api:name>regress_test_strv_out_container</api:name>
     </api:function>
-
   </info>
-  <title>test_strv_out_container</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_strv_out_container():[String] {
+  <title>Regress.test_strv_out_container</title>
+  <synopsis><code mime="text/x-gjs">
+function test_strv_out_container(): Array(String) {
     // Gjs wrapper for regress_test_strv_out_container()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ function test_strv_out_container():[String] {
 </item>
 </terms>
 
-  
-  
 </page>
index 01bcba4..0f2d143 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_strv_outarg</api:name>
     </api:function>
-
   </info>
-  <title>test_strv_outarg</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_strv_outarg():void {
+  <title>Regress.test_strv_outarg</title>
+  <synopsis><code mime="text/x-gjs">
+function test_strv_outarg(): Array(String) {
     // Gjs wrapper for regress_test_strv_outarg()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
 </terms>
 
-  
-  
 </page>
index 65ccab5..09aa430 100644 (file)
@@ -6,34 +6,26 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(glong)</api:type>
       </api:returns>
       <api:name>regress_test_timet</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(glong)</api:type>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_timet</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_timet(in:Number):Number {
+  <title>Regress.test_timet</title>
+  <synopsis><code mime="text/x-gjs">
+function test_timet(in: Number(glong)): Number(glong) {
     // Gjs wrapper for regress_test_timet()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -45,6 +37,4 @@ function test_timet(in:Number):Number {
 </item>
 </terms>
 
-  
-  
 </page>
index 1696583..f90dfca 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
@@ -14,7 +13,7 @@
       </api:returns>
       <api:name>regress_test_torture_signature_0</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>x</api:name>
       </api:arg>
       <api:arg>
         <api:name>foo</api:name>
       </api:arg>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(guint)</api:type>
         <api:name>m</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_torture_signature_0</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_torture_signature_0(x:Number, foo:String, m:Number):void {
+  <title>Regress.test_torture_signature_0</title>
+  <synopsis><code mime="text/x-gjs">
+function test_torture_signature_0(x: Number(gint), foo: String, m: Number(guint)): [y: Number(gdouble), z: Number(gint), q: Number(gint)] {
     // Gjs wrapper for regress_test_torture_signature_0()
 }
-</code></synopsis>
-
-  
-    
-  
-  
-  
-  
+  </code></synopsis>
+
+
 <terms>
 <item>
 <title><code>x</code></title>
@@ -55,8 +47,18 @@ function test_torture_signature_0(x:Number, foo:String, m:Number):void {
 <title><code>m</code></title>
 
 </item>
+<item>
+<title><code>y</code></title>
+
+</item>
+<item>
+<title><code>z</code></title>
+
+</item>
+<item>
+<title><code>q</code></title>
+
+</item>
 </terms>
 
-  
-  
 </page>
index a10b0ab..a270b7e 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
@@ -14,7 +13,7 @@
       </api:returns>
       <api:name>regress_test_torture_signature_1</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>x</api:name>
       </api:arg>
       <api:arg>
         <api:name>foo</api:name>
       </api:arg>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(guint)</api:type>
         <api:name>m</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_torture_signature_1</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_torture_signature_1(x:Number, foo:String, m:Number):Boolean {
+  <title>Regress.test_torture_signature_1</title>
+  <synopsis><code mime="text/x-gjs">
+function test_torture_signature_1(x: Number(gint), foo: String, m: Number(guint)): [ok: Boolean, y: Number(gdouble), z: Number(gint), q: Number(gint)] {
     // Gjs wrapper for regress_test_torture_signature_1()
 }
-</code></synopsis>
+  </code></synopsis>
+  <p>This function throws an error if m is odd.</p>
 
-  
-    <p>This function throws an error if m is odd.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>x</code></title>
@@ -56,11 +48,21 @@ function test_torture_signature_1(x:Number, foo:String, m:Number):Boolean {
 
 </item>
 <item>
-<title><code>Returns</code></title>
+<title><code>ok</code></title>
+
+</item>
+<item>
+<title><code>y</code></title>
+
+</item>
+<item>
+<title><code>z</code></title>
+
+</item>
+<item>
+<title><code>q</code></title>
 
 </item>
 </terms>
 
-  
-  
 </page>
index 3a3eb39..efc91d6 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
@@ -14,7 +13,7 @@
       </api:returns>
       <api:name>regress_test_torture_signature_2</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>x</api:name>
       </api:arg>
       <api:arg>
         <api:name>foo</api:name>
       </api:arg>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(guint)</api:type>
         <api:name>m</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_torture_signature_2</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_torture_signature_2(x:Number, callback:Regress.TestCallbackUserData, foo:String, m:Number):void {
+  <title>Regress.test_torture_signature_2</title>
+  <synopsis><code mime="text/x-gjs">
+function test_torture_signature_2(x: Number(gint), callback: <link xref="Regress.TestCallbackUserData">Regress.TestCallbackUserData</link>, foo: String, m: Number(guint)): [y: Number(gdouble), z: Number(gint), q: Number(gint)] {
     // Gjs wrapper for regress_test_torture_signature_2()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>x</code></title>
@@ -63,8 +55,18 @@ function test_torture_signature_2(x:Number, callback:Regress.TestCallbackUserDat
 <title><code>m</code></title>
 
 </item>
+<item>
+<title><code>y</code></title>
+
+</item>
+<item>
+<title><code>z</code></title>
+
+</item>
+<item>
+<title><code>q</code></title>
+
+</item>
 </terms>
 
-  
-  
 </page>
index ac1653a..178bc03 100644 (file)
@@ -6,34 +6,26 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(guint)</api:type>
       </api:returns>
       <api:name>regress_test_uint</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(guint)</api:type>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_uint</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_uint(in:Number):Number {
+  <title>Regress.test_uint</title>
+  <synopsis><code mime="text/x-gjs">
+function test_uint(in: Number(guint)): Number(guint) {
     // Gjs wrapper for regress_test_uint()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -45,6 +37,4 @@ function test_uint(in:Number):Number {
 </item>
 </terms>
 
-  
-  
 </page>
index 93faff4..54c19af 100644 (file)
@@ -6,34 +6,26 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>guint16</api:type>
+        <api:type>Number(guint16)</api:type>
       </api:returns>
       <api:name>regress_test_uint16</api:name>
       <api:arg>
-        <api:type>guint16</api:type>
+        <api:type>Number(guint16)</api:type>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_uint16</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_uint16(in:guint16):guint16 {
+  <title>Regress.test_uint16</title>
+  <synopsis><code mime="text/x-gjs">
+function test_uint16(in: Number(guint16)): Number(guint16) {
     // Gjs wrapper for regress_test_uint16()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -45,6 +37,4 @@ function test_uint16(in:guint16):guint16 {
 </item>
 </terms>
 
-  
-  
 </page>
index ebab4d6..9d33d73 100644 (file)
@@ -6,34 +6,26 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>guint32</api:type>
+        <api:type>Number(guint32)</api:type>
       </api:returns>
       <api:name>regress_test_uint32</api:name>
       <api:arg>
-        <api:type>guint32</api:type>
+        <api:type>Number(guint32)</api:type>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_uint32</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_uint32(in:guint32):guint32 {
+  <title>Regress.test_uint32</title>
+  <synopsis><code mime="text/x-gjs">
+function test_uint32(in: Number(guint32)): Number(guint32) {
     // Gjs wrapper for regress_test_uint32()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -45,6 +37,4 @@ function test_uint32(in:guint32):guint32 {
 </item>
 </terms>
 
-  
-  
 </page>
index 942d786..3eb7a88 100644 (file)
@@ -6,34 +6,26 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(guint64)</api:type>
       </api:returns>
       <api:name>regress_test_uint64</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(guint64)</api:type>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_uint64</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_uint64(in:Number):Number {
+  <title>Regress.test_uint64</title>
+  <synopsis><code mime="text/x-gjs">
+function test_uint64(in: Number(guint64)): Number(guint64) {
     // Gjs wrapper for regress_test_uint64()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -45,6 +37,4 @@ function test_uint64(in:Number):Number {
 </item>
 </terms>
 
-  
-  
 </page>
index f39dcc1..f7b8900 100644 (file)
@@ -6,34 +6,26 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>guint8</api:type>
+        <api:type>Number(guint8)</api:type>
       </api:returns>
       <api:name>regress_test_uint8</api:name>
       <api:arg>
-        <api:type>guint8</api:type>
+        <api:type>Number(guint8)</api:type>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_uint8</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_uint8(in:guint8):guint8 {
+  <title>Regress.test_uint8</title>
+  <synopsis><code mime="text/x-gjs">
+function test_uint8(in: Number(guint8)): Number(guint8) {
     // Gjs wrapper for regress_test_uint8()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -45,6 +37,4 @@ function test_uint8(in:guint8):guint8 {
 </item>
 </terms>
 
-  
-  
 </page>
index 76f3310..7f345b1 100644 (file)
@@ -6,34 +6,26 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>Number</api:type>
+        <api:type>Number(gulong)</api:type>
       </api:returns>
       <api:name>regress_test_ulong</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gulong)</api:type>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_ulong</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_ulong(in:Number):Number {
+  <title>Regress.test_ulong</title>
+  <synopsis><code mime="text/x-gjs">
+function test_ulong(in: Number(gulong)): Number(gulong) {
     // Gjs wrapper for regress_test_ulong()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -45,6 +37,4 @@ function test_ulong(in:Number):Number {
 </item>
 </terms>
 
-  
-  
 </page>
index 25465b3..54d98f4 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_unichar</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_unichar(in:String):String {
+  <title>Regress.test_unichar</title>
+  <synopsis><code mime="text/x-gjs">
+function test_unichar(in: String): String {
     // Gjs wrapper for regress_test_unichar()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -45,6 +37,4 @@ function test_unichar(in:String):String {
 </item>
 </terms>
 
-  
-  
 </page>
index 8b7348e..f2701d0 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>e</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_unsigned_enum_param</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_unsigned_enum_param(e:Regress.TestEnumUnsigned):String {
+  <title>Regress.test_unsigned_enum_param</title>
+  <synopsis><code mime="text/x-gjs">
+function test_unsigned_enum_param(e: <link xref="Regress.TestEnumUnsigned">Regress.TestEnumUnsigned</link>): String {
     // Gjs wrapper for regress_test_unsigned_enum_param()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>e</code></title>
@@ -45,6 +37,4 @@ function test_unsigned_enum_param(e:Regress.TestEnumUnsigned):String {
 </item>
 </terms>
 
-  
-  
 </page>
index 74ada4b..207181c 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_ushort</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_ushort(in:gushort):gushort {
+  <title>Regress.test_ushort</title>
+  <synopsis><code mime="text/x-gjs">
+function test_ushort(in: gushort): gushort {
     // Gjs wrapper for regress_test_ushort()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -45,6 +37,4 @@ function test_ushort(in:gushort):gushort {
 </item>
 </terms>
 
-  
-  
 </page>
index 63fedb9..9d7f490 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_utf8_const_in</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_utf8_const_in(in:String):void {
+  <title>Regress.test_utf8_const_in</title>
+  <synopsis><code mime="text/x-gjs">
+function test_utf8_const_in(in: String): void {
     // Gjs wrapper for regress_test_utf8_const_in()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -41,6 +33,4 @@ function test_utf8_const_in(in:String):void {
 </item>
 </terms>
 
-  
-  
 </page>
index a63dc22..cf505ee 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_utf8_const_return</api:name>
     </api:function>
-
   </info>
-  <title>test_utf8_const_return</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_utf8_const_return():String {
+  <title>Regress.test_utf8_const_return</title>
+  <synopsis><code mime="text/x-gjs">
+function test_utf8_const_return(): String {
     // Gjs wrapper for regress_test_utf8_const_return()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>UTF-8 string</p>
+  <p>UTF-8 string</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 1f282c2..23364d7 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>inout</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_utf8_inout</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_utf8_inout(inout:String):void {
+  <title>Regress.test_utf8_inout</title>
+  <synopsis><code mime="text/x-gjs">
+function test_utf8_inout(inout: String): String {
     // Gjs wrapper for regress_test_utf8_inout()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
-<title><code>inout</code></title>
+<title><code>Returns</code></title>
+
+</item>
+<item>
+<title><code>Returns (out)</code></title>
 
 </item>
 </terms>
 
-  
-  
 </page>
index 2fec9e8..eef3daf 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_utf8_nonconst_return</api:name>
     </api:function>
-
   </info>
-  <title>test_utf8_nonconst_return</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_utf8_nonconst_return():String {
+  <title>Regress.test_utf8_nonconst_return</title>
+  <synopsis><code mime="text/x-gjs">
+function test_utf8_nonconst_return(): String {
     // Gjs wrapper for regress_test_utf8_nonconst_return()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
-<p>UTF-8 string</p>
+  <p>UTF-8 string</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 14f3a55..bfcd72d 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_utf8_null_in</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_utf8_null_in(in:String):void {
+  <title>Regress.test_utf8_null_in</title>
+  <synopsis><code mime="text/x-gjs">
+function test_utf8_null_in(in: String): void {
     // Gjs wrapper for regress_test_utf8_null_in()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -41,6 +33,4 @@ function test_utf8_null_in(in:String):void {
 </item>
 </terms>
 
-  
-  
 </page>
index 66632ff..db56a8b 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_utf8_null_out</api:name>
     </api:function>
-
   </info>
-  <title>test_utf8_null_out</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_utf8_null_out():void {
+  <title>Regress.test_utf8_null_out</title>
+  <synopsis><code mime="text/x-gjs">
+function test_utf8_null_out(): String {
     // Gjs wrapper for regress_test_utf8_null_out()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
 </terms>
 
-  
-  
 </page>
index b1a4062..5162aba 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_utf8_out</api:name>
     </api:function>
-
   </info>
-  <title>test_utf8_out</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_utf8_out():void {
+  <title>Regress.test_utf8_out</title>
+  <synopsis><code mime="text/x-gjs">
+function test_utf8_out(): String {
     // Gjs wrapper for regress_test_utf8_out()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
 </terms>
 
-  
-  
 </page>
index e8a097e..9ae1e7c 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_utf8_out_nonconst_return</api:name>
     </api:function>
-
   </info>
-  <title>test_utf8_out_nonconst_return</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_utf8_out_nonconst_return():String {
+  <title>Regress.test_utf8_out_nonconst_return</title>
+  <synopsis><code mime="text/x-gjs">
+function test_utf8_out_nonconst_return(): [return_value: String, out: String] {
     // Gjs wrapper for regress_test_utf8_out_nonconst_return()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
-<title><code>Returns</code></title>
-<p>a copy of "first"</p>
+<title><code>return_value</code></title>
+  <p>a copy of "first"</p>
+</item>
+<item>
+<title><code>out</code></title>
+  <p>a copy of "second"</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 07107ed..d250ca0 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_utf8_out_out</api:name>
     </api:function>
-
   </info>
-  <title>test_utf8_out_out</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_utf8_out_out():void {
+  <title>Regress.test_utf8_out_out</title>
+  <synopsis><code mime="text/x-gjs">
+function test_utf8_out_out(): [out0: String, out1: String] {
     // Gjs wrapper for regress_test_utf8_out_out()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
+<item>
+<title><code>out0</code></title>
+  <p>a copy of "first"</p>
+</item>
+<item>
+<title><code>out1</code></title>
+  <p>a copy of "second"</p>
+</item>
 </terms>
 
-  
-  
 </page>
index 59f03b7..d843d28 100644 (file)
@@ -6,45 +6,35 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
-        <api:type>GObject.Value</api:type>
+        <api:type>Any</api:type>
       </api:returns>
       <api:name>regress_test_value_return</api:name>
       <api:arg>
-        <api:type>Number</api:type>
+        <api:type>Number(gint)</api:type>
         <api:name>i</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>test_value_return</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_value_return(i:Number):GObject.Value {
+  <title>Regress.test_value_return</title>
+  <synopsis><code mime="text/x-gjs">
+function test_value_return(i: Number(gint)): Any {
     // Gjs wrapper for regress_test_value_return()
 }
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>i</code></title>
-<p>an int</p>
+  <p>an int</p>
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>the int wrapped in a GValue.</p>
+  <p>the int wrapped in a GValue.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index eb6ce0f..4cd4b2c 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_versioning</api:name>
     </api:function>
-
   </info>
-  <title>test_versioning</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_versioning():void {
+  <title>Regress.test_versioning</title>
+  <synopsis><code mime="text/x-gjs">
+function test_versioning(): void {
     // Gjs wrapper for regress_test_versioning()
 }
-</code></synopsis>
+  </code></synopsis>
 
-  
-    
-  
-  
-    <p>Since 1.32.1</p>
-  
-  
-<terms>
-</terms>
+  <p>Since 1.32.1</p>
 
-  
-  
 </page>
index a5426d8..426ebed 100644 (file)
@@ -5,21 +5,9 @@
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-
-  </info>
-  <title>Index</title>
-  
-  
-  
-
-  
-
-  
-  
-  
-  <links type="topic" ui:expanded="true" groups="class" style="linklist">
+  <info>  </info>
+  <title>Regress</title>
+  <links type="topic" ui:expanded="true" groups="class interface" style="linklist">
     <title>Classes</title>
   </links>
   <links type="topic" ui:expanded="true" groups="function" style="linklist">
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page b/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page
new file mode 100644 (file)
index 0000000..55a4b6d
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.ANNOTATION_CALCULATED_DEFINE"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.ANNOTATION_CALCULATED_DEFINE</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE.page b/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE.page
new file mode 100644 (file)
index 0000000..c8887ff
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.ANNOTATION_CALCULATED_LARGE"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.ANNOTATION_CALCULATED_LARGE</title>
+  <p>Constant to define a calculated large value</p>
+  <p>Since 1.4</p>
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page b/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page
new file mode 100644 (file)
index 0000000..08eda31
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.ANNOTATION_CALCULATED_LARGE_DIV"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.ANNOTATION_CALCULATED_LARGE_DIV</title>
+  <p>Constant to define a calculated large value</p>
+
+</page>
index 9ac6820..f0b11e8 100644 (file)
@@ -6,19 +6,11 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.ATestError</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
 <terms>
 <item>
 <title><code>ATestError.CODE0</code></title>
@@ -34,6 +26,4 @@
 </item>
 </terms>
 
-  
-  
 </page>
index 9490e4a..097c37b 100644 (file)
@@ -6,20 +6,9 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="default" type="guide"/>
   </info>
   <title>Regress.AliasedTestBoxed</title>
-  
-  
-  
-    <p>Typedef TestBoxed to test caller-allocates correctness</p>
-  
-  
-  
-  
-  
-  
-  
+  <p>Typedef TestBoxed to test caller-allocates correctness</p>
+
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion-None.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion-None.page
new file mode 100644 (file)
index 0000000..bc24e5d
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.AnAnonymousUnion-None"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.AnAnonymousUnion" group="field" type="guide"/>
+  </info>
+  <title>Regress.AnAnonymousUnion->None</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion-x.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion-x.page
new file mode 100644 (file)
index 0000000..458ce06
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.AnAnonymousUnion-x"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.AnAnonymousUnion" group="field" type="guide"/>
+  </info>
+  <title>Regress.AnAnonymousUnion->x</title>
+
+
+</page>
index 2556fed..86fafd9 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.AnAnonymousUnion"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.AnAnonymousUnion</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+an_anonymous_union = Regress.AnAnonymousUnion()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 4e19ef9..fa303bb 100644 (file)
@@ -1,25 +1,25 @@
 <?xml version="1.0"?>
 <page id="Regress.AnnotationBitfield"
       type="topic"
-      style="default"
+      style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.AnnotationBitfield</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+<terms>
+<item>
+<title><code>AnnotationBitfield.FOO</code></title>
+
+</item>
+<item>
+<title><code>AnnotationBitfield.BAR</code></title>
+
+</item>
+</terms>
+
 </page>
index 9a652d8..53ba013 100644 (file)
@@ -1,25 +1,30 @@
 <?xml version="1.0"?>
 <page id="Regress.AnnotationCallback"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="callback" type="guide"/>
   </info>
   <title>Regress.AnnotationCallback</title>
-  
-  
-  
-    <p>This is a callback.</p>
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-python">
+@accepts(int)
+@returns(int)
+def on_AnnotationCallback(in):
+  </code></synopsis>
+  <p>This is a callback.</p>
+
+<terms>
+<item>
+<title><code>in</code></title>
+  <p>array of ints</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+  <p>array of ints</p>
+</item>
+</terms>
+
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationFields-arr.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationFields-arr.page
new file mode 100644 (file)
index 0000000..71a9afb
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.AnnotationFields-arr"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.AnnotationFields" group="field" type="guide"/>
+  </info>
+  <title>Regress.AnnotationFields->arr</title>
+  <p>an array of length @len</p>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationFields-field1.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationFields-field1.page
new file mode 100644 (file)
index 0000000..36204ad
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.AnnotationFields-field1"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.AnnotationFields" group="field" type="guide"/>
+  </info>
+  <title>Regress.AnnotationFields->field1</title>
+  <p>Some documentation</p>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationFields-len.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationFields-len.page
new file mode 100644 (file)
index 0000000..e56ec4f
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.AnnotationFields-len"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.AnnotationFields" group="field" type="guide"/>
+  </info>
+  <title>Regress.AnnotationFields->len</title>
+  <p>the length of array</p>
+
+</page>
index 5323454..c7d386b 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.AnnotationFields"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.AnnotationFields</title>
-  
-  
-  
-    <p>This is a struct for testing field documentation and annotations</p>
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+annotation_fields = Regress.AnnotationFields()
+  </code></synopsis>
+  <p>This is a struct for testing field documentation and annotations</p>
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index db77a11..5933656 100644 (file)
@@ -1,25 +1,34 @@
 <?xml version="1.0"?>
 <page id="Regress.AnnotationForeachFunc"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="callback" type="guide"/>
   </info>
   <title>Regress.AnnotationForeachFunc</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-python">
+@accepts(Regress.AnnotationObject, unicode, gpointer)
+@returns(none)
+def on_AnnotationForeachFunc(object, item, user_data):
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>object</code></title>
+
+</item>
+<item>
+<title><code>item</code></title>
+
+</item>
+<item>
+<title><code>user_data</code></title>
+
+</item>
+</terms>
+
 </page>
index 79844c6..6d6b440 100644 (file)
@@ -1,25 +1,30 @@
 <?xml version="1.0"?>
 <page id="Regress.AnnotationListCallback"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="callback" type="guide"/>
   </info>
   <title>Regress.AnnotationListCallback</title>
-  
-  
-  
-    <p>This is a callback taking a list.</p>
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-python">
+@accepts([unicode])
+@returns([unicode])
+def on_AnnotationListCallback(in):
+  </code></synopsis>
+  <p>This is a callback taking a list.</p>
+
+<terms>
+<item>
+<title><code>in</code></title>
+  <p>list of strings</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+  <p>list of strings</p>
+</item>
+</terms>
+
 </page>
index 17c8029..1e2be6c 100644 (file)
@@ -1,26 +1,27 @@
 <?xml version="1.0"?>
 <page id="Regress.AnnotationNotifyFunc"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="callback" type="guide"/>
   </info>
   <title>Regress.AnnotationNotifyFunc</title>
-  
-  
-  
-    <p>This is a callback with a 'closure' argument that is not named
+  <synopsis><code mime="text/x-python">
+@accepts(gpointer)
+@returns(none)
+def on_AnnotationNotifyFunc(data):
+  </code></synopsis>
+  <p>This is a callback with a 'closure' argument that is not named
 'user_data' and hence has to be annotated.</p>
-  
-  
-  
-  
-  
-  
-  
+
+<terms>
+<item>
+<title><code>data</code></title>
+  <p>The user data</p>
+</item>
+</terms>
+
 </page>
index 9ed31bc..afeaab0 100644 (file)
@@ -6,23 +6,15 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="signal" type="guide"/>
     <title type="link" role="topic">attribute-signal</title>
-
   </info>
   <title>Regress.AnnotationObject::attribute-signal</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 def callback(annotation_object, arg1, arg2, user_param1, ...)
-</code></synopsis>
+  </code></synopsis>
+  <p>This signal tests a signal with attributes.</p>
 
-  
-    <p>This signal tests a signal with attributes.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>annotation_object</code></title>
@@ -30,11 +22,11 @@ def callback(annotation_object, arg1, arg2, user_param1, ...)
 </item>
 <item>
 <title><code>arg1</code></title>
-<p>a value</p>
+  <p>a value</p>
 </item>
 <item>
 <title><code>arg2</code></title>
-<p>another value</p>
+  <p>another value</p>
 </item>
 <title><code>user_param1</code></title>
 <p>first user parameter (if any) specified with the connect() method</p>
@@ -44,10 +36,8 @@ def callback(annotation_object, arg1, arg2, user_param1, ...)
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>the return value</p>
+  <p>the return value</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 29eedcc..9dc3aad 100644 (file)
@@ -6,23 +6,15 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="signal" type="guide"/>
     <title type="link" role="topic">doc-empty-arg-parsing</title>
-
   </info>
   <title>Regress.AnnotationObject::doc-empty-arg-parsing</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 def callback(annotation_object, arg1, user_param1, ...)
-</code></synopsis>
+  </code></synopsis>
+  <p>This signal tests an empty document argument (<code>arg1</code>)</p>
 
-  
-    <p>This signal tests an empty document argument (<code>arg1</code>)</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>annotation_object</code></title>
@@ -40,6 +32,4 @@ def callback(annotation_object, arg1, user_param1, ...)
 </item>
 </terms>
 
-  
-  
 </page>
index d9d8b55..ebbf691 100644 (file)
@@ -6,24 +6,13 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="property" type="guide"/>
     <title type="link" role="topic">function-property</title>
-
   </info>
   <title>Regress.AnnotationObject:function-property</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 "function-property"             Regress.AnnotationCallback                : Read / Write / Construct
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-  
-  
-  
 </page>
index fdfa65f..62ade5a 100644 (file)
@@ -6,24 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="signal" type="guide"/>
     <title type="link" role="topic">list-signal</title>
-
   </info>
   <title>Regress.AnnotationObject::list-signal</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 def callback(annotation_object, list, user_param1, ...)
-</code></synopsis>
-
-  
-    <p>This is a signal which takes a list of strings, but it's not
+  </code></synopsis>
+  <p>This is a signal which takes a list of strings, but it's not
 known by GObject as it's only marked as G_TYPE_POINTER</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>annotation_object</code></title>
@@ -31,7 +23,7 @@ known by GObject as it's only marked as G_TYPE_POINTER</p>
 </item>
 <item>
 <title><code>list</code></title>
-<p>a list of strings</p>
+  <p>a list of strings</p>
 </item>
 <title><code>user_param1</code></title>
 <p>first user parameter (if any) specified with the connect() method</p>
@@ -41,6 +33,4 @@ known by GObject as it's only marked as G_TYPE_POINTER</p>
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-parent_instance.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-parent_instance.page
new file mode 100644 (file)
index 0000000..97f17cd
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.AnnotationObject-parent_instance"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.AnnotationObject" group="field" type="guide"/>
+  </info>
+  <title>Regress.AnnotationObject->parent_instance</title>
+
+
+</page>
index a3cb045..f62c198 100644 (file)
@@ -6,25 +6,13 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="property" type="guide"/>
     <title type="link" role="topic">string-property</title>
-
   </info>
   <title>Regress.AnnotationObject:string-property</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 "string-property"             unicode                : Read / Write / Construct
-</code></synopsis>
-
-  
-    <p>This is a property which is a string</p>
-  
-  
-    <p>Since 1.0</p>
-  
-  
-  
-  
-  
+  </code></synopsis>
+  <p>This is a property which is a string</p>
+  <p>Since 1.0</p>
 </page>
index 06e79aa..d52eb3f 100644 (file)
@@ -6,25 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="signal" type="guide"/>
     <title type="link" role="topic">string-signal</title>
-
   </info>
   <title>Regress.AnnotationObject::string-signal</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 def callback(annotation_object, string, user_param1, ...)
-</code></synopsis>
-
-  
-    <p>This is a signal which has a broken signal handler,
+  </code></synopsis>
+  <p>This is a signal which has a broken signal handler,
 it says it's pointer but it's actually a string.</p>
-  
-  
-    <p>Since 1.0</p>
-  
-  
+  <p>Since 1.0</p>
 <terms>
 <item>
 <title><code>annotation_object</code></title>
@@ -32,7 +23,7 @@ it says it's pointer but it's actually a string.</p>
 </item>
 <item>
 <title><code>string</code></title>
-<p>a string</p>
+  <p>a string</p>
 </item>
 <title><code>user_param1</code></title>
 <p>first user parameter (if any) specified with the connect() method</p>
@@ -42,6 +33,4 @@ it says it's pointer but it's actually a string.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index c417d1e..fc7cacd 100644 (file)
@@ -6,26 +6,14 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="property" type="guide"/>
     <title type="link" role="topic">tab-property</title>
-
   </info>
   <title>Regress.AnnotationObject:tab-property</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 "tab-property"             unicode                : Read / Write / Construct
-</code></synopsis>
-
-  
-    <p>This is a property annotation intentionally indented with a mix
+  </code></synopsis>
+  <p>This is a property annotation intentionally indented with a mix
 of tabs and strings to test the tab handling capabilities of the scanner.</p>
-  
-  
-    <p>Since 1.2</p>
-  
-  
-  
-  
-  
+  <p>Since 1.2</p>
 </page>
index a04abd7..0b18415 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>somearg</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.allow_none</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, unicode)
 @returns(GObject.Object)
 def allow_none(self, somearg):
     # Python wrapper for regress_annotation_object_allow_none()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>somearg</code></title>
@@ -54,6 +46,4 @@ def allow_none(self, somearg):
 </item>
 </terms>
 
-  
-  
 </page>
index bebf773..bab5a57 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>toown</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.calleeowns</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, GObject.Object)
 @returns(int)
 def calleeowns(self, toown):
     # Python wrapper for regress_annotation_object_calleeowns()
-</code></synopsis>
+  </code></synopsis>
+  <p>This is a test for out arguments; GObject defaults to transfer</p>
 
-  
-    <p>This is a test for out arguments; GObject defaults to transfer</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>toown</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -54,6 +46,4 @@ def calleeowns(self, toown):
 </item>
 </terms>
 
-  
-  
 </page>
index ef9361f..eec4b16 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>toown2</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.calleesowns</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, GObject.Object, GObject.Object)
 @returns(int)
 def calleesowns(self, toown1, toown2):
     # Python wrapper for regress_annotation_object_calleesowns()
-</code></synopsis>
+  </code></synopsis>
+  <p>This is a test for out arguments, one transferred, other not</p>
 
-  
-    <p>This is a test for out arguments, one transferred, other not</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>toown1</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>toown2</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -62,6 +54,4 @@ def calleesowns(self, toown1, toown2):
 </item>
 </terms>
 
-  
-  
 </page>
index 4f58e6f..56d438e 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>nums</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.compute_sum</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, [int])
 @returns(none)
 def compute_sum(self, nums):
     # Python wrapper for regress_annotation_object_compute_sum()
-</code></synopsis>
+  </code></synopsis>
+  <p>Test taking a zero-terminated array</p>
 
-  
-    <p>Test taking a zero-terminated array</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>nums</code></title>
-<p>Sequence of numbers</p>
+  <p>Sequence of numbers</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 33463c4..3845573 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>n_nums</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.compute_sum_n</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, [int], int)
 @returns(none)
 def compute_sum_n(self, nums, n_nums):
     # Python wrapper for regress_annotation_object_compute_sum_n()
-</code></synopsis>
+  </code></synopsis>
+  <p>Test taking an array with length parameter</p>
 
-  
-    <p>Test taking an array with length parameter</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>nums</code></title>
-<p>Sequence of
+  <p>Sequence of
   numbers that are zero-terminated</p>
 </item>
 <item>
 <title><code>n_nums</code></title>
-<p>Length of number array</p>
+  <p>Length of number array</p>
 </item>
 </terms>
 
-  
-  
 </page>
index b3beb69..8624f61 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>n_nums</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.compute_sum_nz</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, [int], int)
 @returns(none)
 def compute_sum_nz(self, nums, n_nums):
     # Python wrapper for regress_annotation_object_compute_sum_nz()
-</code></synopsis>
+  </code></synopsis>
+  <p>Test taking a zero-terminated array with length parameter</p>
 
-  
-    <p>Test taking a zero-terminated array with length parameter</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>a <link xref="Regress.AnnotationObject"/></p>
+  <p>a <link xref="Regress.AnnotationObject"/></p>
 </item>
 <item>
 <title><code>nums</code></title>
-<p>Sequence of numbers that
+  <p>Sequence of numbers that
 are zero-terminated</p>
 </item>
 <item>
 <title><code>n_nums</code></title>
-<p>Length of number array</p>
+  <p>Length of number array</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 6498ac2..c4e6562 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.create_object</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject)
 @returns(GObject.Object)
 def create_object(self):
     # Python wrapper for regress_annotation_object_create_object()
-</code></synopsis>
+  </code></synopsis>
+  <p>Test returning a caller-owned object</p>
 
-  
-    <p>Test returning a caller-owned object</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -46,6 +38,4 @@ def create_object(self):
 </item>
 </terms>
 
-  
-  
 </page>
index fac9f16..d3aee4a 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.do_not_use</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject)
 @returns(GObject.Object)
 def do_not_use(self):
     # Python wrapper for regress_annotation_object_do_not_use()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -46,6 +38,4 @@ def do_not_use(self):
 </item>
 </terms>
 
-  
-  
 </page>
index 7e03266..050d292 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.extra_annos</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject)
 @returns(none)
 def extra_annos(self):
     # Python wrapper for regress_annotation_object_extra_annos()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -42,6 +34,4 @@ def extra_annos(self):
 </item>
 </terms>
 
-  
-  
 </page>
index 1010a01..4f30a04 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>user_data</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.foreach</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, Regress.AnnotationForeachFunc, gpointer)
 @returns(none)
 def foreach(self, func, user_data):
     # Python wrapper for regress_annotation_object_foreach()
-</code></synopsis>
+  </code></synopsis>
+  <p>Test taking a call-scoped callback</p>
 
-  
-    <p>Test taking a call-scoped callback</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>a <link xref="Regress.AnnotationObject"/></p>
+  <p>a <link xref="Regress.AnnotationObject"/></p>
 </item>
 <item>
 <title><code>func</code></title>
-<p>Callback to invoke</p>
+  <p>Callback to invoke</p>
 </item>
 <item>
 <title><code>user_data</code></title>
-<p>Callback user data</p>
+  <p>Callback user data</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 8d658f5..f23a57d 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.get_hash</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject)
 @returns({unicode: GObject.Object})
 def get_hash(self):
     # Python wrapper for regress_annotation_object_get_hash()
-</code></synopsis>
-
-  
-    <p>This is a test for returning a hash table mapping strings to
+  </code></synopsis>
+  <p>This is a test for returning a hash table mapping strings to
 objects.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>self</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -47,6 +39,4 @@ objects.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index ef231f5..957eb46 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.get_objects</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject)
 @returns([Regress.AnnotationObject])
 def get_objects(self):
     # Python wrapper for regress_annotation_object_get_objects()
-</code></synopsis>
-
-  
-    <p>This is a test for returning a list of objects.
+  </code></synopsis>
+  <p>This is a test for returning a list of objects.
 The list itself should be freed, but not the internal objects,
 intentionally similar example to gtk_container_get_children</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>self</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -48,6 +40,4 @@ intentionally similar example to gtk_container_get_children</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 13570b6..fb4d16d 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.get_strings</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject)
 @returns([unicode])
 def get_strings(self):
     # Python wrapper for regress_annotation_object_get_strings()
-</code></synopsis>
-
-  
-    <p>This is a test for returning a list of strings, where
+  </code></synopsis>
+  <p>This is a test for returning a list of strings, where
 each string needs to be freed.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>self</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -47,6 +39,4 @@ each string needs to be freed.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index ce1111f..0e7df1b 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.hidden_self</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject)
 @returns(none)
 def hidden_self(self):
     # Python wrapper for regress_annotation_object_hidden_self()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>A <link xref="Regress.AnnotationObject"/></p>
+  <p>A <link xref="Regress.AnnotationObject"/></p>
 </item>
 </terms>
 
-  
-  
 </page>
index 0e77f85..4e983c1 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>inarg</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.in</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, int)
 @returns(int)
 def in(self, inarg):
     # Python wrapper for regress_annotation_object_in()
-</code></synopsis>
+  </code></synopsis>
+  <p>This is a test for in arguments</p>
 
-  
-    <p>This is a test for in arguments</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>inarg</code></title>
-<p>This is an argument test</p>
+  <p>This is an argument test</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -54,6 +46,4 @@ def in(self, inarg):
 </item>
 </terms>
 
-  
-  
 </page>
index 6816eaf..01aa1a3 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>inoutarg</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.inout</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, int)
 @returns(int)
 def inout(self, inoutarg):
     # Python wrapper for regress_annotation_object_inout()
-</code></synopsis>
+  </code></synopsis>
+  <p>This is a test for out arguments</p>
 
-  
-    <p>This is a test for out arguments</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>inoutarg</code></title>
-<p>This is an argument test</p>
+  <p>This is an argument test</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -54,6 +46,4 @@ def inout(self, inoutarg):
 </item>
 </terms>
 
-  
-  
 </page>
index aef9dec..f862c2f 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>inoutarg</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.inout2</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, int)
 @returns(int)
 def inout2(self, inoutarg):
     # Python wrapper for regress_annotation_object_inout2()
-</code></synopsis>
+  </code></synopsis>
+  <p>This is a second test for out arguments</p>
 
-  
-    <p>This is a second test for out arguments</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>inoutarg</code></title>
-<p>This is an argument test</p>
+  <p>This is an argument test</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -54,6 +46,4 @@ def inout2(self, inoutarg):
 </item>
 </terms>
 
-  
-  
 </page>
index 4ba4bf6..a45c659 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>inoutarg</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.inout3</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, int)
 @returns(int)
 def inout3(self, inoutarg):
     # Python wrapper for regress_annotation_object_inout3()
-</code></synopsis>
+  </code></synopsis>
+  <p>This is a 3th test for out arguments</p>
 
-  
-    <p>This is a 3th test for out arguments</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>inoutarg</code></title>
-<p>This is an argument test</p>
+  <p>This is an argument test</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -54,6 +46,4 @@ def inout3(self, inoutarg):
 </item>
 </terms>
 
-  
-  
 </page>
index b6badcf..0716972 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.method</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject)
 @returns(int)
 def method(self):
     # Python wrapper for regress_annotation_object_method()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -46,6 +38,4 @@ def method(self):
 </item>
 </terms>
 
-  
-  
 </page>
index aa50a26..a9d5df4 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.notrans</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject)
 @returns(GObject.Object)
 def notrans(self):
     # Python wrapper for regress_annotation_object_notrans()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -46,6 +38,4 @@ def notrans(self):
 </item>
 </terms>
 
-  
-  
 </page>
index 606b4a1..19b16d5 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>outarg</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.out</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, int)
 @returns(int)
 def out(self, outarg):
     # Python wrapper for regress_annotation_object_out()
-</code></synopsis>
+  </code></synopsis>
+  <p>This is a test for out arguments</p>
 
-  
-    <p>This is a test for out arguments</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>outarg</code></title>
-<p>This is an argument test</p>
+  <p>This is an argument test</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -54,6 +46,4 @@ def out(self, outarg):
 </item>
 </terms>
 
-  
-  
 </page>
index 006766f..6c1c564 100644 (file)
@@ -6,23 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.AnnotationObject</title>
-  
   <synopsis><code>
 from gi.repository import Regress
 
-annotation_object = Regress.AnnotationObject(<link xref='Regress.AnnotationObject-function-property'>function_property</link>=value, <link xref='Regress.AnnotationObject-string-property'>string_property</link>=value, <link xref='Regress.AnnotationObject-tab-property'>tab_property</link>=value)  </code></synopsis>
+annotation_object = Regress.AnnotationObject(<link xref='Regress.AnnotationObject-function-property'>function_property</link>=value, <link xref='Regress.AnnotationObject-string-property'>string_property</link>=value, <link xref='Regress.AnnotationObject-tab-property'>tab_property</link>=value)
+  </code></synopsis>
+  <p>This is an object used to test annotations.</p>
 
-  
-    <p>This is an object used to test annotations.</p>
-  
-  
-  
-  
   <synopsis>
     <title>Hierarchy</title>
     <tree>
@@ -34,8 +27,11 @@ annotation_object = Regress.AnnotationObject(<link xref='Regress.AnnotationObjec
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/python"
          groups="method" style="linklist">
@@ -44,7 +40,7 @@ annotation_object = Regress.AnnotationObject(<link xref='Regress.AnnotationObjec
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/python"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
@@ -55,8 +51,10 @@ annotation_object = Regress.AnnotationObject(<link xref='Regress.AnnotationObjec
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
index 760e0be..c06014f 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>argv</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.parse_args</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, int, [unicode])
 @returns(none)
 def parse_args(self, argc, argv):
     # Python wrapper for regress_annotation_object_parse_args()
-</code></synopsis>
+  </code></synopsis>
+  <p>Test taking a zero-terminated array with length parameter</p>
 
-  
-    <p>Test taking a zero-terminated array with length parameter</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>a <link xref="Regress.AnnotationObject"/></p>
+  <p>a <link xref="Regress.AnnotationObject"/></p>
 </item>
 <item>
 <title><code>argc</code></title>
-<p>Length of the argument vector</p>
+  <p>Length of the argument vector</p>
 </item>
 <item>
 <title><code>argv</code></title>
-<p>Argument vector</p>
+  <p>Argument vector</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 7cd5236..42a98df 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>length</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.set_data</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, [guint8], gsize)
 @returns(none)
 def set_data(self, data, length):
     # Python wrapper for regress_annotation_object_set_data()
-</code></synopsis>
+  </code></synopsis>
+  <p>Test taking a guchar * with a length.</p>
 
-  
-    <p>Test taking a guchar * with a length.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>a <link xref="Regress.AnnotationObject"/></p>
+  <p>a <link xref="Regress.AnnotationObject"/></p>
 </item>
 <item>
 <title><code>data</code></title>
-<p>The data</p>
+  <p>The data</p>
 </item>
 <item>
 <title><code>length</code></title>
-<p>Length of the data</p>
+  <p>Length of the data</p>
 </item>
 </terms>
 
-  
-  
 </page>
index cd47036..23003a1 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>length</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.set_data2</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, [gint8], gsize)
 @returns(none)
 def set_data2(self, data, length):
     # Python wrapper for regress_annotation_object_set_data2()
-</code></synopsis>
+  </code></synopsis>
+  <p>Test taking a gchar * with a length.</p>
 
-  
-    <p>Test taking a gchar * with a length.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>a <link xref="Regress.AnnotationObject"/></p>
+  <p>a <link xref="Regress.AnnotationObject"/></p>
 </item>
 <item>
 <title><code>data</code></title>
-<p>The data</p>
+  <p>The data</p>
 </item>
 <item>
 <title><code>length</code></title>
-<p>Length of the data</p>
+  <p>Length of the data</p>
 </item>
 </terms>
 
-  
-  
 </page>
index b9016e8..9870962 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>length</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.set_data3</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, [guint8], gsize)
 @returns(none)
 def set_data3(self, data, length):
     # Python wrapper for regress_annotation_object_set_data3()
-</code></synopsis>
-
-  
-    <p>Test taking a gchar * with a length, overriding the array element
+  </code></synopsis>
+  <p>Test taking a gchar * with a length, overriding the array element
 type.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>self</code></title>
-<p>a <link xref="Regress.AnnotationObject"/></p>
+  <p>a <link xref="Regress.AnnotationObject"/></p>
 </item>
 <item>
 <title><code>data</code></title>
-<p>The data</p>
+  <p>The data</p>
 </item>
 <item>
 <title><code>length</code></title>
-<p>Length of the data</p>
+  <p>Length of the data</p>
 </item>
 </terms>
 
-  
-  
 </page>
index c1d085a..9d5007e 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>str_out</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.string_out</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, unicode)
 @returns(bool)
 def string_out(self, str_out):
     # Python wrapper for regress_annotation_object_string_out()
-</code></synopsis>
+  </code></synopsis>
+  <p>Test returning a string as an out parameter</p>
 
-  
-    <p>Test returning a string as an out parameter</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>a <link xref="Regress.AnnotationObject"/></p>
+  <p>a <link xref="Regress.AnnotationObject"/></p>
 </item>
 <item>
 <title><code>str_out</code></title>
-<p>string return value</p>
+  <p>string return value</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -54,6 +46,4 @@ def string_out(self, str_out):
 </item>
 </terms>
 
-  
-  
 </page>
index 385fe89..f1fd601 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>bytes</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.use_buffer</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, guint8)
 @returns(none)
 def use_buffer(self, bytes):
     # Python wrapper for regress_annotation_object_use_buffer()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>bytes</code></title>
@@ -50,6 +42,4 @@ def use_buffer(self, bytes):
 </item>
 </terms>
 
-  
-  
 </page>
@@ -1,12 +1,11 @@
 <?xml version="1.0"?>
-<page id="Regress.AnnotationObject.watch_full"
+<page id="Regress.AnnotationObject.watch"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>destroy</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.watch_full</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, Regress.AnnotationForeachFunc, gpointer, GLib.DestroyNotify)
 @returns(none)
 def watch_full(self, func, user_data, destroy):
     # Python wrapper for regress_annotation_object_watch_full()
-</code></synopsis>
+  </code></synopsis>
+  <p>Test overriding via the "Rename To" annotation.</p>
 
-  
-    <p>Test overriding via the "Rename To" annotation.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>A <link xref="Regress.AnnotationObject"/></p>
+  <p>A <link xref="Regress.AnnotationObject"/></p>
 </item>
 <item>
 <title><code>func</code></title>
-<p>The callback</p>
+  <p>The callback</p>
 </item>
 <item>
 <title><code>user_data</code></title>
-<p>The callback data</p>
+  <p>The callback data</p>
 </item>
 <item>
 <title><code>destroy</code></title>
-<p>Destroy notification</p>
+  <p>Destroy notification</p>
 </item>
 </terms>
 
-  
-  
 </page>
index bda3e9a..05fbe14 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.AnnotationObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>data</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.AnnotationObject.with_voidp</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, gpointer)
 @returns(none)
 def with_voidp(self, data):
     # Python wrapper for regress_annotation_object_with_voidp()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -46,10 +38,8 @@ def with_voidp(self, data):
 </item>
 <item>
 <title><code>data</code></title>
-<p>Opaque pointer handle</p>
+  <p>Opaque pointer handle</p>
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationStruct-objects.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationStruct-objects.page
new file mode 100644 (file)
index 0000000..f1498fc
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.AnnotationStruct-objects"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.AnnotationStruct" group="field" type="guide"/>
+  </info>
+  <title>Regress.AnnotationStruct->objects</title>
+
+
+</page>
index e210042..177e038 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.AnnotationStruct"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.AnnotationStruct</title>
-  
-  
-  
-    <p>This is a test of an array of object in an field of a struct.</p>
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+annotation_struct = Regress.AnnotationStruct()
+  </code></synopsis>
+  <p>This is a test of an array of object in an field of a struct.</p>
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.BOOL_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.BOOL_CONSTANT.page
new file mode 100644 (file)
index 0000000..e65594f
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.BOOL_CONSTANT"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.BOOL_CONSTANT</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.DOUBLE_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.DOUBLE_CONSTANT.page
new file mode 100644 (file)
index 0000000..bbc2a03
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.DOUBLE_CONSTANT"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.DOUBLE_CONSTANT</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page
new file mode 100644 (file)
index 0000000..09b1561
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FOO_DEFINE_SHOULD_BE_EXPOSED"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.FOO_DEFINE_SHOULD_BE_EXPOSED</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FOO_PIE_IS_TASTY.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FOO_PIE_IS_TASTY.page
new file mode 100644 (file)
index 0000000..132f508
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FOO_PIE_IS_TASTY"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.FOO_PIE_IS_TASTY</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FOO_SUCCESS_INT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FOO_SUCCESS_INT.page
new file mode 100644 (file)
index 0000000..58650ec
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FOO_SUCCESS_INT"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.FOO_SUCCESS_INT</title>
+
+
+</page>
index 09cd98f..2af7b9e 100644 (file)
@@ -6,19 +6,11 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.FooASingle</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
 <terms>
 <item>
 <title><code>FooASingle.FOO_SOME_SINGLE_ENUM</code></title>
@@ -26,6 +18,4 @@
 </item>
 </terms>
 
-  
-  
 </page>
index 008a8f3..a4b82a3 100644 (file)
@@ -6,19 +6,11 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.FooAddressType</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
 <terms>
 <item>
 <title><code>FooAddressType.INVALID</code></title>
@@ -34,6 +26,4 @@
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect-x.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect-x.page
new file mode 100644 (file)
index 0000000..b444125
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooBRect-x"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooBRect" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooBRect->x</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect-y.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect-y.page
new file mode 100644 (file)
index 0000000..8d7b0f1
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooBRect-y"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooBRect" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooBRect->y</title>
+
+
+</page>
index c7e03ac..bfd2b6f 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooBRect" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>b2</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.FooBRect.add</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.FooBRect, Regress.FooBRect)
 @returns(none)
 def add(self, b2):
     # Python wrapper for regress_foo_brect_add()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -50,6 +42,4 @@ def add(self, b2):
 </item>
 </terms>
 
-  
-  
 </page>
index fd1e9d6..f1b1155 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.FooBRect"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooBRect</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+foo_brect = Regress.FooBRect()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion-rect.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion-rect.page
new file mode 100644 (file)
index 0000000..1c7cead
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooBUnion-rect"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooBUnion" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooBUnion->rect</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion-type.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion-type.page
new file mode 100644 (file)
index 0000000..6fdd489
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooBUnion-type"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooBUnion" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooBUnion->type</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion-v.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion-v.page
new file mode 100644 (file)
index 0000000..0a39062
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooBUnion-v"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooBUnion" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooBUnion->v</title>
+
+
+</page>
index 4052ec5..364d844 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooBUnion" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.FooBUnion.get_contained_type</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.FooBUnion)
 @returns(int)
 def get_contained_type(self):
     # Python wrapper for regress_foo_bunion_get_contained_type()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -46,6 +38,4 @@ def get_contained_type(self):
 </item>
 </terms>
 
-  
-  
 </page>
index 8644d96..d39a74a 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.FooBUnion"
-      type="topic"
-      style="default"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooBUnion</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+foo_bunion = Regress.FooBUnion()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 95f06fb..249d74a 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooBoxed" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.FooBoxed.method</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.FooBoxed)
 @returns(none)
 def method(self):
     # Python wrapper for regress_foo_boxed_method()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -42,6 +34,4 @@ def method(self):
 </item>
 </terms>
 
-  
-  
 </page>
index bca1f99..1d8f818 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.FooBoxed"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooBoxed</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+foo_boxed = Regress.FooBoxed()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 1a51542..8486713 100644 (file)
@@ -6,23 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooBuffer</title>
-  
   <synopsis><code>
 from gi.repository import Regress
 
-foo_buffer = Regress.FooBuffer()  </code></synopsis>
+foo_buffer = Regress.FooBuffer()
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
   <synopsis>
     <title>Hierarchy</title>
     <tree>
@@ -37,8 +30,11 @@ foo_buffer = Regress.FooBuffer()  </code></synopsis>
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/python"
          groups="method" style="linklist">
@@ -47,7 +43,7 @@ foo_buffer = Regress.FooBuffer()  </code></synopsis>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/python"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
@@ -58,8 +54,10 @@ foo_buffer = Regress.FooBuffer()  </code></synopsis>
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
index e971b2d..bc4588e 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooBuffer" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.FooBuffer.some_method</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.FooBuffer)
 @returns(none)
 def some_method(self):
     # Python wrapper for regress_foo_buffer_some_method()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -42,6 +34,4 @@ def some_method(self):
 </item>
 </terms>
 
-  
-  
 </page>
index 52feda2..91c12cb 100644 (file)
@@ -1,25 +1,38 @@
 <?xml version="1.0"?>
 <page id="Regress.FooCallback"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="callback" type="guide"/>
   </info>
   <title>Regress.FooCallback</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-python">
+@accepts(Regress.FooObject, bool, gpointer)
+@returns(bool)
+def on_FooCallback(regress_foo, b, data):
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>regress_foo</code></title>
+
+</item>
+<item>
+<title><code>b</code></title>
+
+</item>
+<item>
+<title><code>data</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index fe1b647..9e8a0df 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooDBusData" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.FooDBusData.method</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.FooDBusData)
 @returns(none)
 def method(self):
     # Python wrapper for regress_foo_dbus_data_method()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -42,6 +34,4 @@ def method(self):
 </item>
 </terms>
 
-  
-  
 </page>
index b4eaead..8b23b4d 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.FooDBusData"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooDBusData</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+foo_dbus_data = Regress.FooDBusData()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 00169aa..6184391 100644 (file)
@@ -6,19 +6,11 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.FooEnumFullname</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
 <terms>
 <item>
 <title><code>FooEnumFullname.ONE</code></title>
@@ -34,6 +26,4 @@
 </item>
 </terms>
 
-  
-  
 </page>
index d2b41e6..44c091a 100644 (file)
@@ -6,19 +6,11 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.FooEnumNoType</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
 <terms>
 <item>
 <title><code>FooEnumNoType.UN</code></title>
@@ -38,6 +30,4 @@
 </item>
 </terms>
 
-  
-  
 </page>
index a802f26..a59df20 100644 (file)
@@ -6,8 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.FooEnumType" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>int</api:type>
         <api:name>regress_foo_enum</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.method</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.FooEnumType.method</title>
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.FooEnumType)
 @returns(int)
 def method(regress_foo_enum):
     # Python wrapper for regress_foo_enum_type_method()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>regress_foo_enum</code></title>
@@ -46,6 +38,4 @@ def method(regress_foo_enum):
 </item>
 </terms>
 
-  
-  
 </page>
index c3ff89b..5827bd6 100644 (file)
@@ -6,19 +6,11 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.FooEnumType</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
 <terms>
 <item>
 <title><code>FooEnumType.ALPHA</code></title>
@@ -34,6 +26,4 @@
 </item>
 </terms>
 
-  
-  
 </page>
index 149cc4f..27bc0c3 100644 (file)
@@ -6,8 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.FooEnumType" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>Regress.FooEnumType</api:type>
         <api:name>x</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.returnv</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.FooEnumType.returnv</title>
+  <synopsis><code mime="text/x-python">
 @accepts(int)
 @returns(Regress.FooEnumType)
 def returnv(x):
     # Python wrapper for regress_foo_enum_type_returnv()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>x</code></title>
@@ -46,6 +38,4 @@ def returnv(x):
 </item>
 </terms>
 
-  
-  
 </page>
index 8c0b6a2..873701b 100644 (file)
@@ -6,19 +6,11 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.FooError</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
 <terms>
 <item>
 <title><code>FooError.GOOD</code></title>
@@ -34,6 +26,4 @@
 </item>
 </terms>
 
-  
-  
 </page>
index 81f81a7..7ff6b1e 100644 (file)
@@ -6,30 +6,22 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.FooError" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>GLib.Quark</api:type>
       </api:returns>
       <api:name>regress_foo_error_quark</api:name>
     </api:function>
-
   </info>
-  <title>Index.quark</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.FooError.quark</title>
+  <synopsis><code mime="text/x-python">
 @returns(GLib.Quark)
 def quark():
     # Python wrapper for regress_foo_error_quark()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def quark():
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent-any.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent-any.page
new file mode 100644 (file)
index 0000000..aab09bd
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooEvent-any"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooEvent" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooEvent->any</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent-expose.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent-expose.page
new file mode 100644 (file)
index 0000000..58dc674
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooEvent-expose"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooEvent" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooEvent->expose</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent-type.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent-type.page
new file mode 100644 (file)
index 0000000..d9ea332
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooEvent-type"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooEvent" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooEvent->type</title>
+
+
+</page>
index ce36830..a4cbcac 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.FooEvent"
-      type="topic"
-      style="default"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooEvent</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+foo_event = Regress.FooEvent()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventAny-send_event.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventAny-send_event.page
new file mode 100644 (file)
index 0000000..045be53
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooEventAny-send_event"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooEventAny" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooEventAny->send_event</title>
+
+
+</page>
index 562ec03..dca4dc0 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.FooEventAny"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooEventAny</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+foo_event_any = Regress.FooEventAny()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventExpose-count.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventExpose-count.page
new file mode 100644 (file)
index 0000000..f9e410c
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooEventExpose-count"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooEventExpose" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooEventExpose->count</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventExpose-send_event.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventExpose-send_event.page
new file mode 100644 (file)
index 0000000..d06c23a
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooEventExpose-send_event"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooEventExpose" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooEventExpose->send_event</title>
+
+
+</page>
index 0000add..3569c0b 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.FooEventExpose"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooEventExpose</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+foo_event_expose = Regress.FooEventExpose()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 53539d4..ee0223a 100644 (file)
@@ -1,25 +1,29 @@
 <?xml version="1.0"?>
 <page id="Regress.FooFlagsNoType"
       type="topic"
-      style="default"
+      style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.FooFlagsNoType</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+<terms>
+<item>
+<title><code>FooFlagsNoType.ETT</code></title>
+
+</item>
+<item>
+<title><code>FooFlagsNoType.TVA</code></title>
+
+</item>
+<item>
+<title><code>FooFlagsNoType.FYRA</code></title>
+
+</item>
+</terms>
+
 </page>
index 2b4afeb..26b14e6 100644 (file)
@@ -1,25 +1,29 @@
 <?xml version="1.0"?>
 <page id="Regress.FooFlagsType"
       type="topic"
-      style="default"
+      style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.FooFlagsType</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+<terms>
+<item>
+<title><code>FooFlagsType.FIRST</code></title>
+
+</item>
+<item>
+<title><code>FooFlagsType.SECOND</code></title>
+
+</item>
+<item>
+<title><code>FooFlagsType.THIRD</code></title>
+
+</item>
+</terms>
+
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct-regress_foo.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct-regress_foo.page
new file mode 100644 (file)
index 0000000..07c098c
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooForeignStruct-regress_foo"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooForeignStruct" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooForeignStruct->regress_foo</title>
+
+
+</page>
index 1dbb5dc..2de9139 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooForeignStruct" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.FooForeignStruct.copy</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.FooForeignStruct)
 @returns(Regress.FooForeignStruct)
 def copy(self):
     # Python wrapper for regress_foo_foreign_struct_copy()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -46,6 +38,4 @@ def copy(self):
 </item>
 </terms>
 
-  
-  
 </page>
index 312994a..03395eb 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.FooForeignStruct"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooForeignStruct</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+foo_foreign_struct = Regress.FooForeignStruct()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index d0be1eb..e7e9478 100644 (file)
@@ -6,24 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="Regress.FooInterface" group="vfunc" type="guide"/>
-    
+    <link xref="Regress.FooInterface" group="vfunc" type="guide"/>
   </info>
   <title>Regress.FooInterface::do_regress_foo</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.FooInterface, int)
 @returns(none)
 def do_do_regress_foo(self, x):
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -35,6 +27,4 @@ def do_do_regress_foo(self, x):
 </item>
 </terms>
 
-  
-  
 </page>
index 3b2f26d..75f7add 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooInterface" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>x</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.FooInterface.do_regress_foo</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.FooInterface, int)
 @returns(none)
 def do_regress_foo(self, x):
     # Python wrapper for regress_foo_interface_do_regress_foo()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -50,6 +42,4 @@ def do_regress_foo(self, x):
 </item>
 </terms>
 
-  
-  
 </page>
index d2a482f..9bb64e7 100644 (file)
@@ -1,38 +1,33 @@
 <?xml version="1.0"?>
 <page id="Regress.FooInterface"
       type="guide"
-      style="class"
+      style="interface"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="interface" type="guide"/>
   </info>
   <title>Regress.FooInterface</title>
-  
   <synopsis><code>
 from gi.repository import Regress
 
 foo_interface = Regress.FooInterface()  </code></synopsis>
 
-  
-    
-  
-  
-  
-  
+
   <synopsis>
-    <title>Hierarchy</title>
-    <tree>
-      <item>
-        <code>Regress.FooInterface</code>
-      </item>
-    </tree>
+    <title>Prerequisites</title>
+    <p>FooInterface requires GObject.Object</p>
+  </synopsis>
+  <synopsis>
+    <title>Known Implementations</title>
+    <p>FooInterface is implemented by FooBuffer, FooObject and FooSubobject</p>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/python"
          groups="method" style="linklist">
@@ -41,7 +36,7 @@ foo_interface = Regress.FooInterface()  </code></synopsis>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/python"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
@@ -52,8 +47,10 @@ foo_interface = Regress.FooInterface()  </code></synopsis>
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
index 1c6c166..1fd4713 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooInterface" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>x</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.FooInterface.static_method</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(int)
 @returns(none)
 def static_method(x):
     # Python wrapper for regress_foo_interface_static_method()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>x</code></title>
@@ -42,6 +34,4 @@ def static_method(x):
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-parent_instance.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-parent_instance.page
new file mode 100644 (file)
index 0000000..d9cf9b8
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooObject-parent_instance"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooObject" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooObject->parent_instance</title>
+
+
+</page>
index 6cf532b..54ca4a0 100644 (file)
@@ -6,39 +6,29 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="Regress.FooObject" group="vfunc" type="guide"/>
-    
+    <link xref="Regress.FooObject" group="vfunc" type="guide"/>
   </info>
   <title>Regress.FooObject::read_fn</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.FooObject, int, int)
 @returns(none)
 def do_read_fn(object, offset, length):
-</code></synopsis>
+  </code></synopsis>
+  <p>Read some stuff.</p>
 
-  
-    <p>Read some stuff.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
-<p>obj</p>
+  <p>obj</p>
 </item>
 <item>
 <title><code>offset</code></title>
-<p>offset</p>
+  <p>offset</p>
 </item>
 <item>
 <title><code>length</code></title>
-<p>length</p>
+  <p>length</p>
 </item>
 </terms>
 
-  
-  
 </page>
index ee6c20c..3ef5897 100644 (file)
@@ -6,23 +6,15 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="signal" type="guide"/>
     <title type="link" role="topic">signal</title>
-
   </info>
   <title>Regress.FooObject::signal</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 def callback(foo_object, object, p0, user_param1, ...)
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>foo_object</code></title>
@@ -48,6 +40,4 @@ def callback(foo_object, object, p0, user_param1, ...)
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-some_int.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-some_int.page
new file mode 100644 (file)
index 0000000..b45dca8
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooObject-some_int"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooObject" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooObject->some_int</title>
+
+
+</page>
index 9d61f3a..2e4ce74 100644 (file)
@@ -6,24 +6,13 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="property" type="guide"/>
     <title type="link" role="topic">string</title>
-
   </info>
   <title>Regress.FooObject:string</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 "string"             unicode                : Read / Write / Construct
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-  
-  
-  
 </page>
index 01cf6db..b049bd1 100644 (file)
@@ -6,24 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="Regress.FooObject" group="vfunc" type="guide"/>
-    
+    <link xref="Regress.FooObject" group="vfunc" type="guide"/>
   </info>
   <title>Regress.FooObject::virtual_method</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.FooObject, int)
 @returns(bool)
 def do_virtual_method(object, first_param):
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
@@ -39,6 +31,4 @@ def do_virtual_method(object, first_param):
 </item>
 </terms>
 
-  
-  
 </page>
index 87645bc..47cbe31 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>obj</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.FooObject.a_global_method</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Utility.Object)
 @returns(none)
 def a_global_method(obj):
     # Python wrapper for regress_foo_object_a_global_method()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>obj</code></title>
@@ -42,6 +34,4 @@ def a_global_method(obj):
 </item>
 </terms>
 
-  
-  
 </page>
index 23ba26b..940f4a1 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>x</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.FooObject.append_new_stack_layer</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.FooObject, int)
 @returns(Regress.FooOtherObject)
 def append_new_stack_layer(self, x):
     # Python wrapper for regress_foo_object_append_new_stack_layer()
-</code></synopsis>
+  </code></synopsis>
+  <p>This shouldn't be scanned as a constructor.</p>
 
-  
-    <p>This shouldn't be scanned as a constructor.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -54,6 +46,4 @@ def append_new_stack_layer(self, x):
 </item>
 </terms>
 
-  
-  
 </page>
index dcc20f6..a711dd3 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.FooObject.dup_name</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.FooObject)
 @returns(unicode)
 def dup_name(self):
     # Python wrapper for regress_foo_object_dup_name()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -46,6 +38,4 @@ def dup_name(self):
 </item>
 </terms>
 
-  
-  
 </page>
index 0b32bef..fc41e2b 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.FooObject.external_type</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.FooObject)
 @returns(Utility.Object)
 def external_type(self):
     # Python wrapper for regress_foo_object_external_type()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>a <link xref="Regress.FooObject"/></p>
+  <p>a <link xref="Regress.FooObject"/></p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -46,6 +38,4 @@ def external_type(self):
 </item>
 </terms>
 
-  
-  
 </page>
index 826efd8..3876136 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_object_get_default</api:name>
     </api:function>
-
   </info>
   <title>Regress.FooObject.get_default</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @returns(Regress.FooSubobject)
 def get_default():
     # Python wrapper for regress_foo_object_get_default()
-</code></synopsis>
-
-  
-    <p>This function is intended to match clutter_stage_get_default which
+  </code></synopsis>
+  <p>This function is intended to match clutter_stage_get_default which
 uses a C sugar return type.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -38,6 +30,4 @@ uses a C sugar return type.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index e66d493..64575f2 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.FooObject.get_name</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.FooObject)
 @returns(unicode)
 def get_name(self):
     # Python wrapper for regress_foo_object_get_name()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -46,6 +38,4 @@ def get_name(self):
 </item>
 </terms>
 
-  
-  
 </page>
index e171f82..236aeb6 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>glyph</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.FooObject.handle_glyph</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.FooObject, Utility.Glyph)
 @returns(none)
 def handle_glyph(self, glyph):
     # Python wrapper for regress_foo_object_handle_glyph()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -50,6 +42,4 @@ def handle_glyph(self, glyph):
 </item>
 </terms>
 
-  
-  
 </page>
index 1781562..62cc7f4 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>time</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.FooObject.is_it_time_yet</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.FooObject, int)
 @returns(none)
 def is_it_time_yet(self, time):
     # Python wrapper for regress_foo_object_is_it_time_yet()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -50,6 +42,4 @@ def is_it_time_yet(self, time):
 </item>
 </terms>
 
-  
-  
 </page>
index 3265e6b..2670dd2 100644 (file)
@@ -6,23 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooObject</title>
-  
   <synopsis><code>
 from gi.repository import Regress
 
-foo_object = Regress.FooObject(<link xref='Regress.FooObject-hidden'>hidden</link>=value, <link xref='Regress.FooObject-string'>string</link>=value)  </code></synopsis>
+foo_object = Regress.FooObject(<link xref='Regress.FooObject-hidden'>hidden</link>=value, <link xref='Regress.FooObject-string'>string</link>=value)
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
   <synopsis>
     <title>Hierarchy</title>
     <tree>
@@ -34,8 +27,11 @@ foo_object = Regress.FooObject(<link xref='Regress.FooObject-hidden'>hidden</lin
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/python"
          groups="method" style="linklist">
@@ -44,7 +40,7 @@ foo_object = Regress.FooObject(<link xref='Regress.FooObject-hidden'>hidden</lin
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/python"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
@@ -55,8 +51,10 @@ foo_object = Regress.FooObject(<link xref='Regress.FooObject-hidden'>hidden</lin
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
index 88dee52..d33dff9 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>length</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.FooObject.read</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.FooObject, int, int)
 @returns(none)
 def read(self, offset, length):
     # Python wrapper for regress_foo_object_read()
-</code></synopsis>
+  </code></synopsis>
+  <p>Read some stuff.</p>
 
-  
-    <p>Read some stuff.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>obj</p>
+  <p>obj</p>
 </item>
 <item>
 <title><code>offset</code></title>
-<p>offset</p>
+  <p>offset</p>
 </item>
 <item>
 <title><code>length</code></title>
-<p>length</p>
+  <p>length</p>
 </item>
 </terms>
 
-  
-  
 </page>
index c652a10..462e4b2 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_object_static_meth</api:name>
     </api:function>
-
   </info>
   <title>Regress.FooObject.static_meth</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @returns(int)
 def static_meth():
     # Python wrapper for regress_foo_object_static_meth()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def static_meth():
 </item>
 </terms>
 
-  
-  
 </page>
index efdc5c4..50a7da6 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>some_type</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.FooObject.various</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.FooObject, gpointer, GType)
 @returns(none)
 def various(self, data, some_type):
     # Python wrapper for regress_foo_object_various()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -58,6 +50,4 @@ def various(self, data, some_type):
 </item>
 </terms>
 
-  
-  
 </page>
index f4920be..fb77107 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>first_param</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.FooObject.virtual_method</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.FooObject, int)
 @returns(bool)
 def virtual_method(self, first_param):
     # Python wrapper for regress_foo_object_virtual_method()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -54,6 +46,4 @@ def virtual_method(self, first_param):
 </item>
 </terms>
 
-  
-  
 </page>
index 44a63ab..fecc554 100644 (file)
@@ -6,20 +6,9 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="default" type="guide"/>
   </info>
   <title>Regress.FooObjectCookie</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
index dadf523..69a2798 100644 (file)
@@ -6,23 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooOtherObject</title>
-  
   <synopsis><code>
 from gi.repository import Regress
 
-foo_other_object = Regress.FooOtherObject()  </code></synopsis>
+foo_other_object = Regress.FooOtherObject()
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
   <synopsis>
     <title>Hierarchy</title>
     <tree>
@@ -34,8 +27,11 @@ foo_other_object = Regress.FooOtherObject()  </code></synopsis>
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/python"
          groups="method" style="linklist">
@@ -44,7 +40,7 @@ foo_other_object = Regress.FooOtherObject()  </code></synopsis>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/python"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
@@ -55,8 +51,10 @@ foo_other_object = Regress.FooOtherObject()  </code></synopsis>
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle-height.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle-height.page
new file mode 100644 (file)
index 0000000..f1da68f
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooRectangle-height"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooRectangle" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooRectangle->height</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle-width.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle-width.page
new file mode 100644 (file)
index 0000000..dd55384
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooRectangle-width"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooRectangle" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooRectangle->width</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle-x.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle-x.page
new file mode 100644 (file)
index 0000000..2c4377b
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooRectangle-x"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooRectangle" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooRectangle->x</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle-y.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle-y.page
new file mode 100644 (file)
index 0000000..8b4a9a3
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooRectangle-y"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooRectangle" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooRectangle->y</title>
+
+
+</page>
index fe924f4..3dce1cb 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooRectangle" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>r2</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.FooRectangle.add</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.FooRectangle, Regress.FooRectangle)
 @returns(none)
 def add(self, r2):
     # Python wrapper for regress_foo_rectangle_add()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>add to this rect</p>
+  <p>add to this rect</p>
 </item>
 <item>
 <title><code>r2</code></title>
-<p>source rectangle</p>
+  <p>source rectangle</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 0cfef62..3555480 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.FooRectangle"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooRectangle</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+foo_rectangle = Regress.FooRectangle()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 8a08c9a..bb6bc51 100644 (file)
@@ -6,19 +6,11 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.FooStackLayer</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
 <terms>
 <item>
 <title><code>FooStackLayer.DESKTOP</code></title>
@@ -58,6 +50,4 @@
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct-member.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct-member.page
new file mode 100644 (file)
index 0000000..655d65d
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooStruct-member"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooStruct" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooStruct->member</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct-priv.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct-priv.page
new file mode 100644 (file)
index 0000000..a0d9891
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooStruct-priv"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooStruct" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooStruct->priv</title>
+
+
+</page>
index 84f5d19..9e4a576 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.FooStruct"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooStruct</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+foo_struct = Regress.FooStruct()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooStructPrivate.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStructPrivate.page
new file mode 100644 (file)
index 0000000..52a15b7
--- /dev/null
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<page id="Regress.FooStructPrivate"
+      type="guide"
+      style="class"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="class" type="guide"/>
+  </info>
+  <title>Regress.FooStructPrivate</title>
+  <synopsis><code>
+from gi.repository import Regress
+
+foo_struct_private = Regress.FooStructPrivate()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
+</page>
index a42bb17..3b323e1 100644 (file)
@@ -6,23 +6,15 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooSubInterface" group="signal" type="guide"/>
     <title type="link" role="topic">destroy-event</title>
-
   </info>
   <title>Regress.FooSubInterface::destroy-event</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 def callback(foo_sub_interface, user_param1, ...)
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>foo_sub_interface</code></title>
@@ -36,6 +28,4 @@ def callback(foo_sub_interface, user_param1, ...)
 </item>
 </terms>
 
-  
-  
 </page>
index 82dbc62..dad4853 100644 (file)
@@ -6,24 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="Regress.FooSubInterface" group="vfunc" type="guide"/>
-    
+    <link xref="Regress.FooSubInterface" group="vfunc" type="guide"/>
   </info>
   <title>Regress.FooSubInterface::destroy_event</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.FooSubInterface)
 @returns(none)
 def do_destroy_event(self):
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -31,6 +23,4 @@ def do_destroy_event(self):
 </item>
 </terms>
 
-  
-  
 </page>
index a035189..1ed2e3b 100644 (file)
@@ -6,24 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="Regress.FooSubInterface" group="vfunc" type="guide"/>
-    
+    <link xref="Regress.FooSubInterface" group="vfunc" type="guide"/>
   </info>
   <title>Regress.FooSubInterface::do_bar</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.FooSubInterface)
 @returns(none)
 def do_do_bar(self):
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -31,6 +23,4 @@ def do_do_bar(self):
 </item>
 </terms>
 
-  
-  
 </page>
index 3b0404f..aa5a402 100644 (file)
@@ -6,24 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="Regress.FooSubInterface" group="vfunc" type="guide"/>
-    
+    <link xref="Regress.FooSubInterface" group="vfunc" type="guide"/>
   </info>
   <title>Regress.FooSubInterface::do_baz</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.FooSubInterface, GObject.Callback, gpointer)
 @returns(none)
 def do_do_baz(self, callback, user_data):
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -39,6 +31,4 @@ def do_do_baz(self, callback, user_data):
 </item>
 </terms>
 
-  
-  
 </page>
index 1ecac0d..495168a 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooSubInterface" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.FooSubInterface.do_bar</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.FooSubInterface)
 @returns(none)
 def do_bar(self):
     # Python wrapper for regress_foo_sub_interface_do_bar()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -42,6 +34,4 @@ def do_bar(self):
 </item>
 </terms>
 
-  
-  
 </page>
index 071fb0d..5b76e3f 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.FooSubInterface" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>user_data</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.FooSubInterface.do_baz</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.FooSubInterface, GObject.Callback, gpointer)
 @returns(none)
 def do_baz(self, callback, user_data):
     # Python wrapper for regress_foo_sub_interface_do_baz()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -58,6 +50,4 @@ def do_baz(self, callback, user_data):
 </item>
 </terms>
 
-  
-  
 </page>
index 81593d3..611edb1 100644 (file)
@@ -1,38 +1,33 @@
 <?xml version="1.0"?>
 <page id="Regress.FooSubInterface"
       type="guide"
-      style="class"
+      style="interface"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="interface" type="guide"/>
   </info>
   <title>Regress.FooSubInterface</title>
-  
   <synopsis><code>
 from gi.repository import Regress
 
 foo_sub_interface = Regress.FooSubInterface()  </code></synopsis>
 
-  
-    
-  
-  
-  
-  
+
   <synopsis>
-    <title>Hierarchy</title>
-    <tree>
-      <item>
-        <code>Regress.FooSubInterface</code>
-      </item>
-    </tree>
+    <title>Prerequisites</title>
+    <p>FooSubInterface requires Regress.FooInterface</p>
+  </synopsis>
+  <synopsis>
+    <title>Known Implementations</title>
+    <p>None</p>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/python"
          groups="method" style="linklist">
@@ -41,7 +36,7 @@ foo_sub_interface = Regress.FooSubInterface()  </code></synopsis>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/python"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
@@ -52,8 +47,10 @@ foo_sub_interface = Regress.FooSubInterface()  </code></synopsis>
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubobject-parent_instance.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubobject-parent_instance.page
new file mode 100644 (file)
index 0000000..33994c7
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooSubobject-parent_instance"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooSubobject" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooSubobject->parent_instance</title>
+
+
+</page>
index fc7b5ad..9cc4d6b 100644 (file)
@@ -6,23 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooSubobject</title>
-  
   <synopsis><code>
 from gi.repository import Regress
 
-foo_subobject = Regress.FooSubobject()  </code></synopsis>
+foo_subobject = Regress.FooSubobject()
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
   <synopsis>
     <title>Hierarchy</title>
     <tree>
@@ -37,8 +30,11 @@ foo_subobject = Regress.FooSubobject()  </code></synopsis>
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/python"
          groups="method" style="linklist">
@@ -47,7 +43,7 @@ foo_subobject = Regress.FooSubobject()  </code></synopsis>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/python"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
@@ -58,8 +54,10 @@ foo_subobject = Regress.FooSubobject()  </code></synopsis>
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray-data.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray-data.page
new file mode 100644 (file)
index 0000000..cc40f8f
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooThingWithArray-data"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooThingWithArray" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooThingWithArray->data</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray-lines.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray-lines.page
new file mode 100644 (file)
index 0000000..6db4319
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooThingWithArray-lines"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooThingWithArray" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooThingWithArray->lines</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray-x.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray-x.page
new file mode 100644 (file)
index 0000000..c13779f
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooThingWithArray-x"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooThingWithArray" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooThingWithArray->x</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray-y.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray-y.page
new file mode 100644 (file)
index 0000000..df8f251
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooThingWithArray-y"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooThingWithArray" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooThingWithArray->y</title>
+
+
+</page>
index 430dce7..b5224c3 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.FooThingWithArray"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooThingWithArray</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+foo_thing_with_array = Regress.FooThingWithArray()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooUnion-regress_foo.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooUnion-regress_foo.page
new file mode 100644 (file)
index 0000000..6c180dd
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooUnion-regress_foo"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooUnion" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooUnion->regress_foo</title>
+
+
+</page>
index 9746f17..84a0b44 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.FooUnion"
-      type="topic"
-      style="default"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooUnion</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+foo_union = Regress.FooUnion()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooUtilityStruct-bar.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooUtilityStruct-bar.page
new file mode 100644 (file)
index 0000000..26d131c
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FooUtilityStruct-bar"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooUtilityStruct" group="field" type="guide"/>
+  </info>
+  <title>Regress.FooUtilityStruct->bar</title>
+
+
+</page>
index 2b94f69..7c2d3e6 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.FooUtilityStruct"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.FooUtilityStruct</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+foo_utility_struct = Regress.FooUtilityStruct()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index c389ef0..19bee42 100644 (file)
@@ -6,20 +6,9 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="default" type="guide"/>
   </info>
   <title>Regress.FooXEvent</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.GI_SCANNER_ELSE.page b/tests/scanner/Regress-1.0-Python-expected/Regress.GI_SCANNER_ELSE.page
new file mode 100644 (file)
index 0000000..e9876e0
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.GI_SCANNER_ELSE"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.GI_SCANNER_ELSE</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.GI_SCANNER_IFDEF.page b/tests/scanner/Regress-1.0-Python-expected/Regress.GI_SCANNER_IFDEF.page
new file mode 100644 (file)
index 0000000..bfef183
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.GI_SCANNER_IFDEF"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.GI_SCANNER_IFDEF</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.GUINT64_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.GUINT64_CONSTANT.page
new file mode 100644 (file)
index 0000000..8c16dd2
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.GUINT64_CONSTANT"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.GUINT64_CONSTANT</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.GUINT64_CONSTANTA.page b/tests/scanner/Regress-1.0-Python-expected/Regress.GUINT64_CONSTANTA.page
new file mode 100644 (file)
index 0000000..3b0d6f1
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.GUINT64_CONSTANTA"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.GUINT64_CONSTANTA</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.G_GINT64_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.G_GINT64_CONSTANT.page
new file mode 100644 (file)
index 0000000..cdce607
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.G_GINT64_CONSTANT"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.G_GINT64_CONSTANT</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.INT_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.INT_CONSTANT.page
new file mode 100644 (file)
index 0000000..e0512ab
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.INT_CONSTANT"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.INT_CONSTANT</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.Intset.page b/tests/scanner/Regress-1.0-Python-expected/Regress.Intset.page
new file mode 100644 (file)
index 0000000..030d15b
--- /dev/null
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<page id="Regress.Intset"
+      type="guide"
+      style="class"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="class" type="guide"/>
+  </info>
+  <title>Regress.Intset</title>
+  <synopsis><code>
+from gi.repository import Regress
+
+intset = Regress.Intset()
+  </code></synopsis>
+  <p>Like telepathy-glib's TpIntset.</p>
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.LONG_STRING_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.LONG_STRING_CONSTANT.page
new file mode 100644 (file)
index 0000000..85fe96e
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.LONG_STRING_CONSTANT"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.LONG_STRING_CONSTANT</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema-attributes.page b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema-attributes.page
new file mode 100644 (file)
index 0000000..db51500
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<page id="Regress.LikeGnomeKeyringPasswordSchema-attributes"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.LikeGnomeKeyringPasswordSchema"
+      group="field"
+      type="guide"/>
+  </info>
+  <title>Regress.LikeGnomeKeyringPasswordSchema->attributes</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy.page
new file mode 100644 (file)
index 0000000..3bfbac1
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<page id="Regress.LikeGnomeKeyringPasswordSchema-dummy"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.LikeGnomeKeyringPasswordSchema"
+      group="field"
+      type="guide"/>
+  </info>
+  <title>Regress.LikeGnomeKeyringPasswordSchema->dummy</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy2.page
new file mode 100644 (file)
index 0000000..408ab29
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<page id="Regress.LikeGnomeKeyringPasswordSchema-dummy2"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.LikeGnomeKeyringPasswordSchema"
+      group="field"
+      type="guide"/>
+  </info>
+  <title>Regress.LikeGnomeKeyringPasswordSchema->dummy2</title>
+
+
+</page>
index 44a946e..94945b8 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.LikeGnomeKeyringPasswordSchema"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.LikeGnomeKeyringPasswordSchema</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+like_gnome_keyring_password_schema = Regress.LikeGnomeKeyringPasswordSchema()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.LikeXklConfigItem-name.page b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeXklConfigItem-name.page
new file mode 100644 (file)
index 0000000..dbc8998
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.LikeXklConfigItem-name"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.LikeXklConfigItem" group="field" type="guide"/>
+  </info>
+  <title>Regress.LikeXklConfigItem->name</title>
+
+
+</page>
index fb4831f..7e9839e 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.LikeXklConfigItem"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.LikeXklConfigItem</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+like_xkl_config_item = Regress.LikeXklConfigItem()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index a6815c8..f84c257 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.LikeXklConfigItem" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>name</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.LikeXklConfigItem.set_name</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.LikeXklConfigItem, unicode)
 @returns(none)
 def set_name(self, name):
     # Python wrapper for regress_like_xkl_config_item_set_name()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -50,6 +42,4 @@ def set_name(self, name):
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.MAXUINT64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.MAXUINT64.page
new file mode 100644 (file)
index 0000000..91d7ce5
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.MAXUINT64"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.MAXUINT64</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.MININT64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.MININT64.page
new file mode 100644 (file)
index 0000000..1531540
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.MININT64"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.MININT64</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.Mixed_Case_Constant.page b/tests/scanner/Regress-1.0-Python-expected/Regress.Mixed_Case_Constant.page
new file mode 100644 (file)
index 0000000..29e7314
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.Mixed_Case_Constant"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.Mixed_Case_Constant</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.NEGATIVE_INT_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.NEGATIVE_INT_CONSTANT.page
new file mode 100644 (file)
index 0000000..a0aad76
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.NEGATIVE_INT_CONSTANT"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.NEGATIVE_INT_CONSTANT</title>
+
+
+</page>
index f66aee4..1acd4d2 100644 (file)
@@ -6,20 +6,9 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="default" type="guide"/>
   </info>
   <title>Regress.PtrArrayAlias</title>
-  
-  
-  
-    <p>Typedef'd GPtrArray for some reason</p>
-  
-  
-  
-  
-  
-  
-  
+  <p>Typedef'd GPtrArray for some reason</p>
+
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.STRING_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.STRING_CONSTANT.page
new file mode 100644 (file)
index 0000000..be1d6e1
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.STRING_CONSTANT"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.STRING_CONSTANT</title>
+
+
+</page>
index f31b58e..9ab2189 100644 (file)
@@ -6,19 +6,11 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.TestABCError</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
 <terms>
 <item>
 <title><code>TestABCError.CODE1</code></title>
@@ -34,6 +26,4 @@
 </item>
 </terms>
 
-  
-  
 </page>
index 8a8114d..832a3df 100644 (file)
@@ -6,30 +6,22 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.TestABCError" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>GLib.Quark</api:type>
       </api:returns>
       <api:name>regress_test_abc_error_quark</api:name>
     </api:function>
-
   </info>
-  <title>Index.quark</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.TestABCError.quark</title>
+  <synopsis><code mime="text/x-python">
 @returns(GLib.Quark)
 def quark():
     # Python wrapper for regress_test_abc_error_quark()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def quark():
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed-nested_a.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed-nested_a.page
new file mode 100644 (file)
index 0000000..d394f4d
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestBoxed-nested_a"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestBoxed" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestBoxed->nested_a</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed-priv.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed-priv.page
new file mode 100644 (file)
index 0000000..3084c21
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestBoxed-priv"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestBoxed" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestBoxed->priv</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed-some_int8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed-some_int8.page
new file mode 100644 (file)
index 0000000..36f6632
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestBoxed-some_int8"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestBoxed" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestBoxed->some_int8</title>
+
+
+</page>
index 6e69b52..2bbe466 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestBoxed" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestBoxed.copy</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestBoxed)
 @returns(Regress.TestBoxed)
 def copy(self):
     # Python wrapper for regress_test_boxed_copy()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -46,6 +38,4 @@ def copy(self):
 </item>
 </terms>
 
-  
-  
 </page>
index b4e88aa..e15ba35 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestBoxed" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>other</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestBoxed.equals</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestBoxed, Regress.TestBoxed)
 @returns(bool)
 def equals(self, other):
     # Python wrapper for regress_test_boxed_equals()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -54,6 +46,4 @@ def equals(self, other):
 </item>
 </terms>
 
-  
-  
 </page>
index baa423f..45b56f9 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.TestBoxed"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestBoxed</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+test_boxed = Regress.TestBoxed()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB-some_int8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB-some_int8.page
new file mode 100644 (file)
index 0000000..c7666c7
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestBoxedB-some_int8"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestBoxedB" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestBoxedB->some_int8</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB-some_long.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB-some_long.page
new file mode 100644 (file)
index 0000000..a5f4a34
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestBoxedB-some_long"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestBoxedB" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestBoxedB->some_long</title>
+
+
+</page>
index 2629154..4885067 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestBoxedB" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestBoxedB.copy</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestBoxedB)
 @returns(Regress.TestBoxedB)
 def copy(self):
     # Python wrapper for regress_test_boxed_b_copy()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -46,6 +38,4 @@ def copy(self):
 </item>
 </terms>
 
-  
-  
 </page>
index 0e39780..835e8d6 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.TestBoxedB"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestBoxedB</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+test_boxed_b = Regress.TestBoxedB()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC-another_thing.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC-another_thing.page
new file mode 100644 (file)
index 0000000..a5d7c2b
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestBoxedC-another_thing"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestBoxedC" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestBoxedC->another_thing</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC-refcount.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC-refcount.page
new file mode 100644 (file)
index 0000000..0f755dd
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestBoxedC-refcount"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestBoxedC" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestBoxedC->refcount</title>
+
+
+</page>
index 18b77d9..adc2dc8 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.TestBoxedC"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestBoxedC</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+test_boxed_c = Regress.TestBoxedC()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 9910236..94c6fec 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestBoxedD" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestBoxedD.copy</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestBoxedD)
 @returns(Regress.TestBoxedD)
 def copy(self):
     # Python wrapper for regress_test_boxed_d_copy()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -46,6 +38,4 @@ def copy(self):
 </item>
 </terms>
 
-  
-  
 </page>
index 9750cc3..377d841 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestBoxedD" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestBoxedD.free</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestBoxedD)
 @returns(none)
 def free(self):
     # Python wrapper for regress_test_boxed_d_free()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -42,6 +34,4 @@ def free(self):
 </item>
 </terms>
 
-  
-  
 </page>
index f050eb6..d28544c 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestBoxedD" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestBoxedD.get_magic</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestBoxedD)
 @returns(int)
 def get_magic(self):
     # Python wrapper for regress_test_boxed_d_get_magic()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -46,6 +38,4 @@ def get_magic(self):
 </item>
 </terms>
 
-  
-  
 </page>
index 995e80d..ea57619 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.TestBoxedD"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestBoxedD</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+test_boxed_d = Regress.TestBoxedD()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedPrivate.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedPrivate.page
new file mode 100644 (file)
index 0000000..d47a18c
--- /dev/null
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<page id="Regress.TestBoxedPrivate"
+      type="guide"
+      style="class"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="class" type="guide"/>
+  </info>
+  <title>Regress.TestBoxedPrivate</title>
+  <synopsis><code>
+from gi.repository import Regress
+
+test_boxed_private = Regress.TestBoxedPrivate()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
+</page>
index bed84d5..89bde37 100644 (file)
@@ -1,25 +1,25 @@
 <?xml version="1.0"?>
 <page id="Regress.TestCallback"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="callback" type="guide"/>
   </info>
   <title>Regress.TestCallback</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-python">
+@returns(int)
+def on_TestCallback():
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index 7d3f7b8..aa45b05 100644 (file)
@@ -1,25 +1,42 @@
 <?xml version="1.0"?>
 <page id="Regress.TestCallbackArray"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="callback" type="guide"/>
   </info>
   <title>Regress.TestCallbackArray</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-python">
+@accepts([int], gsize, [unicode], int)
+@returns(int)
+def on_TestCallbackArray(one, one_length, two, two_length):
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>one</code></title>
+
+</item>
+<item>
+<title><code>one_length</code></title>
+
+</item>
+<item>
+<title><code>two</code></title>
+
+</item>
+<item>
+<title><code>two_length</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index 0b8fca1..73a5992 100644 (file)
@@ -1,25 +1,38 @@
 <?xml version="1.0"?>
 <page id="Regress.TestCallbackFull"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="callback" type="guide"/>
   </info>
   <title>Regress.TestCallbackFull</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-python">
+@accepts(int, float, filename)
+@returns(int)
+def on_TestCallbackFull(foo, bar, path):
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>foo</code></title>
+  <p>the investment rate</p>
+</item>
+<item>
+<title><code>bar</code></title>
+  <p>how much money</p>
+</item>
+<item>
+<title><code>path</code></title>
+  <p>Path to file</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index 804382f..e5da462 100644 (file)
@@ -1,25 +1,26 @@
 <?xml version="1.0"?>
 <page id="Regress.TestCallbackGError"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="callback" type="guide"/>
   </info>
   <title>Regress.TestCallbackGError</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-python">
+@accepts(GLib.Error)
+@returns(none)
+def on_TestCallbackGError(error):
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>error</code></title>
+
+</item>
+</terms>
+
 </page>
index 06ebb70..27918f6 100644 (file)
@@ -1,25 +1,26 @@
 <?xml version="1.0"?>
 <page id="Regress.TestCallbackHashtable"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="callback" type="guide"/>
   </info>
   <title>Regress.TestCallbackHashtable</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-python">
+@accepts({unicode: int})
+@returns(none)
+def on_TestCallbackHashtable(data):
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>data</code></title>
+  <p>a hash table; will be modified</p>
+</item>
+</terms>
+
 </page>
index 28b21ea..e45a3f4 100644 (file)
@@ -1,25 +1,26 @@
 <?xml version="1.0"?>
 <page id="Regress.TestCallbackOwnedGError"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="callback" type="guide"/>
   </info>
   <title>Regress.TestCallbackOwnedGError</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-python">
+@accepts(GLib.Error)
+@returns(none)
+def on_TestCallbackOwnedGError(error):
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>error</code></title>
+  <p>GError instance; must be freed by the callback</p>
+</item>
+</terms>
+
 </page>
index 286c830..b34f92a 100644 (file)
@@ -1,25 +1,30 @@
 <?xml version="1.0"?>
 <page id="Regress.TestCallbackUserData"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="callback" type="guide"/>
   </info>
   <title>Regress.TestCallbackUserData</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-python">
+@accepts(gpointer)
+@returns(int)
+def on_TestCallbackUserData(user_data):
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>user_data</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index 589059d..4ee8637 100644 (file)
@@ -6,19 +6,11 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.TestDEFError</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
 <terms>
 <item>
 <title><code>TestDEFError.CODE0</code></title>
@@ -34,6 +26,4 @@
 </item>
 </terms>
 
-  
-  
 </page>
index 814b474..10a6897 100644 (file)
@@ -6,27 +6,19 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.TestEnum</title>
-  
-  
-  
-    <p>By purpose, not all members have documentation</p>
-  
-  
-  
-  
+  <p>By purpose, not all members have documentation</p>
+
 <terms>
 <item>
 <title><code>TestEnum.VALUE1</code></title>
-<p>value 1</p>
+  <p>value 1</p>
 </item>
 <item>
 <title><code>TestEnum.VALUE2</code></title>
-<p>value 2</p>
+  <p>value 2</p>
 </item>
 <item>
 <title><code>TestEnum.VALUE3</code></title>
@@ -38,6 +30,4 @@
 </item>
 </terms>
 
-  
-  
 </page>
index 2468478..fd222a4 100644 (file)
@@ -6,8 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.TestEnum" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>unicode</api:type>
         <api:name>e</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.param</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.TestEnum.param</title>
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestEnum)
 @returns(unicode)
 def param(e):
     # Python wrapper for regress_test_enum_param()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>e</code></title>
@@ -46,6 +38,4 @@ def param(e):
 </item>
 </terms>
 
-  
-  
 </page>
index 5c0c559..34de1b8 100644 (file)
@@ -6,19 +6,11 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.TestEnumNoGEnum</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
 <terms>
 <item>
 <title><code>TestEnumNoGEnum.EVALUE1</code></title>
@@ -34,6 +26,4 @@
 </item>
 </terms>
 
-  
-  
 </page>
index df3cfa1..e6976c8 100644 (file)
@@ -6,19 +6,11 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.TestEnumUnsigned</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
 <terms>
 <item>
 <title><code>TestEnumUnsigned.VALUE1</code></title>
@@ -30,6 +22,4 @@
 </item>
 </terms>
 
-  
-  
 </page>
index d6a6ebb..15f5583 100644 (file)
@@ -6,19 +6,11 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.TestError</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
 <terms>
 <item>
 <title><code>TestError.CODE1</code></title>
@@ -34,6 +26,4 @@
 </item>
 </terms>
 
-  
-  
 </page>
index 07a91a3..379a1ff 100644 (file)
@@ -6,30 +6,22 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.TestError" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>GLib.Quark</api:type>
       </api:returns>
       <api:name>regress_test_error_quark</api:name>
     </api:function>
-
   </info>
-  <title>Index.quark</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.TestError.quark</title>
+  <synopsis><code mime="text/x-python">
 @returns(GLib.Quark)
 def quark():
     # Python wrapper for regress_test_error_quark()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def quark():
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestExternallyDefinedCallback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestExternallyDefinedCallback.page
new file mode 100644 (file)
index 0000000..f53f37e
--- /dev/null
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<page id="Regress.TestExternallyDefinedCallback"
+      type="topic"
+      style="callback"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="callback" type="guide"/>
+  </info>
+  <title>Regress.TestExternallyDefinedCallback</title>
+  <synopsis><code mime="text/x-python">
+@accepts(Regress.TestObj, int)
+@returns(none)
+def on_TestExternallyDefinedCallback(obj, someint):
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+<item>
+<title><code>someint</code></title>
+
+</item>
+</terms>
+
+</page>
index d5bfeeb..19b28a6 100644 (file)
@@ -1,25 +1,29 @@
 <?xml version="1.0"?>
 <page id="Regress.TestFlags"
       type="topic"
-      style="default"
+      style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.TestFlags</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+<terms>
+<item>
+<title><code>TestFlags.FLAG1</code></title>
+
+</item>
+<item>
+<title><code>TestFlags.FLAG2</code></title>
+
+</item>
+<item>
+<title><code>TestFlags.FLAG3</code></title>
+
+</item>
+</terms>
+
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFloating-parent_instance.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFloating-parent_instance.page
new file mode 100644 (file)
index 0000000..c546875
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestFloating-parent_instance"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestFloating" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestFloating->parent_instance</title>
+
+
+</page>
index a2b80e1..e61af14 100644 (file)
@@ -6,23 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestFloating</title>
-  
   <synopsis><code>
 from gi.repository import Regress
 
-test_floating = Regress.TestFloating()  </code></synopsis>
+test_floating = Regress.TestFloating()
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
   <synopsis>
     <title>Hierarchy</title>
     <tree>
@@ -37,8 +30,11 @@ test_floating = Regress.TestFloating()  </code></synopsis>
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/python"
          groups="method" style="linklist">
@@ -47,7 +43,7 @@ test_floating = Regress.TestFloating()  </code></synopsis>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/python"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
@@ -58,8 +54,10 @@ test_floating = Regress.TestFloating()  </code></synopsis>
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-copy.page
new file mode 100644 (file)
index 0000000..d80c40b
--- /dev/null
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<page id="Regress.TestFundamentalObject-copy"
+      type="topic"
+      style="vfunc"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestFundamentalObject" group="vfunc" type="guide"/>
+  </info>
+  <title>Regress.TestFundamentalObject::copy</title>
+  <synopsis><code mime="text/x-python">
+@accepts(Regress.TestFundamentalObject)
+@returns(Regress.TestFundamentalObject)
+def do_copy(obj):
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-finalize.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-finalize.page
new file mode 100644 (file)
index 0000000..5ff38ee
--- /dev/null
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<page id="Regress.TestFundamentalObject-finalize"
+      type="topic"
+      style="vfunc"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestFundamentalObject" group="vfunc" type="guide"/>
+  </info>
+  <title>Regress.TestFundamentalObject::finalize</title>
+  <synopsis><code mime="text/x-python">
+@accepts(Regress.TestFundamentalObject)
+@returns(none)
+def do_finalize(obj):
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-flags.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-flags.page
new file mode 100644 (file)
index 0000000..875ba30
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestFundamentalObject-flags"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestFundamentalObject" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestFundamentalObject->flags</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-instance.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-instance.page
new file mode 100644 (file)
index 0000000..693df03
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestFundamentalObject-instance"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestFundamentalObject" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestFundamentalObject->instance</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-refcount.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-refcount.page
new file mode 100644 (file)
index 0000000..3413765
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestFundamentalObject-refcount"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestFundamentalObject" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestFundamentalObject->refcount</title>
+
+
+</page>
index 7035407..fe54afd 100644 (file)
@@ -6,23 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestFundamentalObject</title>
-  
   <synopsis><code>
 from gi.repository import Regress
 
-test_fundamental_object = Regress.TestFundamentalObject()  </code></synopsis>
+test_fundamental_object = Regress.TestFundamentalObject()
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
   <synopsis>
     <title>Hierarchy</title>
     <tree>
@@ -31,8 +24,11 @@ test_fundamental_object = Regress.TestFundamentalObject()  </code></synopsis>
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/python"
          groups="method" style="linklist">
@@ -41,7 +37,7 @@ test_fundamental_object = Regress.TestFundamentalObject()  </code></synopsis>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/python"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
@@ -52,8 +48,10 @@ test_fundamental_object = Regress.TestFundamentalObject()  </code></synopsis>
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
index ed3159d..cbd364b 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestFundamentalObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestFundamentalObject.ref</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestFundamentalObject)
 @returns(Regress.TestFundamentalObject)
 def ref(self):
     # Python wrapper for regress_test_fundamental_object_ref()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -46,6 +38,4 @@ def ref(self):
 </item>
 </terms>
 
-  
-  
 </page>
index 1ecf6c1..a356238 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestFundamentalObject" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestFundamentalObject.unref</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestFundamentalObject)
 @returns(none)
 def unref(self):
     # Python wrapper for regress_test_fundamental_object_unref()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -42,6 +34,4 @@ def unref(self):
 </item>
 </terms>
 
-  
-  
 </page>
index 73a3328..d776e83 100644 (file)
@@ -1,25 +1,30 @@
 <?xml version="1.0"?>
 <page id="Regress.TestFundamentalObjectCopyFunction"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="callback" type="guide"/>
   </info>
   <title>Regress.TestFundamentalObjectCopyFunction</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-python">
+@accepts(Regress.TestFundamentalObject)
+@returns(Regress.TestFundamentalObject)
+def on_TestFundamentalObjectCopyFunction(obj):
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
 </page>
index df0e8fb..beaa9fd 100644 (file)
@@ -1,25 +1,26 @@
 <?xml version="1.0"?>
 <page id="Regress.TestFundamentalObjectFinalizeFunction"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="callback" type="guide"/>
   </info>
   <title>Regress.TestFundamentalObjectFinalizeFunction</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-python">
+@accepts(Regress.TestFundamentalObject)
+@returns(none)
+def on_TestFundamentalObjectFinalizeFunction(obj):
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+</terms>
+
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject-data.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject-data.page
new file mode 100644 (file)
index 0000000..02269eb
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestFundamentalSubObject-data"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestFundamentalSubObject" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestFundamentalSubObject->data</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject-fundamental_object.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject-fundamental_object.page
new file mode 100644 (file)
index 0000000..27c5cf4
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestFundamentalSubObject-fundamental_object"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestFundamentalSubObject" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestFundamentalSubObject->fundamental_object</title>
+
+
+</page>
index 6b1e810..8a454a6 100644 (file)
@@ -6,23 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestFundamentalSubObject</title>
-  
   <synopsis><code>
 from gi.repository import Regress
 
-test_fundamental_sub_object = Regress.TestFundamentalSubObject()  </code></synopsis>
+test_fundamental_sub_object = Regress.TestFundamentalSubObject()
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
   <synopsis>
     <title>Hierarchy</title>
     <tree>
@@ -34,8 +27,11 @@ test_fundamental_sub_object = Regress.TestFundamentalSubObject()  </code></synop
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/python"
          groups="method" style="linklist">
@@ -44,7 +40,7 @@ test_fundamental_sub_object = Regress.TestFundamentalSubObject()  </code></synop
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/python"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
@@ -55,8 +51,10 @@ test_fundamental_sub_object = Regress.TestFundamentalSubObject()  </code></synop
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable-parent_instance.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable-parent_instance.page
new file mode 100644 (file)
index 0000000..2295feb
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestInheritDrawable-parent_instance"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestInheritDrawable" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestInheritDrawable->parent_instance</title>
+
+
+</page>
index 1cfcfdc..c472c32 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestInheritDrawable" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>x</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestInheritDrawable.do_foo</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestInheritDrawable, int)
 @returns(none)
 def do_foo(self, x):
     # Python wrapper for regress_test_inherit_drawable_do_foo()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -50,6 +42,4 @@ def do_foo(self, x):
 </item>
 </terms>
 
-  
-  
 </page>
index e00b489..97ccc2b 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestInheritDrawable" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>x</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestInheritDrawable.do_foo_maybe_throw</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestInheritDrawable, int)
 @returns(none)
 def do_foo_maybe_throw(self, x):
     # Python wrapper for regress_test_inherit_drawable_do_foo_maybe_throw()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -50,6 +42,4 @@ def do_foo_maybe_throw(self, x):
 </item>
 </terms>
 
-  
-  
 </page>
index 357d069..08044b3 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestInheritDrawable" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>y</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestInheritDrawable.get_origin</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestInheritDrawable, int, int)
 @returns(none)
 def get_origin(self, x, y):
     # Python wrapper for regress_test_inherit_drawable_get_origin()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -58,6 +50,4 @@ def get_origin(self, x, y):
 </item>
 </terms>
 
-  
-  
 </page>
index 3bbdfed..95ecf36 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestInheritDrawable" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>height</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestInheritDrawable.get_size</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestInheritDrawable, int, int)
 @returns(none)
 def get_size(self, width, height):
     # Python wrapper for regress_test_inherit_drawable_get_size()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -58,6 +50,4 @@ def get_size(self, width, height):
 </item>
 </terms>
 
-  
-  
 </page>
index 1fdd2c8..7322be0 100644 (file)
@@ -6,23 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestInheritDrawable</title>
-  
   <synopsis><code>
 from gi.repository import Regress
 
-test_inherit_drawable = Regress.TestInheritDrawable()  </code></synopsis>
+test_inherit_drawable = Regress.TestInheritDrawable()
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
   <synopsis>
     <title>Hierarchy</title>
     <tree>
@@ -34,8 +27,11 @@ test_inherit_drawable = Regress.TestInheritDrawable()  </code></synopsis>
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/python"
          groups="method" style="linklist">
@@ -44,7 +40,7 @@ test_inherit_drawable = Regress.TestInheritDrawable()  </code></synopsis>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/python"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
@@ -55,8 +51,10 @@ test_inherit_drawable = Regress.TestInheritDrawable()  </code></synopsis>
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritPixmapObjectClass-parent_class.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritPixmapObjectClass-parent_class.page
new file mode 100644 (file)
index 0000000..bf056d8
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestInheritPixmapObjectClass-parent_class"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestInheritPixmapObjectClass" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestInheritPixmapObjectClass->parent_class</title>
+
+
+</page>
index 0df0396..14b0ab6 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.TestInheritPixmapObjectClass"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestInheritPixmapObjectClass</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+test_inherit_pixmap_object_class = Regress.TestInheritPixmapObjectClass()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 807e18a..7fb4c88 100644 (file)
@@ -1,38 +1,33 @@
 <?xml version="1.0"?>
 <page id="Regress.TestInterface"
       type="guide"
-      style="class"
+      style="interface"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="interface" type="guide"/>
   </info>
   <title>Regress.TestInterface</title>
-  
   <synopsis><code>
 from gi.repository import Regress
 
 test_interface = Regress.TestInterface()  </code></synopsis>
 
-  
-    
-  
-  
-  
-  
+
   <synopsis>
-    <title>Hierarchy</title>
-    <tree>
-      <item>
-        <code>Regress.TestInterface</code>
-      </item>
-    </tree>
+    <title>Prerequisites</title>
+    <p>TestInterface requires GObject.Object</p>
+  </synopsis>
+  <synopsis>
+    <title>Known Implementations</title>
+    <p>None</p>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/python"
          groups="method" style="linklist">
@@ -41,7 +36,7 @@ test_interface = Regress.TestInterface()  </code></synopsis>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/python"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
@@ -52,8 +47,10 @@ test_interface = Regress.TestInterface()  </code></synopsis>
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
index f8fb4a1..bf42080 100644 (file)
@@ -6,23 +6,15 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">all</title>
-
   </info>
   <title>Regress.TestObj::all</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 def callback(test_obj, user_param1, ...)
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>test_obj</code></title>
@@ -36,6 +28,4 @@ def callback(test_obj, user_param1, ...)
 </item>
 </terms>
 
-  
-  
 </page>
index 7a3b9c9..adae8c0 100644 (file)
@@ -6,24 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="Regress.TestObj" group="vfunc" type="guide"/>
-    
+    <link xref="Regress.TestObj" group="vfunc" type="guide"/>
   </info>
   <title>Regress.TestObj::allow_none_vfunc</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj, Regress.TestObj)
 @returns(none)
 def do_allow_none_vfunc(obj, two):
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>obj</code></title>
@@ -31,10 +23,8 @@ def do_allow_none_vfunc(obj, two):
 </item>
 <item>
 <title><code>two</code></title>
-<p>Another object</p>
+  <p>Another object</p>
 </item>
 </terms>
 
-  
-  
 </page>
index f1f1b52..cb3eaf3 100644 (file)
@@ -6,24 +6,13 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="property" type="guide"/>
     <title type="link" role="topic">bare</title>
-
   </info>
   <title>Regress.TestObj:bare</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 "bare"             GObject.Object                : Read / Write
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-  
-  
-  
 </page>
index a392a77..8e97615 100644 (file)
@@ -6,24 +6,13 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="property" type="guide"/>
     <title type="link" role="topic">boxed</title>
-
   </info>
   <title>Regress.TestObj:boxed</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 "boxed"             Regress.TestBoxed                : Read / Write
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-  
-  
-  
 </page>
index f35c031..1ef90a9 100644 (file)
@@ -6,23 +6,15 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">cleanup</title>
-
   </info>
   <title>Regress.TestObj::cleanup</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 def callback(test_obj, user_param1, ...)
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>test_obj</code></title>
@@ -36,6 +28,4 @@ def callback(test_obj, user_param1, ...)
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-complex_vfunc.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-complex_vfunc.page
new file mode 100644 (file)
index 0000000..c4d02b1
--- /dev/null
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj-complex_vfunc"
+      type="topic"
+      style="vfunc"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObj" group="vfunc" type="guide"/>
+  </info>
+  <title>Regress.TestObj::complex_vfunc</title>
+  <synopsis><code mime="text/x-python">
+@accepts(Regress.TestObj, int)
+@returns(none)
+def do_complex_vfunc(obj, someint):
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+<item>
+<title><code>someint</code></title>
+
+</item>
+</terms>
+
+</page>
index 70fd579..1641a85 100644 (file)
@@ -6,24 +6,13 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="property" type="guide"/>
     <title type="link" role="topic">double</title>
-
   </info>
   <title>Regress.TestObj:double</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 "double"             float                : Read / Write
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-  
-  
-  
 </page>
index b5bcd2c..e7515c9 100644 (file)
@@ -6,23 +6,15 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">first</title>
-
   </info>
   <title>Regress.TestObj::first</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 def callback(test_obj, user_param1, ...)
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>test_obj</code></title>
@@ -36,6 +28,4 @@ def callback(test_obj, user_param1, ...)
 </item>
 </terms>
 
-  
-  
 </page>
index 87be50f..7d05695 100644 (file)
@@ -6,24 +6,13 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="property" type="guide"/>
     <title type="link" role="topic">float</title>
-
   </info>
   <title>Regress.TestObj:float</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 "float"             float                : Read / Write
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-  
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-function_ptr.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-function_ptr.page
new file mode 100644 (file)
index 0000000..dca9a51
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj-function_ptr"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObj" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestObj->function_ptr</title>
+
+
+</page>
index 6b222e4..e1da126 100644 (file)
@@ -6,24 +6,13 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="property" type="guide"/>
     <title type="link" role="topic">gtype</title>
-
   </info>
   <title>Regress.TestObj:gtype</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 "gtype"             GType                : Read / Write
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-  
-  
-  
 </page>
index c796f36..4137113 100644 (file)
@@ -6,24 +6,13 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="property" type="guide"/>
     <title type="link" role="topic">hash-table-old</title>
-
   </info>
   <title>Regress.TestObj:hash-table-old</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 "hash-table-old"             {unicode: gint8}                : Read / Write
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-  
-  
-  
 </page>
index c5d426c..5567b58 100644 (file)
@@ -6,24 +6,13 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="property" type="guide"/>
     <title type="link" role="topic">hash-table</title>
-
   </info>
   <title>Regress.TestObj:hash-table</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 "hash-table"             {unicode: gint8}                : Read / Write
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-  
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash_table.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash_table.page
new file mode 100644 (file)
index 0000000..40653a9
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj-hash_table"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObj" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestObj->hash_table</title>
+
+
+</page>
index db7a89e..3830204 100644 (file)
@@ -6,24 +6,13 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="property" type="guide"/>
     <title type="link" role="topic">int</title>
-
   </info>
   <title>Regress.TestObj:int</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 "int"             int                : Read / Write
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-  
-  
-  
 </page>
index 95367ec..eee06b8 100644 (file)
@@ -6,24 +6,13 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="property" type="guide"/>
     <title type="link" role="topic">list-old</title>
-
   </info>
   <title>Regress.TestObj:list-old</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 "list-old"             [unicode]                : Read / Write
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-  
-  
-  
 </page>
index aca148d..e23acdb 100644 (file)
@@ -6,24 +6,13 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="property" type="guide"/>
     <title type="link" role="topic">list</title>
-
   </info>
   <title>Regress.TestObj:list</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 "list"             [unicode]                : Read / Write
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-  
-  
-  
 </page>
index 742e6da..857ddb7 100644 (file)
@@ -6,34 +6,26 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="Regress.TestObj" group="vfunc" type="guide"/>
-    
+    <link xref="Regress.TestObj" group="vfunc" type="guide"/>
   </info>
   <title>Regress.TestObj::matrix</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj, unicode)
 @returns(int)
 def do_matrix(obj, somestr):
-</code></synopsis>
-
-  
-    <p>This method is virtual.  Notably its name differs from the virtual
+  </code></synopsis>
+  <p>This method is virtual.  Notably its name differs from the virtual
 slot name, which makes it useful for testing bindings handle this
 case.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>obj</code></title>
-<p>A <link xref="Regress.TestObj"/></p>
+  <p>A <link xref="Regress.TestObj"/></p>
 </item>
 <item>
 <title><code>somestr</code></title>
-<p>Meaningless string</p>
+  <p>Meaningless string</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -41,6 +33,4 @@ case.</p>
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-parent_instance.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-parent_instance.page
new file mode 100644 (file)
index 0000000..52b356b
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj-parent_instance"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObj" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestObj->parent_instance</title>
+
+
+</page>
index a228de1..2b38065 100644 (file)
@@ -6,23 +6,15 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">sig-with-array-len-prop</title>
-
   </info>
   <title>Regress.TestObj::sig-with-array-len-prop</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 def callback(test_obj, arr, len, user_param1, ...)
-</code></synopsis>
+  </code></synopsis>
+  <p>This test signal similar to GSettings::change-event</p>
 
-  
-    <p>This test signal similar to GSettings::change-event</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>test_obj</code></title>
@@ -30,11 +22,11 @@ def callback(test_obj, arr, len, user_param1, ...)
 </item>
 <item>
 <title><code>arr</code></title>
-<p>numbers, or <code>None</code></p>
+  <p>numbers, or <code>None</code></p>
 </item>
 <item>
 <title><code>len</code></title>
-<p>length of <code>arr</code>, or 0</p>
+  <p>length of <code>arr</code>, or 0</p>
 </item>
 <title><code>user_param1</code></title>
 <p>first user parameter (if any) specified with the connect() method</p>
@@ -44,6 +36,4 @@ def callback(test_obj, arr, len, user_param1, ...)
 </item>
 </terms>
 
-  
-  
 </page>
index eb1b99f..e0a8849 100644 (file)
@@ -6,24 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">sig-with-array-prop</title>
-
   </info>
   <title>Regress.TestObj::sig-with-array-prop</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 def callback(test_obj, arr, user_param1, ...)
-</code></synopsis>
-
-  
-    <p>This test signal is like TelepathyGlib's
+  </code></synopsis>
+  <p>This test signal is like TelepathyGlib's
  TpChannel:: group-members-changed-detailed:</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>test_obj</code></title>
@@ -31,7 +23,7 @@ def callback(test_obj, arr, user_param1, ...)
 </item>
 <item>
 <title><code>arr</code></title>
-<p>numbers</p>
+  <p>numbers</p>
 </item>
 <title><code>user_param1</code></title>
 <p>first user parameter (if any) specified with the connect() method</p>
@@ -41,6 +33,4 @@ def callback(test_obj, arr, user_param1, ...)
 </item>
 </terms>
 
-  
-  
 </page>
index 36a30d7..e4f05e6 100644 (file)
@@ -6,23 +6,15 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">sig-with-foreign-struct</title>
-
   </info>
   <title>Regress.TestObj::sig-with-foreign-struct</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 def callback(test_obj, cr, user_param1, ...)
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>test_obj</code></title>
@@ -30,7 +22,7 @@ def callback(test_obj, cr, user_param1, ...)
 </item>
 <item>
 <title><code>cr</code></title>
-<p>A cairo context.</p>
+  <p>A cairo context.</p>
 </item>
 <title><code>user_param1</code></title>
 <p>first user parameter (if any) specified with the connect() method</p>
@@ -40,6 +32,4 @@ def callback(test_obj, cr, user_param1, ...)
 </item>
 </terms>
 
-  
-  
 </page>
index 2048ad2..9308415 100644 (file)
@@ -6,24 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">sig-with-hash-prop</title>
-
   </info>
   <title>Regress.TestObj::sig-with-hash-prop</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 def callback(test_obj, hash, user_param1, ...)
-</code></synopsis>
-
-  
-    <p>This test signal is like TelepathyGlib's
+  </code></synopsis>
+  <p>This test signal is like TelepathyGlib's
  TpAccount::status-changed</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>test_obj</code></title>
@@ -41,6 +33,4 @@ def callback(test_obj, hash, user_param1, ...)
 </item>
 </terms>
 
-  
-  
 </page>
index a782484..d1e8718 100644 (file)
@@ -6,24 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">sig-with-int64-prop</title>
-
   </info>
   <title>Regress.TestObj::sig-with-int64-prop</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 def callback(test_obj, i, user_param1, ...)
-</code></synopsis>
-
-  
-    <p>You can use this with regress_test_obj_emit_sig_with_int64, or raise from
+  </code></synopsis>
+  <p>You can use this with regress_test_obj_emit_sig_with_int64, or raise from
 the introspection client langage.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>test_obj</code></title>
@@ -31,7 +23,7 @@ the introspection client langage.</p>
 </item>
 <item>
 <title><code>i</code></title>
-<p>an integer</p>
+  <p>an integer</p>
 </item>
 <title><code>user_param1</code></title>
 <p>first user parameter (if any) specified with the connect() method</p>
@@ -45,6 +37,4 @@ the introspection client langage.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index d070f17..45964c9 100644 (file)
@@ -6,23 +6,15 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">sig-with-intarray-ret</title>
-
   </info>
   <title>Regress.TestObj::sig-with-intarray-ret</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 def callback(test_obj, i, user_param1, ...)
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>test_obj</code></title>
@@ -30,7 +22,7 @@ def callback(test_obj, i, user_param1, ...)
 </item>
 <item>
 <title><code>i</code></title>
-<p>an integer</p>
+  <p>an integer</p>
 </item>
 <title><code>user_param1</code></title>
 <p>first user parameter (if any) specified with the connect() method</p>
@@ -40,6 +32,4 @@ def callback(test_obj, i, user_param1, ...)
 </item>
 </terms>
 
-  
-  
 </page>
index d4814a8..0f21e17 100644 (file)
@@ -6,24 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">sig-with-obj</title>
-
   </info>
   <title>Regress.TestObj::sig-with-obj</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 def callback(test_obj, obj, user_param1, ...)
-</code></synopsis>
-
-  
-    <p>Test transfer none GObject as a param (tests refcounting).
+  </code></synopsis>
+  <p>Test transfer none GObject as a param (tests refcounting).
 Use with regress_test_obj_emit_sig_with_obj</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>test_obj</code></title>
@@ -31,7 +23,7 @@ Use with regress_test_obj_emit_sig_with_obj</p>
 </item>
 <item>
 <title><code>obj</code></title>
-<p>A newly created RegressTestObj</p>
+  <p>A newly created RegressTestObj</p>
 </item>
 <title><code>user_param1</code></title>
 <p>first user parameter (if any) specified with the connect() method</p>
@@ -41,6 +33,4 @@ Use with regress_test_obj_emit_sig_with_obj</p>
 </item>
 </terms>
 
-  
-  
 </page>
index a7037a4..ae04a85 100644 (file)
@@ -6,23 +6,15 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">sig-with-strv</title>
-
   </info>
   <title>Regress.TestObj::sig-with-strv</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 def callback(test_obj, strs, user_param1, ...)
-</code></synopsis>
+  </code></synopsis>
+  <p>Test GStrv as a param.</p>
 
-  
-    <p>Test GStrv as a param.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>test_obj</code></title>
@@ -30,7 +22,7 @@ def callback(test_obj, strs, user_param1, ...)
 </item>
 <item>
 <title><code>strs</code></title>
-<p>strings</p>
+  <p>strings</p>
 </item>
 <title><code>user_param1</code></title>
 <p>first user parameter (if any) specified with the connect() method</p>
@@ -40,6 +32,4 @@ def callback(test_obj, strs, user_param1, ...)
 </item>
 </terms>
 
-  
-  
 </page>
index c89d1d1..045bd4b 100644 (file)
@@ -6,24 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">sig-with-uint64-prop</title>
-
   </info>
   <title>Regress.TestObj::sig-with-uint64-prop</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 def callback(test_obj, i, user_param1, ...)
-</code></synopsis>
-
-  
-    <p>You can use this with regress_test_obj_emit_sig_with_uint64, or raise from
+  </code></synopsis>
+  <p>You can use this with regress_test_obj_emit_sig_with_uint64, or raise from
 the introspection client langage.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>test_obj</code></title>
@@ -31,7 +23,7 @@ the introspection client langage.</p>
 </item>
 <item>
 <title><code>i</code></title>
-<p>an integer</p>
+  <p>an integer</p>
 </item>
 <title><code>user_param1</code></title>
 <p>first user parameter (if any) specified with the connect() method</p>
@@ -45,6 +37,4 @@ the introspection client langage.</p>
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-some_double.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-some_double.page
new file mode 100644 (file)
index 0000000..ffd77f1
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj-some_double"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObj" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestObj->some_double</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-some_float.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-some_float.page
new file mode 100644 (file)
index 0000000..0c22a20
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj-some_float"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObj" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestObj->some_float</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-some_int8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-some_int8.page
new file mode 100644 (file)
index 0000000..8836889
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj-some_int8"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObj" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestObj->some_int8</title>
+
+
+</page>
index fa49993..7d3a819 100644 (file)
@@ -6,24 +6,13 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="property" type="guide"/>
     <title type="link" role="topic">string</title>
-
   </info>
   <title>Regress.TestObj:string</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 "string"             unicode                : Read / Write
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-  
-  
-  
 </page>
index 736814c..bbf8c29 100644 (file)
@@ -6,23 +6,15 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">test-with-static-scope-arg</title>
-
   </info>
   <title>Regress.TestObj::test-with-static-scope-arg</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 def callback(test_obj, object, user_param1, ...)
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>test_obj</code></title>
@@ -40,6 +32,4 @@ def callback(test_obj, object, user_param1, ...)
 </item>
 </terms>
 
-  
-  
 </page>
index e09f531..c2dbf6e 100644 (file)
@@ -6,23 +6,15 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="signal" type="guide"/>
     <title type="link" role="topic">test</title>
-
   </info>
   <title>Regress.TestObj::test</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 def callback(test_obj, user_param1, ...)
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>test_obj</code></title>
@@ -36,6 +28,4 @@ def callback(test_obj, user_param1, ...)
 </item>
 </terms>
 
-  
-  
 </page>
index 07eaa50..994c3a5 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>somestr</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestObj.do_matrix</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj, unicode)
 @returns(int)
 def do_matrix(self, somestr):
     # Python wrapper for regress_test_obj_do_matrix()
-</code></synopsis>
-
-  
-    <p>This method is virtual.  Notably its name differs from the virtual
+  </code></synopsis>
+  <p>This method is virtual.  Notably its name differs from the virtual
 slot name, which makes it useful for testing bindings handle this
 case.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>self</code></title>
-<p>A <link xref="Regress.TestObj"/></p>
+  <p>A <link xref="Regress.TestObj"/></p>
 </item>
 <item>
 <title><code>somestr</code></title>
-<p>Meaningless string</p>
+  <p>Meaningless string</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -56,6 +48,4 @@ case.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 065d745..2400bc6 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestObj.emit_sig_with_foreign_struct</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj)
 @returns(none)
 def emit_sig_with_foreign_struct(self):
     # Python wrapper for regress_test_obj_emit_sig_with_foreign_struct()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -42,6 +34,4 @@ def emit_sig_with_foreign_struct(self):
 </item>
 </terms>
 
-  
-  
 </page>
index fb0679a..5760c64 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestObj.emit_sig_with_int64</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj)
 @returns(none)
 def emit_sig_with_int64(self):
     # Python wrapper for regress_test_obj_emit_sig_with_int64()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -42,6 +34,4 @@ def emit_sig_with_int64(self):
 </item>
 </terms>
 
-  
-  
 </page>
index 2515498..eb961af 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestObj.emit_sig_with_obj</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj)
 @returns(none)
 def emit_sig_with_obj(self):
     # Python wrapper for regress_test_obj_emit_sig_with_obj()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -42,6 +34,4 @@ def emit_sig_with_obj(self):
 </item>
 </terms>
 
-  
-  
 </page>
index 34fbfe3..659b882 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestObj.emit_sig_with_uint64</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj)
 @returns(none)
 def emit_sig_with_uint64(self):
     # Python wrapper for regress_test_obj_emit_sig_with_uint64()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -42,6 +34,4 @@ def emit_sig_with_uint64(self):
 </item>
 </terms>
 
-  
-  
 </page>
index e477052..a8dbc9a 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestObj.forced_method</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj)
 @returns(none)
 def forced_method(self):
     # Python wrapper for regress_forced_method()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>A <link xref="Regress.TestObj"/></p>
+  <p>A <link xref="Regress.TestObj"/></p>
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.function_ptr.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.function_ptr.page
new file mode 100644 (file)
index 0000000..caa0c19
--- /dev/null
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj.function_ptr"
+      type="topic"
+      style="callback"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="callback" type="guide"/>
+  </info>
+  <title>Regress.TestObj.function_ptr</title>
+  <synopsis><code mime="text/x-python">
+@returns(none)
+def on_function_ptr():
+  </code></synopsis>
+
+
+<terms>
+</terms>
+
+</page>
index 58c58e3..cd73b23 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestObj.instance_method</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj)
 @returns(int)
 def instance_method(self):
     # Python wrapper for regress_test_obj_instance_method()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -46,6 +38,4 @@ def instance_method(self):
 </item>
 </terms>
 
-  
-  
 </page>
index d491fa6..15402e6 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestObj.instance_method_callback</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj, Regress.TestCallback)
 @returns(none)
 def instance_method_callback(self, callback):
     # Python wrapper for regress_test_obj_instance_method_callback()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -50,6 +42,4 @@ def instance_method_callback(self, callback):
 </item>
 </terms>
 
-  
-  
 </page>
index a1c0660..3c6146b 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>obj</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestObj.null_out</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj)
 @returns(none)
 def null_out(obj):
     # Python wrapper for regress_test_obj_null_out()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>obj</code></title>
-<p>A <link xref="Regress.TestObj"/></p>
+  <p>A <link xref="Regress.TestObj"/></p>
 </item>
 </terms>
 
-  
-  
 </page>
index 1ded23c..56033fd 100644 (file)
@@ -6,23 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestObj</title>
-  
   <synopsis><code>
 from gi.repository import Regress
 
-test_obj = Regress.TestObj(<link xref='Regress.TestObj-bare'>bare</link>=value, <link xref='Regress.TestObj-boxed'>boxed</link>=value, <link xref='Regress.TestObj-double'>double</link>=value, <link xref='Regress.TestObj-float'>float</link>=value, <link xref='Regress.TestObj-gtype'>gtype</link>=value, <link xref='Regress.TestObj-hash-table'>hash_table</link>=value, <link xref='Regress.TestObj-hash-table-old'>hash_table_old</link>=value, <link xref='Regress.TestObj-int'>int</link>=value, <link xref='Regress.TestObj-list'>list</link>=value, <link xref='Regress.TestObj-list-old'>list_old</link>=value, <link xref='Regress.TestObj-string'>string</link>=value)  </code></synopsis>
+test_obj = Regress.TestObj(<link xref='Regress.TestObj-bare'>bare</link>=value, <link xref='Regress.TestObj-boxed'>boxed</link>=value, <link xref='Regress.TestObj-double'>double</link>=value, <link xref='Regress.TestObj-float'>float</link>=value, <link xref='Regress.TestObj-gtype'>gtype</link>=value, <link xref='Regress.TestObj-hash-table'>hash_table</link>=value, <link xref='Regress.TestObj-hash-table-old'>hash_table_old</link>=value, <link xref='Regress.TestObj-int'>int</link>=value, <link xref='Regress.TestObj-list'>list</link>=value, <link xref='Regress.TestObj-list-old'>list_old</link>=value, <link xref='Regress.TestObj-string'>string</link>=value)
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
   <synopsis>
     <title>Hierarchy</title>
     <tree>
@@ -34,8 +27,11 @@ test_obj = Regress.TestObj(<link xref='Regress.TestObj-bare'>bare</link>=value,
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/python"
          groups="method" style="linklist">
@@ -44,7 +40,7 @@ test_obj = Regress.TestObj(<link xref='Regress.TestObj-bare'>bare</link>=value,
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/python"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
@@ -55,8 +51,10 @@ test_obj = Regress.TestObj(<link xref='Regress.TestObj-bare'>bare</link>=value,
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
index 63acc89..2d405e9 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>bare</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestObj.set_bare</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj, GObject.Object)
 @returns(none)
 def set_bare(self, bare):
     # Python wrapper for regress_test_obj_set_bare()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -50,6 +42,4 @@ def set_bare(self, bare):
 </item>
 </terms>
 
-  
-  
 </page>
index 3d32ba0..e3ba881 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>num2</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestObj.skip_inout_param</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj, int, int, float, int, int, int, int)
 @returns(bool)
 def skip_inout_param(self, a, out_b, c, inout_d, out_sum, num1, num2):
     # Python wrapper for regress_test_obj_skip_inout_param()
-</code></synopsis>
+  </code></synopsis>
+  <p>Check that the out value is skipped</p>
 
-  
-    <p>Check that the out value is skipped</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>A <link xref="Regress.TestObj"/>.</p>
+  <p>A <link xref="Regress.TestObj"/>.</p>
 </item>
 <item>
 <title><code>a</code></title>
-<p>Parameter.</p>
+  <p>Parameter.</p>
 </item>
 <item>
 <title><code>out_b</code></title>
-<p>Return value.</p>
+  <p>Return value.</p>
 </item>
 <item>
 <title><code>c</code></title>
-<p>Other parameter.</p>
+  <p>Other parameter.</p>
 </item>
 <item>
 <title><code>inout_d</code></title>
-<p>Will be incremented.</p>
+  <p>Will be incremented.</p>
 </item>
 <item>
 <title><code>out_sum</code></title>
-<p>Return value.</p>
+  <p>Return value.</p>
 </item>
 <item>
 <title><code>num1</code></title>
-<p>Number.</p>
+  <p>Number.</p>
 </item>
 <item>
 <title><code>num2</code></title>
-<p>Number.</p>
+  <p>Number.</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -102,6 +94,4 @@ def skip_inout_param(self, a, out_b, c, inout_d, out_sum, num1, num2):
 </item>
 </terms>
 
-  
-  
 </page>
index 58c5268..e055130 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>num2</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestObj.skip_out_param</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj, int, int, float, int, int, int, int)
 @returns(bool)
 def skip_out_param(self, a, out_b, c, inout_d, out_sum, num1, num2):
     # Python wrapper for regress_test_obj_skip_out_param()
-</code></synopsis>
+  </code></synopsis>
+  <p>Check that the out value is skipped</p>
 
-  
-    <p>Check that the out value is skipped</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>A <link xref="Regress.TestObj"/>.</p>
+  <p>A <link xref="Regress.TestObj"/>.</p>
 </item>
 <item>
 <title><code>a</code></title>
-<p>Parameter.</p>
+  <p>Parameter.</p>
 </item>
 <item>
 <title><code>out_b</code></title>
-<p>Return value.</p>
+  <p>Return value.</p>
 </item>
 <item>
 <title><code>c</code></title>
-<p>Other parameter.</p>
+  <p>Other parameter.</p>
 </item>
 <item>
 <title><code>inout_d</code></title>
-<p>Will be incremented.</p>
+  <p>Will be incremented.</p>
 </item>
 <item>
 <title><code>out_sum</code></title>
-<p>Return value.</p>
+  <p>Return value.</p>
 </item>
 <item>
 <title><code>num1</code></title>
-<p>Number.</p>
+  <p>Number.</p>
 </item>
 <item>
 <title><code>num2</code></title>
-<p>Number.</p>
+  <p>Number.</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -102,6 +94,4 @@ def skip_out_param(self, a, out_b, c, inout_d, out_sum, num1, num2):
 </item>
 </terms>
 
-  
-  
 </page>
index c02f3b9..77fc43d 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>num2</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestObj.skip_param</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj, int, int, float, int, int, int, int)
 @returns(bool)
 def skip_param(self, a, out_b, c, inout_d, out_sum, num1, num2):
     # Python wrapper for regress_test_obj_skip_param()
-</code></synopsis>
+  </code></synopsis>
+  <p>Check that a parameter is skipped</p>
 
-  
-    <p>Check that a parameter is skipped</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>A <link xref="Regress.TestObj"/>.</p>
+  <p>A <link xref="Regress.TestObj"/>.</p>
 </item>
 <item>
 <title><code>a</code></title>
-<p>Parameter.</p>
+  <p>Parameter.</p>
 </item>
 <item>
 <title><code>out_b</code></title>
-<p>Return value.</p>
+  <p>Return value.</p>
 </item>
 <item>
 <title><code>c</code></title>
-<p>Other parameter.</p>
+  <p>Other parameter.</p>
 </item>
 <item>
 <title><code>inout_d</code></title>
-<p>Will be incremented.</p>
+  <p>Will be incremented.</p>
 </item>
 <item>
 <title><code>out_sum</code></title>
-<p>Return value.</p>
+  <p>Return value.</p>
 </item>
 <item>
 <title><code>num1</code></title>
-<p>Number.</p>
+  <p>Number.</p>
 </item>
 <item>
 <title><code>num2</code></title>
-<p>Number.</p>
+  <p>Number.</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -102,6 +94,4 @@ def skip_param(self, a, out_b, c, inout_d, out_sum, num1, num2):
 </item>
 </terms>
 
-  
-  
 </page>
index 2aadb42..dc4e915 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>num2</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestObj.skip_return_val</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj, int, int, float, int, int, int, int)
 @returns(bool)
 def skip_return_val(self, a, out_b, c, inout_d, out_sum, num1, num2):
     # Python wrapper for regress_test_obj_skip_return_val()
-</code></synopsis>
+  </code></synopsis>
+  <p>Check that the return value is skipped</p>
 
-  
-    <p>Check that the return value is skipped</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>a <link xref="Regress.TestObj"/></p>
+  <p>a <link xref="Regress.TestObj"/></p>
 </item>
 <item>
 <title><code>a</code></title>
-<p>Parameter.</p>
+  <p>Parameter.</p>
 </item>
 <item>
 <title><code>out_b</code></title>
-<p>A return value.</p>
+  <p>A return value.</p>
 </item>
 <item>
 <title><code>c</code></title>
-<p>Other parameter.</p>
+  <p>Other parameter.</p>
 </item>
 <item>
 <title><code>inout_d</code></title>
-<p>Will be incremented.</p>
+  <p>Will be incremented.</p>
 </item>
 <item>
 <title><code>out_sum</code></title>
-<p>Return value.</p>
+  <p>Return value.</p>
 </item>
 <item>
 <title><code>num1</code></title>
-<p>Number.</p>
+  <p>Number.</p>
 </item>
 <item>
 <title><code>num2</code></title>
-<p>Number.</p>
+  <p>Number.</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -102,6 +94,4 @@ def skip_return_val(self, a, out_b, c, inout_d, out_sum, num1, num2):
 </item>
 </terms>
 
-  
-  
 </page>
index f0c50f5..77b925e 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>a</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestObj.skip_return_val_no_out</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj, int)
 @returns(bool)
 def skip_return_val_no_out(self, a):
     # Python wrapper for regress_test_obj_skip_return_val_no_out()
-</code></synopsis>
-
-  
-    <p>Check that the return value is skipped. Succeed if a is nonzero, otherwise
+  </code></synopsis>
+  <p>Check that the return value is skipped. Succeed if a is nonzero, otherwise
 raise an error.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>self</code></title>
-<p>a <link xref="Regress.TestObj"/></p>
+  <p>a <link xref="Regress.TestObj"/></p>
 </item>
 <item>
 <title><code>a</code></title>
-<p>Parameter.</p>
+  <p>Parameter.</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -55,6 +47,4 @@ raise an error.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 6751026..a3cbb87 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>x</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestObj.static_method</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(int)
 @returns(float)
 def static_method(x):
     # Python wrapper for regress_test_obj_static_method()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>x</code></title>
@@ -46,6 +38,4 @@ def static_method(x):
 </item>
 </terms>
 
-  
-  
 </page>
index 4d97f31..e28dfae 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestObj.static_method_callback</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestCallback)
 @returns(none)
 def static_method_callback(callback):
     # Python wrapper for regress_test_obj_static_method_callback()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -42,6 +34,4 @@ def static_method_callback(callback):
 </item>
 </terms>
 
-  
-  
 </page>
index 4cc806d..d1c7596 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>m</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestObj.torture_signature_0</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj, int, float, int, unicode, int, int)
 @returns(none)
 def torture_signature_0(self, x, y, z, foo, q, m):
     # Python wrapper for regress_test_obj_torture_signature_0()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>A <link xref="Regress.TestObj"/></p>
+  <p>A <link xref="Regress.TestObj"/></p>
 </item>
 <item>
 <title><code>x</code></title>
@@ -90,6 +82,4 @@ def torture_signature_0(self, x, y, z, foo, q, m):
 </item>
 </terms>
 
-  
-  
 </page>
index 7ccc132..2ab1ed7 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>m</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestObj.torture_signature_1</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj, int, float, int, unicode, int, int)
 @returns(bool)
 def torture_signature_1(self, x, y, z, foo, q, m):
     # Python wrapper for regress_test_obj_torture_signature_1()
-</code></synopsis>
+  </code></synopsis>
+  <p>This function throws an error if m is odd.</p>
 
-  
-    <p>This function throws an error if m is odd.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>A <link xref="Regress.TestObj"/></p>
+  <p>A <link xref="Regress.TestObj"/></p>
 </item>
 <item>
 <title><code>x</code></title>
@@ -94,6 +86,4 @@ def torture_signature_1(self, x, y, z, foo, q, m):
 </item>
 </terms>
 
-  
-  
 </page>
index 858e58a..f968c9c 100644 (file)
@@ -6,19 +6,11 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.TestOtherError</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
 <terms>
 <item>
 <title><code>TestOtherError.CODE1</code></title>
@@ -34,6 +26,4 @@
 </item>
 </terms>
 
-  
-  
 </page>
index 341e774..fee709c 100644 (file)
@@ -6,30 +6,22 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.TestOtherError" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>GLib.Quark</api:type>
       </api:returns>
       <api:name>regress_test_unconventional_error_quark</api:name>
     </api:function>
-
   </info>
-  <title>Index.quark</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.TestOtherError.quark</title>
+  <synopsis><code mime="text/x-python">
 @returns(GLib.Quark)
 def quark():
     # Python wrapper for regress_test_unconventional_error_quark()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def quark():
 </item>
 </terms>
 
-  
-  
 </page>
index 66b477d..be741c4 100644 (file)
@@ -1,25 +1,25 @@
 <?xml version="1.0"?>
 <page id="Regress.TestPrivateEnum"
       type="topic"
-      style="default"
+      style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.TestPrivateEnum</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
+<terms>
+<item>
+<title><code>TestPrivateEnum.PUBLIC_ENUM_BEFORE</code></title>
+
+</item>
+<item>
+<title><code>TestPrivateEnum.PUBLIC_ENUM_AFTER</code></title>
+
+</item>
+</terms>
+
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct-this_is_public_after.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct-this_is_public_after.page
new file mode 100644 (file)
index 0000000..843ed30
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestPrivateStruct-this_is_public_after"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestPrivateStruct" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestPrivateStruct->this_is_public_after</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct-this_is_public_before.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct-this_is_public_before.page
new file mode 100644 (file)
index 0000000..84a6eca
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestPrivateStruct-this_is_public_before"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestPrivateStruct" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestPrivateStruct->this_is_public_before</title>
+
+
+</page>
index 7b1309d..d5ea6d0 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.TestPrivateStruct"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestPrivateStruct</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+test_private_struct = Regress.TestPrivateStruct()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index 2c8b1ab..afda5f3 100644 (file)
@@ -6,19 +6,11 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="enum" type="guide"/>
-    
+    <link xref="index" group="enum" type="guide"/>
   </info>
   <title>Regress.TestReferenceEnum</title>
-  
-  
-  
-    
-  
-  
-  
-  
+
+
 <terms>
 <item>
 <title><code>TestReferenceEnum.0</code></title>
@@ -46,6 +38,4 @@
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA-some_double.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA-some_double.page
new file mode 100644 (file)
index 0000000..61e4303
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestSimpleBoxedA-some_double"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestSimpleBoxedA" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestSimpleBoxedA->some_double</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA-some_enum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA-some_enum.page
new file mode 100644 (file)
index 0000000..c31c20d
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestSimpleBoxedA-some_enum"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestSimpleBoxedA" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestSimpleBoxedA->some_enum</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA-some_int.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA-some_int.page
new file mode 100644 (file)
index 0000000..aad211d
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestSimpleBoxedA-some_int"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestSimpleBoxedA" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestSimpleBoxedA->some_int</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA-some_int8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA-some_int8.page
new file mode 100644 (file)
index 0000000..349c0af
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestSimpleBoxedA-some_int8"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestSimpleBoxedA" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestSimpleBoxedA->some_int8</title>
+
+
+</page>
index 499a047..2b7ee6a 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestSimpleBoxedA" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_simple_boxed_a_const_return</api:name>
     </api:function>
-
   </info>
   <title>Regress.TestSimpleBoxedA.const_return</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @returns(Regress.TestSimpleBoxedA)
 def const_return():
     # Python wrapper for regress_test_simple_boxed_a_const_return()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def const_return():
 </item>
 </terms>
 
-  
-  
 </page>
index 5e3fc24..62a3467 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestSimpleBoxedA" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestSimpleBoxedA.copy</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestSimpleBoxedA)
 @returns(Regress.TestSimpleBoxedA)
 def copy(self):
     # Python wrapper for regress_test_simple_boxed_a_copy()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -46,6 +38,4 @@ def copy(self):
 </item>
 </terms>
 
-  
-  
 </page>
index a9ae5b2..caebbf8 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestSimpleBoxedA" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>other_a</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestSimpleBoxedA.equals</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestSimpleBoxedA, Regress.TestSimpleBoxedA)
 @returns(bool)
 def equals(self, other_a):
     # Python wrapper for regress_test_simple_boxed_a_equals()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -54,6 +46,4 @@ def equals(self, other_a):
 </item>
 </terms>
 
-  
-  
 </page>
index 9117ddb..a758ab6 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.TestSimpleBoxedA"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestSimpleBoxedA</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+test_simple_boxed_a = Regress.TestSimpleBoxedA()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB-nested_a.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB-nested_a.page
new file mode 100644 (file)
index 0000000..6014279
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestSimpleBoxedB-nested_a"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestSimpleBoxedB" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestSimpleBoxedB->nested_a</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB-some_int8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB-some_int8.page
new file mode 100644 (file)
index 0000000..8c8b86d
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestSimpleBoxedB-some_int8"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestSimpleBoxedB" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestSimpleBoxedB->some_int8</title>
+
+
+</page>
index 999c850..feae1ab 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestSimpleBoxedB" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestSimpleBoxedB.copy</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestSimpleBoxedB)
 @returns(Regress.TestSimpleBoxedB)
 def copy(self):
     # Python wrapper for regress_test_simple_boxed_b_copy()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -46,6 +38,4 @@ def copy(self):
 </item>
 </terms>
 
-  
-  
 </page>
index 7ecc623..5201ea6 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.TestSimpleBoxedB"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestSimpleBoxedB</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+test_simple_boxed_b = Regress.TestSimpleBoxedB()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index f815782..da812bb 100644 (file)
@@ -1,25 +1,21 @@
 <?xml version="1.0"?>
 <page id="Regress.TestSimpleCallback"
       type="topic"
-      style="default"
+      style="callback"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="callback" type="guide"/>
   </info>
   <title>Regress.TestSimpleCallback</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code mime="text/x-python">
+@returns(none)
+def on_TestSimpleCallback():
+  </code></synopsis>
+
+
+<terms>
+</terms>
+
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA-some_double.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA-some_double.page
new file mode 100644 (file)
index 0000000..6cc6110
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructA-some_double"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructA" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructA->some_double</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA-some_enum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA-some_enum.page
new file mode 100644 (file)
index 0000000..1fc8f31
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructA-some_enum"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructA" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructA->some_enum</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA-some_int.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA-some_int.page
new file mode 100644 (file)
index 0000000..b3e1d84
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructA-some_int"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructA" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructA->some_int</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA-some_int8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA-some_int8.page
new file mode 100644 (file)
index 0000000..cdfd2a9
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructA-some_int8"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructA" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructA->some_int8</title>
+
+
+</page>
index cb2ea92..a849bfb 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestStructA" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>a_out</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestStructA.clone</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestStructA, Regress.TestStructA)
 @returns(none)
 def clone(self, a_out):
     # Python wrapper for regress_test_struct_a_clone()
-</code></synopsis>
+  </code></synopsis>
+  <p>Make a copy of a RegressTestStructA</p>
 
-  
-    <p>Make a copy of a RegressTestStructA</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>the structure</p>
+  <p>the structure</p>
 </item>
 <item>
 <title><code>a_out</code></title>
-<p>the cloned structure</p>
+  <p>the cloned structure</p>
 </item>
 </terms>
 
-  
-  
 </page>
index a6a9817..0974017 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.TestStructA"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestStructA</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+test_struct_a = Regress.TestStructA()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
index bfd3189..42bade9 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestStructA" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>string</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestStructA.parse</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestStructA, unicode)
 @returns(none)
 def parse(a_out, string):
     # Python wrapper for regress_test_struct_a_parse()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>a_out</code></title>
-<p>the structure that is to be filled</p>
+  <p>the structure that is to be filled</p>
 </item>
 <item>
 <title><code>string</code></title>
-<p>ignored</p>
+  <p>ignored</p>
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB-nested_a.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB-nested_a.page
new file mode 100644 (file)
index 0000000..5864588
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructB-nested_a"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructB" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructB->nested_a</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB-some_int8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB-some_int8.page
new file mode 100644 (file)
index 0000000..d7e90d7
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructB-some_int8"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructB" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructB->some_int8</title>
+
+
+</page>
index ea78efd..3ddabd6 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestStructB" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>b_out</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestStructB.clone</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestStructB, Regress.TestStructB)
 @returns(none)
 def clone(self, b_out):
     # Python wrapper for regress_test_struct_b_clone()
-</code></synopsis>
+  </code></synopsis>
+  <p>Make a copy of a RegressTestStructB</p>
 
-  
-    <p>Make a copy of a RegressTestStructB</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
-<p>the structure</p>
+  <p>the structure</p>
 </item>
 <item>
 <title><code>b_out</code></title>
-<p>the cloned structure</p>
+  <p>the cloned structure</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 21d8626..df4a287 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.TestStructB"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestStructB</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+test_struct_b = Regress.TestStructB()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC-another_int.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC-another_int.page
new file mode 100644 (file)
index 0000000..9d3e222
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructC-another_int"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructC" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructC->another_int</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC-obj.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC-obj.page
new file mode 100644 (file)
index 0000000..ecf3c25
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructC-obj"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructC" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructC->obj</title>
+
+
+</page>
index 6bd5812..89036d2 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.TestStructC"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestStructC</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+test_struct_c = Regress.TestStructC()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-array1.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-array1.page
new file mode 100644 (file)
index 0000000..6e8cf23
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructD-array1"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructD" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructD->array1</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-array2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-array2.page
new file mode 100644 (file)
index 0000000..93995fe
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructD-array2"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructD" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructD->array2</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-field.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-field.page
new file mode 100644 (file)
index 0000000..e46d5da
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructD-field"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructD" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructD->field</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-garray.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-garray.page
new file mode 100644 (file)
index 0000000..39adf11
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructD-garray"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructD" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructD->garray</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-list.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-list.page
new file mode 100644 (file)
index 0000000..2601051
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructD-list"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructD" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructD->list</title>
+
+
+</page>
index aa9f131..64c8105 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.TestStructD"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestStructD</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+test_struct_d = Regress.TestStructD()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE-some_type.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE-some_type.page
new file mode 100644 (file)
index 0000000..ea61037
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructE-some_type"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructE" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructE->some_type</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE-some_union.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE-some_union.page
new file mode 100644 (file)
index 0000000..fda8d2a
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructE-some_union"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructE" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructE->some_union</title>
+
+
+</page>
index b931c36..8726b95 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.TestStructE"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestStructE</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+test_struct_e = Regress.TestStructE()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_double.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_double.page
new file mode 100644 (file)
index 0000000..d80e779
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructE__some_union__union-v_double"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructE__some_union__union"
+      group="field"
+      type="guide"/>
+  </info>
+  <title>Regress.TestStructE__some_union__union->v_double</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_float.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_float.page
new file mode 100644 (file)
index 0000000..30d6126
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructE__some_union__union-v_float"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructE__some_union__union"
+      group="field"
+      type="guide"/>
+  </info>
+  <title>Regress.TestStructE__some_union__union->v_float</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_int.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_int.page
new file mode 100644 (file)
index 0000000..487a6c5
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructE__some_union__union-v_int"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructE__some_union__union"
+      group="field"
+      type="guide"/>
+  </info>
+  <title>Regress.TestStructE__some_union__union->v_int</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_int64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_int64.page
new file mode 100644 (file)
index 0000000..fbe75bf
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructE__some_union__union-v_int64"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructE__some_union__union"
+      group="field"
+      type="guide"/>
+  </info>
+  <title>Regress.TestStructE__some_union__union->v_int64</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_long.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_long.page
new file mode 100644 (file)
index 0000000..a909fa8
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructE__some_union__union-v_long"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructE__some_union__union"
+      group="field"
+      type="guide"/>
+  </info>
+  <title>Regress.TestStructE__some_union__union->v_long</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_pointer.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_pointer.page
new file mode 100644 (file)
index 0000000..8dca96c
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructE__some_union__union-v_pointer"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructE__some_union__union"
+      group="field"
+      type="guide"/>
+  </info>
+  <title>Regress.TestStructE__some_union__union->v_pointer</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_uint.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_uint.page
new file mode 100644 (file)
index 0000000..61d30a2
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructE__some_union__union-v_uint"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructE__some_union__union"
+      group="field"
+      type="guide"/>
+  </info>
+  <title>Regress.TestStructE__some_union__union->v_uint</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_uint64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_uint64.page
new file mode 100644 (file)
index 0000000..360e1e9
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructE__some_union__union-v_uint64"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructE__some_union__union"
+      group="field"
+      type="guide"/>
+  </info>
+  <title>Regress.TestStructE__some_union__union->v_uint64</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_ulong.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_ulong.page
new file mode 100644 (file)
index 0000000..117b95f
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructE__some_union__union-v_ulong"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructE__some_union__union"
+      group="field"
+      type="guide"/>
+  </info>
+  <title>Regress.TestStructE__some_union__union->v_ulong</title>
+
+
+</page>
index 3b81e62..f2d50b0 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.TestStructE__some_union__union"
-      type="topic"
-      style="default"
+      type="guide"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestStructE__some_union__union</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+test_struct_e__some_union__union = Regress.TestStructE__some_union__union()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data1.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data1.page
new file mode 100644 (file)
index 0000000..5d424ad
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructF-data1"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructF" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructF->data1</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data2.page
new file mode 100644 (file)
index 0000000..b03800e
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructF-data2"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructF" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructF->data2</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data3.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data3.page
new file mode 100644 (file)
index 0000000..e25e712
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructF-data3"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructF" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructF->data3</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data4.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data4.page
new file mode 100644 (file)
index 0000000..ceedf9d
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructF-data4"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructF" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructF->data4</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data5.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data5.page
new file mode 100644 (file)
index 0000000..d239488
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructF-data5"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructF" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructF->data5</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data6.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data6.page
new file mode 100644 (file)
index 0000000..09d7215
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructF-data6"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructF" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructF->data6</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-ref_count.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-ref_count.page
new file mode 100644 (file)
index 0000000..98fad0b
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructF-ref_count"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructF" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructF->ref_count</title>
+
+
+</page>
index cfb434b..42be286 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.TestStructF"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestStructF</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+test_struct_f = Regress.TestStructF()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray-array.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray-array.page
new file mode 100644 (file)
index 0000000..fb214ce
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructFixedArray-array"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructFixedArray" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructFixedArray->array</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray-just_int.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray-just_int.page
new file mode 100644 (file)
index 0000000..0c8a594
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestStructFixedArray-just_int"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestStructFixedArray" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestStructFixedArray->just_int</title>
+
+
+</page>
index 8f9e288..ed2f460 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestStructFixedArray" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestStructFixedArray.frob</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestStructFixedArray)
 @returns(none)
 def frob(self):
     # Python wrapper for regress_test_struct_fixed_array_frob()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -42,6 +34,4 @@ def frob(self):
 </item>
 </terms>
 
-  
-  
 </page>
index db6e789..61dcf2c 100644 (file)
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <page id="Regress.TestStructFixedArray"
       type="guide"
-      style="record"
+      style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="record" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestStructFixedArray</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+  <synopsis><code>
+from gi.repository import Regress
+
+test_struct_fixed_array = Regress.TestStructFixedArray()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj-parent_instance.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj-parent_instance.page
new file mode 100644 (file)
index 0000000..15b87da
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestSubObj-parent_instance"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestSubObj" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestSubObj->parent_instance</title>
+
+
+</page>
index 9806d28..09872dc 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestSubObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestSubObj.instance_method</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestSubObj)
 @returns(int)
 def instance_method(self):
     # Python wrapper for regress_test_sub_obj_instance_method()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -46,6 +38,4 @@ def instance_method(self):
 </item>
 </terms>
 
-  
-  
 </page>
index b1dc19b..da1c0db 100644 (file)
@@ -6,23 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestSubObj</title>
-  
   <synopsis><code>
 from gi.repository import Regress
 
-test_sub_obj = Regress.TestSubObj()  </code></synopsis>
+test_sub_obj = Regress.TestSubObj()
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
   <synopsis>
     <title>Hierarchy</title>
     <tree>
@@ -37,8 +30,11 @@ test_sub_obj = Regress.TestSubObj()  </code></synopsis>
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/python"
          groups="method" style="linklist">
@@ -47,7 +43,7 @@ test_sub_obj = Regress.TestSubObj()  </code></synopsis>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/python"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
@@ -58,8 +54,10 @@ test_sub_obj = Regress.TestSubObj()  </code></synopsis>
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
index 2b54839..c5c1a13 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestSubObj" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestSubObj.unset_bare</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestSubObj)
 @returns(none)
 def unset_bare(self):
     # Python wrapper for regress_test_sub_obj_unset_bare()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -42,6 +34,4 @@ def unset_bare(self):
 </item>
 </terms>
 
-  
-  
 </page>
index e0a7bc0..fcb2f3b 100644 (file)
@@ -6,20 +6,9 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="default" type="guide"/>
-    
+    <link xref="index" group="default" type="guide"/>
   </info>
   <title>Regress.TestTypeGUInt64</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
+
+
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x-parent_instance.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x-parent_instance.page
new file mode 100644 (file)
index 0000000..7bdb8c1
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.TestWi8021x-parent_instance"
+      type="topic"
+      style="field"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestWi8021x" group="field" type="guide"/>
+  </info>
+  <title>Regress.TestWi8021x->parent_instance</title>
+
+
+</page>
index 00c168b..8f9603d 100644 (file)
@@ -6,24 +6,13 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestWi8021x" group="property" type="guide"/>
     <title type="link" role="topic">testbool</title>
-
   </info>
   <title>Regress.TestWi8021x:testbool</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 "testbool"             bool                : Read / Write
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
-  
-  
-  
 </page>
index cd83b9d..17049bc 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestWi8021x" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>self</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestWi8021x.get_testbool</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestWi8021x)
 @returns(bool)
 def get_testbool(self):
     # Python wrapper for regress_test_wi_802_1x_get_testbool()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -46,6 +38,4 @@ def get_testbool(self):
 </item>
 </terms>
 
-  
-  
 </page>
index aef0387..8b8bf05 100644 (file)
@@ -6,23 +6,16 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
-      <link xref="index" group="class" type="guide"/>
-    
+    <link xref="index" group="class" type="guide"/>
   </info>
   <title>Regress.TestWi8021x</title>
-  
   <synopsis><code>
 from gi.repository import Regress
 
-test_wi8021x = Regress.TestWi8021x(<link xref='Regress.TestWi8021x-testbool'>testbool</link>=value)  </code></synopsis>
+test_wi8021x = Regress.TestWi8021x(<link xref='Regress.TestWi8021x-testbool'>testbool</link>=value)
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
   <synopsis>
     <title>Hierarchy</title>
     <tree>
@@ -34,8 +27,11 @@ test_wi8021x = Regress.TestWi8021x(<link xref='Regress.TestWi8021x-testbool'>tes
       </item>
     </tree>
   </synopsis>
-
-  
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/python"
          groups="method" style="linklist">
@@ -44,7 +40,7 @@ test_wi8021x = Regress.TestWi8021x(<link xref='Regress.TestWi8021x-testbool'>tes
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/python"
          groups="function" style="linklist">
-    <title>Functions</title>
+    <title>Static Functions</title>
   </links>
   <links type="topic" ui:expanded="true" groups="property" style="linklist">
     <title>Properties</title>
@@ -55,8 +51,10 @@ test_wi8021x = Regress.TestWi8021x(<link xref='Regress.TestWi8021x-testbool'>tes
   <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
     <title>Virtual functions</title>
   </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
   <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
-
 </page>
index 59dbbd9..19b2ec5 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestWi8021x" group="method" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>v</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestWi8021x.set_testbool</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestWi8021x, bool)
 @returns(none)
 def set_testbool(self, v):
     # Python wrapper for regress_test_wi_802_1x_set_testbool()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>self</code></title>
@@ -50,6 +42,4 @@ def set_testbool(self, v):
 </item>
 </terms>
 
-  
-  
 </page>
index d2d83e3..635b57f 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="Regress.TestWi8021x" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>x</api:name>
       </api:arg>
     </api:function>
-
   </info>
   <title>Regress.TestWi8021x.static_method</title>
-  
-<synopsis><code mime="text/x-python">
+  <synopsis><code mime="text/x-python">
 @accepts(int)
 @returns(int)
 def static_method(x):
     # Python wrapper for regress_test_wi_802_1x_static_method()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>x</code></title>
@@ -46,6 +38,4 @@ def static_method(x):
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.UTF8_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.UTF8_CONSTANT.page
new file mode 100644 (file)
index 0000000..343ad00
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.UTF8_CONSTANT"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.UTF8_CONSTANT</title>
+
+
+</page>
index e210a97..046658d 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>boxed</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.aliased_caller_alloc</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.aliased_caller_alloc</title>
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.AliasedTestBoxed)
 @returns(none)
 def aliased_caller_alloc(boxed):
     # Python wrapper for regress_aliased_caller_alloc()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>boxed</code></title>
@@ -42,6 +34,4 @@ def aliased_caller_alloc(boxed):
 </item>
 </terms>
 
-  
-  
 </page>
index edee18b..d5b7337 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>data</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.annotation_attribute_func</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.annotation_attribute_func</title>
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, unicode)
 @returns(int)
 def annotation_attribute_func(object, data):
     # Python wrapper for regress_annotation_attribute_func()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
-<p>A <link xref="Regress.AnnotationObject"/>.</p>
+  <p>A <link xref="Regress.AnnotationObject"/>.</p>
 </item>
 <item>
 <title><code>data</code></title>
-<p>Some data.</p>
+  <p>Some data.</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -54,6 +46,4 @@ def annotation_attribute_func(object, data):
 </item>
 </terms>
 
-  
-  
 </page>
index 860107f..2883312 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>data</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.annotation_custom_destroy</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.annotation_custom_destroy</title>
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationCallback, Regress.AnnotationNotifyFunc, gpointer)
 @returns(none)
 def annotation_custom_destroy(callback, destroy, data):
     # Python wrapper for regress_annotation_custom_destroy()
-</code></synopsis>
-
-  
-    <p>Test messing up the heuristic of closure/destroy-notification
+  </code></synopsis>
+  <p>Test messing up the heuristic of closure/destroy-notification
 detection, and fixing it via annotations.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>callback</code></title>
-<p>Destroy notification</p>
+  <p>Destroy notification</p>
 </item>
 <item>
 <title><code>destroy</code></title>
@@ -59,6 +51,4 @@ detection, and fixing it via annotations.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 51a2ce4..c3fced4 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_get_source_file</api:name>
     </api:function>
-
   </info>
-  <title>Index.annotation_get_source_file</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.annotation_get_source_file</title>
+  <synopsis><code mime="text/x-python">
 @returns(filename)
 def annotation_get_source_file():
     # Python wrapper for regress_annotation_get_source_file()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def annotation_get_source_file():
 </item>
 </terms>
 
-  
-  
 </page>
index 16c7ebd..b87747a 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>argv</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.annotation_init</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.annotation_init</title>
+  <synopsis><code mime="text/x-python">
 @accepts(int, [unicode])
 @returns(none)
 def annotation_init(argc, argv):
     # Python wrapper for regress_annotation_init()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>argc</code></title>
-<p>The number of args.</p>
+  <p>The number of args.</p>
 </item>
 <item>
 <title><code>argv</code></title>
-<p>The arguments.</p>
+  <p>The arguments.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 5870104..e64d0ee 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>foo</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.annotation_invalid_regress_annotation</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.annotation_invalid_regress_annotation</title>
+  <synopsis><code mime="text/x-python">
 @accepts(int)
 @returns(none)
 def annotation_invalid_regress_annotation(foo):
     # Python wrapper for regress_annotation_invalid_regress_annotation()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>foo</code></title>
-<p>some text (e.g. example) or else</p>
+  <p>some text (e.g. example) or else</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 62cfbf7..2a09bdc 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>array</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.annotation_ptr_array</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.annotation_ptr_array</title>
+  <synopsis><code mime="text/x-python">
 @accepts([GObject.Value])
 @returns(none)
 def annotation_ptr_array(array):
     # Python wrapper for regress_annotation_ptr_array()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>array</code></title>
-<p>the array</p>
+  <p>the array</p>
 </item>
 </terms>
 
-  
-  
 </page>
index fa1908d..374b21b 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>length</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.annotation_return_array</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.annotation_return_array</title>
+  <synopsis><code mime="text/x-python">
 @accepts(int)
 @returns([unicode])
 def annotation_return_array(length):
     # Python wrapper for regress_annotation_return_array()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>length</code></title>
-<p>Number of return values</p>
+  <p>Number of return values</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -46,6 +38,4 @@ def annotation_return_array(length):
 </item>
 </terms>
 
-  
-  
 </page>
index 4cbc4db..2cf6fef 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_return_filename</api:name>
     </api:function>
-
   </info>
-  <title>Index.annotation_return_filename</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.annotation_return_filename</title>
+  <synopsis><code mime="text/x-python">
 @returns(filename)
 def annotation_return_filename():
     # Python wrapper for regress_annotation_return_filename()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def annotation_return_filename():
 </item>
 </terms>
 
-  
-  
 </page>
index 6eb6e85..7da1060 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>fname</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.annotation_set_source_file</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.annotation_set_source_file</title>
+  <synopsis><code mime="text/x-python">
 @accepts(filename)
 @returns(none)
 def annotation_set_source_file(fname):
     # Python wrapper for regress_annotation_set_source_file()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>fname</code></title>
-<p>Source file</p>
+  <p>Source file</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 0015484..86daca5 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_space_after_comment_bug631690</api:name>
     </api:function>
-
   </info>
-  <title>Index.annotation_space_after_comment_bug631690</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.annotation_space_after_comment_bug631690</title>
+  <synopsis><code mime="text/x-python">
 @returns(none)
 def annotation_space_after_comment_bug631690():
     # Python wrapper for regress_annotation_space_after_comment_bug631690()
-</code></synopsis>
+  </code></synopsis>
+  <p>Explicitly test having a space after the ** here.</p>
 
-  
-    <p>Explicitly test having a space after the ** here.</p>
-  
-  
-  
-  
 <terms>
 </terms>
 
-  
-  
 </page>
index c7d2409..9e3c823 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>properties</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.annotation_string_array_length</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.annotation_string_array_length</title>
+  <synopsis><code mime="text/x-python">
 @accepts(int, [unicode])
 @returns(none)
 def annotation_string_array_length(n_properties, properties):
     # Python wrapper for regress_annotation_string_array_length()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>n_properties</code></title>
@@ -50,6 +42,4 @@ def annotation_string_array_length(n_properties, properties):
 </item>
 </terms>
 
-  
-  
 </page>
index 765658c..24ac475 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_string_zero_terminated</api:name>
     </api:function>
-
   </info>
-  <title>Index.annotation_string_zero_terminated</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.annotation_string_zero_terminated</title>
+  <synopsis><code mime="text/x-python">
 @returns([unicode])
 def annotation_string_zero_terminated():
     # Python wrapper for regress_annotation_string_zero_terminated()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def annotation_string_zero_terminated():
 </item>
 </terms>
 
-  
-  
 </page>
index 1a9e2a4..a5fcc99 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>out</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.annotation_string_zero_terminated_out</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.annotation_string_zero_terminated_out</title>
+  <synopsis><code mime="text/x-python">
 @accepts([unicode])
 @returns(none)
 def annotation_string_zero_terminated_out(out):
     # Python wrapper for regress_annotation_string_zero_terminated_out()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>out</code></title>
@@ -42,6 +34,4 @@ def annotation_string_zero_terminated_out(out):
 </item>
 </terms>
 
-  
-  
 </page>
index 868c2d8..f247ad4 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_test_parsing_bug630862</api:name>
     </api:function>
-
   </info>
-  <title>Index.annotation_test_parsing_bug630862</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.annotation_test_parsing_bug630862</title>
+  <synopsis><code mime="text/x-python">
 @returns(GObject.Object)
 def annotation_test_parsing_bug630862():
     # Python wrapper for regress_annotation_test_parsing_bug630862()
-</code></synopsis>
+  </code></synopsis>
+  <p>See https://bugzilla.gnome.org/show_bug.cgi?id=630862</p>
 
-  
-    <p>See https://bugzilla.gnome.org/show_bug.cgi?id=630862</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def annotation_test_parsing_bug630862():
 </item>
 </terms>
 
-  
-  
 </page>
index 223d1a2..f8f68c1 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_transfer_floating</api:name>
     </api:function>
-
   </info>
-  <title>Index.annotation_transfer_floating</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.annotation_transfer_floating</title>
+  <synopsis><code mime="text/x-python">
 @returns(GObject.Object)
 def annotation_transfer_floating():
     # Python wrapper for regress_annotation_transfer_floating()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def annotation_transfer_floating():
 </item>
 </terms>
 
-  
-  
 </page>
index 51d53cd..6132e91 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_annotation_versioned</api:name>
     </api:function>
-
   </info>
-  <title>Index.annotation_versioned</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.annotation_versioned</title>
+  <synopsis><code mime="text/x-python">
 @returns(none)
 def annotation_versioned():
     # Python wrapper for regress_annotation_versioned()
-</code></synopsis>
+  </code></synopsis>
 
-  
-    
-  
-  
-    <p>Since 0.6</p>
-  
-  
+  <p>Since 0.6</p>
 <terms>
 </terms>
 
-  
-  
 </page>
index 9adb4a8..af23bfb 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_atest_error_quark</api:name>
     </api:function>
-
   </info>
-  <title>Index.atest_error_quark</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.atest_error_quark</title>
+  <synopsis><code mime="text/x-python">
 @returns(GLib.Quark)
 def atest_error_quark():
     # Python wrapper for regress_atest_error_quark()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def atest_error_quark():
 </item>
 </terms>
 
-  
-  
 </page>
index b2c0a69..3827a9c 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>user_data</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.foo_async_ready_callback</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.foo_async_ready_callback</title>
+  <synopsis><code mime="text/x-python">
 @accepts(Gio.Cancellable, Gio.AsyncReadyCallback, gpointer)
 @returns(none)
 def foo_async_ready_callback(cancellable, callback, user_data):
     # Python wrapper for regress_foo_async_ready_callback()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>cancellable</code></title>
@@ -58,6 +50,4 @@ def foo_async_ready_callback(cancellable, callback, user_data):
 </item>
 </terms>
 
-  
-  
 </page>
index 873beb2..c910180 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>destroy</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.foo_destroy_notify_callback</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.foo_destroy_notify_callback</title>
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.FooCallback, gpointer, GLib.DestroyNotify)
 @returns(none)
 def foo_destroy_notify_callback(callback, data, destroy):
     # Python wrapper for regress_foo_destroy_notify_callback()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -58,6 +50,4 @@ def foo_destroy_notify_callback(callback, data, destroy):
 </item>
 </terms>
 
-  
-  
 </page>
index 6b62ac4..9af9201 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_init</api:name>
     </api:function>
-
   </info>
-  <title>Index.foo_init</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.foo_init</title>
+  <synopsis><code mime="text/x-python">
 @returns(int)
 def foo_init():
     # Python wrapper for regress_foo_init()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def foo_init():
 </item>
 </terms>
 
-  
-  
 </page>
index 4be8179..bc6c91f 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>s</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.foo_method_external_references</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.foo_method_external_references</title>
+  <synopsis><code mime="text/x-python">
 @accepts(Utility.Object, Utility.EnumType, Utility.FlagType, Utility.Struct)
 @returns(none)
 def foo_method_external_references(object, e, f, s):
     # Python wrapper for regress_foo_method_external_references()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>object</code></title>
@@ -66,6 +58,4 @@ def foo_method_external_references(object, e, f, s):
 </item>
 </terms>
 
-  
-  
 </page>
index 0f9ba11..7559bea 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_not_a_constructor_new</api:name>
     </api:function>
-
   </info>
-  <title>Index.foo_not_a_constructor_new</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.foo_not_a_constructor_new</title>
+  <synopsis><code mime="text/x-python">
 @returns(Regress.FooObject)
 def foo_not_a_constructor_new():
     # Python wrapper for regress_foo_not_a_constructor_new()
-</code></synopsis>
-
-  
-    <p>This should be scanned as a top-level function, and shouldn't cause
+  </code></synopsis>
+  <p>This should be scanned as a top-level function, and shouldn't cause
 a "Can't find matching type for constructor" warning.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -38,6 +30,4 @@ a "Can't find matching type for constructor" warning.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index d8cdbf5..102747c 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_test_array</api:name>
     </api:function>
-
   </info>
-  <title>Index.foo_test_array</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.foo_test_array</title>
+  <synopsis><code mime="text/x-python">
 @returns([unicode])
 def foo_test_array():
     # Python wrapper for regress_foo_test_array()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def foo_test_array():
 </item>
 </terms>
 
-  
-  
 </page>
index fa7bc2e..73a82be 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>param</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.foo_test_const_char_param</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.foo_test_const_char_param</title>
+  <synopsis><code mime="text/x-python">
 @accepts(unicode)
 @returns(none)
 def foo_test_const_char_param(param):
     # Python wrapper for regress_foo_test_const_char_param()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>param</code></title>
@@ -42,6 +34,4 @@ def foo_test_const_char_param(param):
 </item>
 </terms>
 
-  
-  
 </page>
index 34ae3f9..e1c7f87 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_test_const_char_retval</api:name>
     </api:function>
-
   </info>
-  <title>Index.foo_test_const_char_retval</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.foo_test_const_char_retval</title>
+  <synopsis><code mime="text/x-python">
 @returns(unicode)
 def foo_test_const_char_retval():
     # Python wrapper for regress_foo_test_const_char_retval()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def foo_test_const_char_retval():
 </item>
 </terms>
 
-  
-  
 </page>
index f32ff39..75c2cc8 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>param</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.foo_test_const_struct_param</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.foo_test_const_struct_param</title>
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.FooStruct)
 @returns(none)
 def foo_test_const_struct_param(param):
     # Python wrapper for regress_foo_test_const_struct_param()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>param</code></title>
@@ -42,6 +34,4 @@ def foo_test_const_struct_param(param):
 </item>
 </terms>
 
-  
-  
 </page>
index 24337f0..35e246a 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_foo_test_const_struct_retval</api:name>
     </api:function>
-
   </info>
-  <title>Index.foo_test_const_struct_retval</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.foo_test_const_struct_retval</title>
+  <synopsis><code mime="text/x-python">
 @returns(Regress.FooStruct)
 def foo_test_const_struct_retval():
     # Python wrapper for regress_foo_test_const_struct_retval()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def foo_test_const_struct_retval():
 </item>
 </terms>
 
-  
-  
 </page>
index 8e242c5..16f72c2 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>array</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.foo_test_string_array</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.foo_test_string_array</title>
+  <synopsis><code mime="text/x-python">
 @accepts([unicode])
 @returns(none)
 def foo_test_string_array(array):
     # Python wrapper for regress_foo_test_string_array()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>array</code></title>
@@ -42,6 +34,4 @@ def foo_test_string_array(array):
 </item>
 </terms>
 
-  
-  
 </page>
index 92752bf..e2dfd8b 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>array</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.foo_test_string_array_with_g</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.foo_test_string_array_with_g</title>
+  <synopsis><code mime="text/x-python">
 @accepts([unicode])
 @returns(none)
 def foo_test_string_array_with_g(array):
     # Python wrapper for regress_foo_test_string_array_with_g()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>array</code></title>
@@ -42,6 +34,4 @@ def foo_test_string_array_with_g(array):
 </item>
 </terms>
 
-  
-  
 </page>
index 2006eae..48559b9 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>unsigned_param</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.foo_test_unsigned_qualifier</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.foo_test_unsigned_qualifier</title>
+  <synopsis><code mime="text/x-python">
 @accepts(int)
 @returns(none)
 def foo_test_unsigned_qualifier(unsigned_param):
     # Python wrapper for regress_foo_test_unsigned_qualifier()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>unsigned_param</code></title>
@@ -42,6 +34,4 @@ def foo_test_unsigned_qualifier(unsigned_param):
 </item>
 </terms>
 
-  
-  
 </page>
index c32efe8..c3eafeb 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>unsigned_param</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.foo_test_unsigned_type</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.foo_test_unsigned_type</title>
+  <synopsis><code mime="text/x-python">
 @accepts(int)
 @returns(none)
 def foo_test_unsigned_type(unsigned_param):
     # Python wrapper for regress_foo_test_unsigned_type()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>unsigned_param</code></title>
@@ -42,6 +34,4 @@ def foo_test_unsigned_type(unsigned_param):
 </item>
 </terms>
 
-  
-  
 </page>
index 1e737c0..58571ed 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>obj</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.func_obj_null_in</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.func_obj_null_in</title>
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj)
 @returns(none)
 def func_obj_null_in(obj):
     # Python wrapper for regress_func_obj_null_in()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>obj</code></title>
-<p>A <link xref="Regress.TestObj"/></p>
+  <p>A <link xref="Regress.TestObj"/></p>
 </item>
 </terms>
 
-  
-  
 </page>
index 825fe35..a01a068 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>v</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.global_get_flags_out</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.global_get_flags_out</title>
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestFlags)
 @returns(none)
 def global_get_flags_out(v):
     # Python wrapper for regress_global_get_flags_out()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>v</code></title>
-<p>A flags value</p>
+  <p>A flags value</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 51ae15f..bc4cd70 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>attributes</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.has_parameter_named_attrs</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.has_parameter_named_attrs</title>
+  <synopsis><code mime="text/x-python">
 @accepts(int, [guint32])
 @returns(none)
 def has_parameter_named_attrs(foo, attributes):
     # Python wrapper for regress_has_parameter_named_attrs()
-</code></synopsis>
-
-  
-    <p>This test case mirrors GnomeKeyringPasswordSchema from
+  </code></synopsis>
+  <p>This test case mirrors GnomeKeyringPasswordSchema from
 libgnome-keyring.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>foo</code></title>
-<p>some int</p>
+  <p>some int</p>
 </item>
 <item>
 <title><code>attributes</code></title>
-<p>list of attributes</p>
+  <p>list of attributes</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 9fc5a47..121f4a3 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>data</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.introspectable_via_alias</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.introspectable_via_alias</title>
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.PtrArrayAlias)
 @returns(none)
 def introspectable_via_alias(data):
     # Python wrapper for regress_introspectable_via_alias()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>data</code></title>
@@ -42,6 +34,4 @@ def introspectable_via_alias(data):
 </item>
 </terms>
 
-  
-  
 </page>
index ad81bff..6e2d6e6 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>abort_on_error</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.set_abort_on_error</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.set_abort_on_error</title>
+  <synopsis><code mime="text/x-python">
 @accepts(bool)
 @returns(none)
 def set_abort_on_error(abort_on_error):
     # Python wrapper for regress_set_abort_on_error()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>abort_on_error</code></title>
@@ -42,6 +34,4 @@ def set_abort_on_error(abort_on_error):
 </item>
 </terms>
 
-  
-  
 </page>
index 536a02c..c47120e 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_array_callback</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_array_callback</title>
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestCallbackArray)
 @returns(int)
 def test_array_callback(callback):
     # Python wrapper for regress_test_array_callback()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -46,6 +38,4 @@ def test_array_callback(callback):
 </item>
 </terms>
 
-  
-  
 </page>
index 26ddf0c..f00d8a2 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>objs</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_array_fixed_out_objects</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_array_fixed_out_objects</title>
+  <synopsis><code mime="text/x-python">
 @accepts([Regress.TestObj])
 @returns(none)
 def test_array_fixed_out_objects(objs):
     # Python wrapper for regress_test_array_fixed_out_objects()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>objs</code></title>
-<p>An array of <link xref="Regress.TestObj"/></p>
+  <p>An array of <link xref="Regress.TestObj"/></p>
 </item>
 </terms>
 
-  
-  
 </page>
index eb816b8..a1986cf 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>ints</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_array_fixed_size_int_in</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_array_fixed_size_int_in</title>
+  <synopsis><code mime="text/x-python">
 @accepts([int])
 @returns(int)
 def test_array_fixed_size_int_in(ints):
     # Python wrapper for regress_test_array_fixed_size_int_in()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>ints</code></title>
-<p>a list of 5 integers</p>
+  <p>a list of 5 integers</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -46,6 +38,4 @@ def test_array_fixed_size_int_in(ints):
 </item>
 </terms>
 
-  
-  
 </page>
index 39db1de..768bcb7 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>ints</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_array_fixed_size_int_out</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_array_fixed_size_int_out</title>
+  <synopsis><code mime="text/x-python">
 @accepts([int])
 @returns(none)
 def test_array_fixed_size_int_out(ints):
     # Python wrapper for regress_test_array_fixed_size_int_out()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>ints</code></title>
-<p>a list of 5 integers ranging from 0 to 4</p>
+  <p>a list of 5 integers ranging from 0 to 4</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 30cfee8..afe8709 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_array_fixed_size_int_return</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_array_fixed_size_int_return</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_array_fixed_size_int_return</title>
+  <synopsis><code mime="text/x-python">
 @returns([int])
 def test_array_fixed_size_int_return():
     # Python wrapper for regress_test_array_fixed_size_int_return()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_array_fixed_size_int_return():
 </item>
 </terms>
 
-  
-  
 </page>
index 62c1c4c..b50f461 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>ints</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_array_gint16_in</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_array_gint16_in</title>
+  <synopsis><code mime="text/x-python">
 @accepts(int, [gint16])
 @returns(int)
 def test_array_gint16_in(n_ints, ints):
     # Python wrapper for regress_test_array_gint16_in()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>n_ints</code></title>
@@ -46,7 +38,7 @@ def test_array_gint16_in(n_ints, ints):
 </item>
 <item>
 <title><code>ints</code></title>
-<p>List of ints</p>
+  <p>List of ints</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -54,6 +46,4 @@ def test_array_gint16_in(n_ints, ints):
 </item>
 </terms>
 
-  
-  
 </page>
index 948b271..b259d7a 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>ints</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_array_gint32_in</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_array_gint32_in</title>
+  <synopsis><code mime="text/x-python">
 @accepts(int, [gint32])
 @returns(gint32)
 def test_array_gint32_in(n_ints, ints):
     # Python wrapper for regress_test_array_gint32_in()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>n_ints</code></title>
@@ -46,7 +38,7 @@ def test_array_gint32_in(n_ints, ints):
 </item>
 <item>
 <title><code>ints</code></title>
-<p>List of ints</p>
+  <p>List of ints</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -54,6 +46,4 @@ def test_array_gint32_in(n_ints, ints):
 </item>
 </terms>
 
-  
-  
 </page>
index 6756e0d..2e5e313 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>ints</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_array_gint64_in</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_array_gint64_in</title>
+  <synopsis><code mime="text/x-python">
 @accepts(int, [int])
 @returns(int)
 def test_array_gint64_in(n_ints, ints):
     # Python wrapper for regress_test_array_gint64_in()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>n_ints</code></title>
@@ -46,7 +38,7 @@ def test_array_gint64_in(n_ints, ints):
 </item>
 <item>
 <title><code>ints</code></title>
-<p>List of ints</p>
+  <p>List of ints</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -54,6 +46,4 @@ def test_array_gint64_in(n_ints, ints):
 </item>
 </terms>
 
-  
-  
 </page>
index a7d7001..4900dbe 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>ints</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_array_gint8_in</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_array_gint8_in</title>
+  <synopsis><code mime="text/x-python">
 @accepts(int, [gint8])
 @returns(int)
 def test_array_gint8_in(n_ints, ints):
     # Python wrapper for regress_test_array_gint8_in()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>n_ints</code></title>
@@ -46,7 +38,7 @@ def test_array_gint8_in(n_ints, ints):
 </item>
 <item>
 <title><code>ints</code></title>
-<p>List of ints</p>
+  <p>List of ints</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -54,6 +46,4 @@ def test_array_gint8_in(n_ints, ints):
 </item>
 </terms>
 
-  
-  
 </page>
index e56b522..42c5332 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>types</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_array_gtype_in</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_array_gtype_in</title>
+  <synopsis><code mime="text/x-python">
 @accepts(int, [GType])
 @returns(unicode)
 def test_array_gtype_in(n_types, types):
     # Python wrapper for regress_test_array_gtype_in()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>n_types</code></title>
@@ -46,7 +38,7 @@ def test_array_gtype_in(n_types, types):
 </item>
 <item>
 <title><code>types</code></title>
-<p>List of types</p>
+  <p>List of types</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -54,6 +46,4 @@ def test_array_gtype_in(n_types, types):
 </item>
 </terms>
 
-  
-  
 </page>
index 42cbb0f..87eb1a3 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>len</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_array_int_full_out</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_array_int_full_out</title>
+  <synopsis><code mime="text/x-python">
 @accepts(int)
 @returns([int])
 def test_array_int_full_out(len):
     # Python wrapper for regress_test_array_int_full_out()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>len</code></title>
-<p>length of the returned array.</p>
+  <p>length of the returned array.</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -46,6 +38,4 @@ def test_array_int_full_out(len):
 </item>
 </terms>
 
-  
-  
 </page>
index 8e706e8..f3e2709 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>ints</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_array_int_in</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_array_int_in</title>
+  <synopsis><code mime="text/x-python">
 @accepts(int, [int])
 @returns(int)
 def test_array_int_in(n_ints, ints):
     # Python wrapper for regress_test_array_int_in()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>n_ints</code></title>
@@ -46,7 +38,7 @@ def test_array_int_in(n_ints, ints):
 </item>
 <item>
 <title><code>ints</code></title>
-<p>List of ints</p>
+  <p>List of ints</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -54,6 +46,4 @@ def test_array_int_in(n_ints, ints):
 </item>
 </terms>
 
-  
-  
 </page>
index b3f4448..f52feba 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>ints</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_array_int_inout</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_array_int_inout</title>
+  <synopsis><code mime="text/x-python">
 @accepts(int, [int])
 @returns(none)
 def test_array_int_inout(n_ints, ints):
     # Python wrapper for regress_test_array_int_inout()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>n_ints</code></title>
-<p>the length of <code>ints</code></p>
+  <p>the length of <code>ints</code></p>
 </item>
 <item>
 <title><code>ints</code></title>
-<p>a list of integers whose items will be increased by 1, except the first that will be dropped</p>
+  <p>a list of integers whose items will be increased by 1, except the first that will be dropped</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 21e5bac..7d47b82 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>len</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_array_int_none_out</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_array_int_none_out</title>
+  <synopsis><code mime="text/x-python">
 @accepts(int)
 @returns([int])
 def test_array_int_none_out(len):
     # Python wrapper for regress_test_array_int_none_out()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>len</code></title>
-<p>length of the returned array.</p>
+  <p>length of the returned array.</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -46,6 +38,4 @@ def test_array_int_none_out(len):
 </item>
 </terms>
 
-  
-  
 </page>
index 9b3fc8b..2383f04 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>len</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_array_int_null_in</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_array_int_null_in</title>
+  <synopsis><code mime="text/x-python">
 @accepts([int], int)
 @returns(none)
 def test_array_int_null_in(arr, len):
     # Python wrapper for regress_test_array_int_null_in()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>arr</code></title>
@@ -46,10 +38,8 @@ def test_array_int_null_in(arr, len):
 </item>
 <item>
 <title><code>len</code></title>
-<p>length</p>
+  <p>length</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 5b83b30..0ecf204 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>len</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_array_int_null_out</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_array_int_null_out</title>
+  <synopsis><code mime="text/x-python">
 @accepts([int], int)
 @returns(none)
 def test_array_int_null_out(arr, len):
     # Python wrapper for regress_test_array_int_null_out()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>arr</code></title>
@@ -46,10 +38,8 @@ def test_array_int_null_out(arr, len):
 </item>
 <item>
 <title><code>len</code></title>
-<p>length</p>
+  <p>length</p>
 </item>
 </terms>
 
-  
-  
 </page>
index b8f4441..8a766cd 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>ints</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_array_int_out</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_array_int_out</title>
+  <synopsis><code mime="text/x-python">
 @accepts(int, [int])
 @returns(none)
 def test_array_int_out(n_ints, ints):
     # Python wrapper for regress_test_array_int_out()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>n_ints</code></title>
-<p>the length of <code>ints</code></p>
+  <p>the length of <code>ints</code></p>
 </item>
 <item>
 <title><code>ints</code></title>
-<p>a list of 5 integers, from 0 to 4 in consecutive order</p>
+  <p>a list of 5 integers, from 0 to 4 in consecutive order</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 1dcf46c..8001c87 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_async_ready_callback</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_async_ready_callback</title>
+  <synopsis><code mime="text/x-python">
 @accepts(Gio.AsyncReadyCallback)
 @returns(none)
 def test_async_ready_callback(callback):
     # Python wrapper for regress_test_async_ready_callback()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -42,6 +34,4 @@ def test_async_ready_callback(callback):
 </item>
 </terms>
 
-  
-  
 </page>
index 22d2ebf..a3e12a8 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_boolean</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_boolean</title>
+  <synopsis><code mime="text/x-python">
 @accepts(bool)
 @returns(bool)
 def test_boolean(in):
     # Python wrapper for regress_test_boolean()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -46,6 +38,4 @@ def test_boolean(in):
 </item>
 </terms>
 
-  
-  
 </page>
index 877f582..7a3d352 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_boolean_false</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_boolean_false</title>
+  <synopsis><code mime="text/x-python">
 @accepts(bool)
 @returns(bool)
 def test_boolean_false(in):
     # Python wrapper for regress_test_boolean_false()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -46,6 +38,4 @@ def test_boolean_false(in):
 </item>
 </terms>
 
-  
-  
 </page>
index 3a1fc20..983517c 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_boolean_true</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_boolean_true</title>
+  <synopsis><code mime="text/x-python">
 @accepts(bool)
 @returns(bool)
 def test_boolean_true(in):
     # Python wrapper for regress_test_boolean_true()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -46,6 +38,4 @@ def test_boolean_true(in):
 </item>
 </terms>
 
-  
-  
 </page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boxeds_not_a_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boxeds_not_a_method.page
new file mode 100644 (file)
index 0000000..a97d550
--- /dev/null
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<page id="Regress.test_boxeds_not_a_method"
+      type="topic"
+      style="function"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="function" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>none</api:type>
+      </api:returns>
+      <api:name>regress_test_boxeds_not_a_method</api:name>
+      <api:arg>
+        <api:type>Regress.TestBoxed</api:type>
+        <api:name>boxed</api:name>
+      </api:arg>
+    </api:function>
+  </info>
+  <title>Regress.test_boxeds_not_a_method</title>
+  <synopsis><code mime="text/x-python">
+@accepts(Regress.TestBoxed)
+@returns(none)
+def test_boxeds_not_a_method(boxed):
+    # Python wrapper for regress_test_boxeds_not_a_method()
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>boxed</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boxeds_not_a_static.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boxeds_not_a_static.page
new file mode 100644 (file)
index 0000000..9d7a5f5
--- /dev/null
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<page id="Regress.test_boxeds_not_a_static"
+      type="topic"
+      style="function"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="function" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>none</api:type>
+      </api:returns>
+      <api:name>regress_test_boxeds_not_a_static</api:name>
+    </api:function>
+  </info>
+  <title>Regress.test_boxeds_not_a_static</title>
+  <synopsis><code mime="text/x-python">
+@returns(none)
+def test_boxeds_not_a_static():
+    # Python wrapper for regress_test_boxeds_not_a_static()
+  </code></synopsis>
+
+
+<terms>
+</terms>
+
+</page>
index 4bf83f0..ea38b4c 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_cairo_context_full_return</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_cairo_context_full_return</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_cairo_context_full_return</title>
+  <synopsis><code mime="text/x-python">
 @returns(cairo.Context)
 def test_cairo_context_full_return():
     # Python wrapper for regress_test_cairo_context_full_return()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_cairo_context_full_return():
 </item>
 </terms>
 
-  
-  
 </page>
index a30b8d2..860d5b9 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>context</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_cairo_context_none_in</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_cairo_context_none_in</title>
+  <synopsis><code mime="text/x-python">
 @accepts(cairo.Context)
 @returns(none)
 def test_cairo_context_none_in(context):
     # Python wrapper for regress_test_cairo_context_none_in()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>context</code></title>
@@ -42,6 +34,4 @@ def test_cairo_context_none_in(context):
 </item>
 </terms>
 
-  
-  
 </page>
index cfda6fd..a5b4753 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>surface</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_cairo_surface_full_out</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_cairo_surface_full_out</title>
+  <synopsis><code mime="text/x-python">
 @accepts(cairo.Surface)
 @returns(none)
 def test_cairo_surface_full_out(surface):
     # Python wrapper for regress_test_cairo_surface_full_out()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>surface</code></title>
@@ -42,6 +34,4 @@ def test_cairo_surface_full_out(surface):
 </item>
 </terms>
 
-  
-  
 </page>
index 5de20a9..b86412f 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_cairo_surface_full_return</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_cairo_surface_full_return</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_cairo_surface_full_return</title>
+  <synopsis><code mime="text/x-python">
 @returns(cairo.Surface)
 def test_cairo_surface_full_return():
     # Python wrapper for regress_test_cairo_surface_full_return()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_cairo_surface_full_return():
 </item>
 </terms>
 
-  
-  
 </page>
index af1b948..f284ad3 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>surface</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_cairo_surface_none_in</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_cairo_surface_none_in</title>
+  <synopsis><code mime="text/x-python">
 @accepts(cairo.Surface)
 @returns(none)
 def test_cairo_surface_none_in(surface):
     # Python wrapper for regress_test_cairo_surface_none_in()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>surface</code></title>
@@ -42,6 +34,4 @@ def test_cairo_surface_none_in(surface):
 </item>
 </terms>
 
-  
-  
 </page>
index 98fa6eb..4ef2959 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_cairo_surface_none_return</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_cairo_surface_none_return</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_cairo_surface_none_return</title>
+  <synopsis><code mime="text/x-python">
 @returns(cairo.Surface)
 def test_cairo_surface_none_return():
     # Python wrapper for regress_test_cairo_surface_none_return()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_cairo_surface_none_return():
 </item>
 </terms>
 
-  
-  
 </page>
index 3481fc1..a4a7c7a 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_callback</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_callback</title>
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestCallback)
 @returns(int)
 def test_callback(callback):
     # Python wrapper for regress_test_callback()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -46,6 +38,4 @@ def test_callback(callback):
 </item>
 </terms>
 
-  
-  
 </page>
index 21dc7ee..7de1412 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>user_data</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_callback_async</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_callback_async</title>
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestCallbackUserData, gpointer)
 @returns(none)
 def test_callback_async(callback, user_data):
     # Python wrapper for regress_test_callback_async()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -50,6 +42,4 @@ def test_callback_async(callback, user_data):
 </item>
 </terms>
 
-  
-  
 </page>
index 86df794..7d9d27e 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>notify</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_callback_destroy_notify</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_callback_destroy_notify</title>
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestCallbackUserData, gpointer, GLib.DestroyNotify)
 @returns(int)
 def test_callback_destroy_notify(callback, user_data, notify):
     # Python wrapper for regress_test_callback_destroy_notify()
-</code></synopsis>
-
-  
-    <p>Notified - callback persists until a DestroyNotify delegate
+  </code></synopsis>
+  <p>Notified - callback persists until a DestroyNotify delegate
 is invoked.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -63,6 +55,4 @@ is invoked.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 05883e8..60f53b5 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>notify</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_callback_destroy_notify_no_user_data</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_callback_destroy_notify_no_user_data</title>
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestCallbackUserData, GLib.DestroyNotify)
 @returns(int)
 def test_callback_destroy_notify_no_user_data(callback, notify):
     # Python wrapper for regress_test_callback_destroy_notify_no_user_data()
-</code></synopsis>
-
-  
-    <p>Adds a scope notified callback with no user data. This can invoke an error
+  </code></synopsis>
+  <p>Adds a scope notified callback with no user data. This can invoke an error
 condition in bindings which needs to be tested.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -55,6 +47,4 @@ condition in bindings which needs to be tested.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index d362cb8..0418eee 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_callback_thaw_async</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_callback_thaw_async</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_callback_thaw_async</title>
+  <synopsis><code mime="text/x-python">
 @returns(int)
 def test_callback_thaw_async():
     # Python wrapper for regress_test_callback_thaw_async()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_callback_thaw_async():
 </item>
 </terms>
 
-  
-  
 </page>
index 485e69b..6d57146 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_callback_thaw_notifications</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_callback_thaw_notifications</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_callback_thaw_notifications</title>
+  <synopsis><code mime="text/x-python">
 @returns(int)
 def test_callback_thaw_notifications():
     # Python wrapper for regress_test_callback_thaw_notifications()
-</code></synopsis>
-
-  
-    <p>Invokes all callbacks installed by #test_callback_destroy_notify(),
+  </code></synopsis>
+  <p>Invokes all callbacks installed by #test_callback_destroy_notify(),
 adding up their return values, and removes them, invoking the
 corresponding destroy notfications.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -39,6 +31,4 @@ corresponding destroy notfications.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 8ec8376..5245a42 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>user_data</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_callback_user_data</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_callback_user_data</title>
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestCallbackUserData, gpointer)
 @returns(int)
 def test_callback_user_data(callback, user_data):
     # Python wrapper for regress_test_callback_user_data()
-</code></synopsis>
-
-  
-    <p>Call - callback parameter persists for the duration of the method
+  </code></synopsis>
+  <p>Call - callback parameter persists for the duration of the method
 call and can be released on return.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -55,6 +47,4 @@ call and can be released on return.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index d11a8a0..aed5622 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>closure</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_closure</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_closure</title>
+  <synopsis><code mime="text/x-python">
 @accepts(GObject.Closure)
 @returns(int)
 def test_closure(closure):
     # Python wrapper for regress_test_closure()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>closure</code></title>
@@ -46,6 +38,4 @@ def test_closure(closure):
 </item>
 </terms>
 
-  
-  
 </page>
index f8d91f1..69c5c19 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>arg</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_closure_one_arg</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_closure_one_arg</title>
+  <synopsis><code mime="text/x-python">
 @accepts(GObject.Closure, int)
 @returns(int)
 def test_closure_one_arg(closure, arg):
     # Python wrapper for regress_test_closure_one_arg()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>closure</code></title>
@@ -54,6 +46,4 @@ def test_closure_one_arg(closure, arg):
 </item>
 </terms>
 
-  
-  
 </page>
index 7d6a1ac..ca362d7 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>arg</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_closure_variant</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_closure_variant</title>
+  <synopsis><code mime="text/x-python">
 @accepts(GObject.Closure, GLib.Variant)
 @returns(GLib.Variant)
 def test_closure_variant(closure, arg):
     # Python wrapper for regress_test_closure_variant()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>closure</code></title>
-<p>GClosure which takes one GVariant and returns a GVariant</p>
+  <p>GClosure which takes one GVariant and returns a GVariant</p>
 </item>
 <item>
 <title><code>arg</code></title>
-<p>a GVariant passed as argument to <code>closure</code></p>
+  <p>a GVariant passed as argument to <code>closure</code></p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -54,6 +46,4 @@ def test_closure_variant(closure, arg):
 </item>
 </terms>
 
-  
-  
 </page>
index 0428986..becfae6 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_date_in_gvalue</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_date_in_gvalue</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_date_in_gvalue</title>
+  <synopsis><code mime="text/x-python">
 @returns(GObject.Value)
 def test_date_in_gvalue():
     # Python wrapper for regress_test_date_in_gvalue()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_date_in_gvalue():
 </item>
 </terms>
 
-  
-  
 </page>
index 95f40e3..78665a0 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_def_error_quark</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_def_error_quark</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_def_error_quark</title>
+  <synopsis><code mime="text/x-python">
 @returns(GLib.Quark)
 def test_def_error_quark():
     # Python wrapper for regress_test_def_error_quark()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_def_error_quark():
 </item>
 </terms>
 
-  
-  
 </page>
index 9a2b786..47397f3 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_double</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_double</title>
+  <synopsis><code mime="text/x-python">
 @accepts(float)
 @returns(float)
 def test_double(in):
     # Python wrapper for regress_test_double()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -46,6 +38,4 @@ def test_double(in):
 </item>
 </terms>
 
-  
-  
 </page>
index d267b55..14d6b3a 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_filename_return</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_filename_return</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_filename_return</title>
+  <synopsis><code mime="text/x-python">
 @returns([filename])
 def test_filename_return():
     # Python wrapper for regress_test_filename_return()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_filename_return():
 </item>
 </terms>
 
-  
-  
 </page>
index 9d362f8..dc9c306 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_float</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_float</title>
+  <synopsis><code mime="text/x-python">
 @accepts(float)
 @returns(float)
 def test_float(in):
     # Python wrapper for regress_test_float()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -46,6 +38,4 @@ def test_float(in):
 </item>
 </terms>
 
-  
-  
 </page>
index 43990b2..f8093f6 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_garray_container_return</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_garray_container_return</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_garray_container_return</title>
+  <synopsis><code mime="text/x-python">
 @returns([unicode])
 def test_garray_container_return():
     # Python wrapper for regress_test_garray_container_return()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_garray_container_return():
 </item>
 </terms>
 
-  
-  
 </page>
index f0bfb6d..8f14652 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_garray_full_return</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_garray_full_return</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_garray_full_return</title>
+  <synopsis><code mime="text/x-python">
 @returns([unicode])
 def test_garray_full_return():
     # Python wrapper for regress_test_garray_full_return()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_garray_full_return():
 </item>
 </terms>
 
-  
-  
 </page>
index 5630526..72d8bc4 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_gerror_callback</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_gerror_callback</title>
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestCallbackGError)
 @returns(none)
 def test_gerror_callback(callback):
     # Python wrapper for regress_test_gerror_callback()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -42,6 +34,4 @@ def test_gerror_callback(callback):
 </item>
 </terms>
 
-  
-  
 </page>
index ec91c45..482d3e8 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_ghash_container_return</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_ghash_container_return</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_ghash_container_return</title>
+  <synopsis><code mime="text/x-python">
 @returns({unicode: unicode})
 def test_ghash_container_return():
     # Python wrapper for regress_test_ghash_container_return()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_ghash_container_return():
 </item>
 </terms>
 
-  
-  
 </page>
index 5356c01..43feb5f 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_ghash_everything_return</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_ghash_everything_return</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_ghash_everything_return</title>
+  <synopsis><code mime="text/x-python">
 @returns({unicode: unicode})
 def test_ghash_everything_return():
     # Python wrapper for regress_test_ghash_everything_return()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_ghash_everything_return():
 </item>
 </terms>
 
-  
-  
 </page>
index 8273602..ab380d9 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>hash</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_ghash_gvalue_in</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_ghash_gvalue_in</title>
+  <synopsis><code mime="text/x-python">
 @accepts({unicode: GObject.Value})
 @returns(none)
 def test_ghash_gvalue_in(hash):
     # Python wrapper for regress_test_ghash_gvalue_in()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>hash</code></title>
-<p>the hash table returned by
+  <p>the hash table returned by
 <link xref="Regress.test_ghash_gvalue_return"/>.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index 6d6a257..81eac0e 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_ghash_gvalue_return</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_ghash_gvalue_return</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_ghash_gvalue_return</title>
+  <synopsis><code mime="text/x-python">
 @returns({unicode: GObject.Value})
 def test_ghash_gvalue_return():
     # Python wrapper for regress_test_ghash_gvalue_return()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_ghash_gvalue_return():
 </item>
 </terms>
 
-  
-  
 </page>
index 6bc643f..ef755d3 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_ghash_nested_everything_return</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_ghash_nested_everything_return</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_ghash_nested_everything_return</title>
+  <synopsis><code mime="text/x-python">
 @returns({unicode: {unicode: unicode}})
 def test_ghash_nested_everything_return():
     # Python wrapper for regress_test_ghash_nested_everything_return()
-</code></synopsis>
+  </code></synopsis>
+  <p>Specify nested parameterized types directly with the (type ) annotation.</p>
 
-  
-    <p>Specify nested parameterized types directly with the (type ) annotation.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_ghash_nested_everything_return():
 </item>
 </terms>
 
-  
-  
 </page>
index 1cb3442..708363d 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_ghash_nested_everything_return2</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_ghash_nested_everything_return2</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_ghash_nested_everything_return2</title>
+  <synopsis><code mime="text/x-python">
 @returns({unicode: {unicode: unicode}})
 def test_ghash_nested_everything_return2():
     # Python wrapper for regress_test_ghash_nested_everything_return2()
-</code></synopsis>
-
-  
-    <p>Another way of specifying nested parameterized types: using the
+  </code></synopsis>
+  <p>Another way of specifying nested parameterized types: using the
 element-type annotation.</p>
-  
-  
-  
-  
+
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -38,6 +30,4 @@ element-type annotation.</p>
 </item>
 </terms>
 
-  
-  
 </page>
index b1d295c..70cd4d4 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_ghash_nothing_in</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_ghash_nothing_in</title>
+  <synopsis><code mime="text/x-python">
 @accepts({unicode: unicode})
 @returns(none)
 def test_ghash_nothing_in(in):
     # Python wrapper for regress_test_ghash_nothing_in()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -42,6 +34,4 @@ def test_ghash_nothing_in(in):
 </item>
 </terms>
 
-  
-  
 </page>
index df58bb6..b83ff33 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_ghash_nothing_in2</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_ghash_nothing_in2</title>
+  <synopsis><code mime="text/x-python">
 @accepts({unicode: unicode})
 @returns(none)
 def test_ghash_nothing_in2(in):
     # Python wrapper for regress_test_ghash_nothing_in2()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -42,6 +34,4 @@ def test_ghash_nothing_in2(in):
 </item>
 </terms>
 
-  
-  
 </page>
index 072fed9..817cde2 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_ghash_nothing_return</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_ghash_nothing_return</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_ghash_nothing_return</title>
+  <synopsis><code mime="text/x-python">
 @returns({unicode: unicode})
 def test_ghash_nothing_return():
     # Python wrapper for regress_test_ghash_nothing_return()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_ghash_nothing_return():
 </item>
 </terms>
 
-  
-  
 </page>
index 161d3f6..dac2400 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_ghash_nothing_return2</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_ghash_nothing_return2</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_ghash_nothing_return2</title>
+  <synopsis><code mime="text/x-python">
 @returns({unicode: unicode})
 def test_ghash_nothing_return2():
     # Python wrapper for regress_test_ghash_nothing_return2()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_ghash_nothing_return2():
 </item>
 </terms>
 
-  
-  
 </page>
index ee3ed32..7349fdd 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_ghash_null_in</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_ghash_null_in</title>
+  <synopsis><code mime="text/x-python">
 @accepts({unicode: unicode})
 @returns(none)
 def test_ghash_null_in(in):
     # Python wrapper for regress_test_ghash_null_in()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -42,6 +34,4 @@ def test_ghash_null_in(in):
 </item>
 </terms>
 
-  
-  
 </page>
index 683efc4..40f5540 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>out</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_ghash_null_out</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_ghash_null_out</title>
+  <synopsis><code mime="text/x-python">
 @accepts({unicode: unicode})
 @returns(none)
 def test_ghash_null_out(out):
     # Python wrapper for regress_test_ghash_null_out()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>out</code></title>
@@ -42,6 +34,4 @@ def test_ghash_null_out(out):
 </item>
 </terms>
 
-  
-  
 </page>
index ea51622..78f3d73 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_ghash_null_return</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_ghash_null_return</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_ghash_null_return</title>
+  <synopsis><code mime="text/x-python">
 @returns({unicode: unicode})
 def test_ghash_null_return():
     # Python wrapper for regress_test_ghash_null_return()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_ghash_null_return():
 </item>
 </terms>
 
-  
-  
 </page>
index 9d098ba..e204db0 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_glist_container_return</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_glist_container_return</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_glist_container_return</title>
+  <synopsis><code mime="text/x-python">
 @returns([unicode])
 def test_glist_container_return():
     # Python wrapper for regress_test_glist_container_return()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_glist_container_return():
 </item>
 </terms>
 
-  
-  
 </page>
index 6b2d370..4b922a4 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_glist_everything_return</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_glist_everything_return</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_glist_everything_return</title>
+  <synopsis><code mime="text/x-python">
 @returns([unicode])
 def test_glist_everything_return():
     # Python wrapper for regress_test_glist_everything_return()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_glist_everything_return():
 </item>
 </terms>
 
-  
-  
 </page>
index 4873a19..0210e0a 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_glist_nothing_in</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_glist_nothing_in</title>
+  <synopsis><code mime="text/x-python">
 @accepts([unicode])
 @returns(none)
 def test_glist_nothing_in(in):
     # Python wrapper for regress_test_glist_nothing_in()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -42,6 +34,4 @@ def test_glist_nothing_in(in):
 </item>
 </terms>
 
-  
-  
 </page>
index e28d3a8..0247875 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_glist_nothing_in2</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_glist_nothing_in2</title>
+  <synopsis><code mime="text/x-python">
 @accepts([unicode])
 @returns(none)
 def test_glist_nothing_in2(in):
     # Python wrapper for regress_test_glist_nothing_in2()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -42,6 +34,4 @@ def test_glist_nothing_in2(in):
 </item>
 </terms>
 
-  
-  
 </page>
index b4b12c8..99cd304 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_glist_nothing_return</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_glist_nothing_return</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_glist_nothing_return</title>
+  <synopsis><code mime="text/x-python">
 @returns([unicode])
 def test_glist_nothing_return():
     # Python wrapper for regress_test_glist_nothing_return()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_glist_nothing_return():
 </item>
 </terms>
 
-  
-  
 </page>
index aab83e5..74264db 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_glist_nothing_return2</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_glist_nothing_return2</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_glist_nothing_return2</title>
+  <synopsis><code mime="text/x-python">
 @returns([unicode])
 def test_glist_nothing_return2():
     # Python wrapper for regress_test_glist_nothing_return2()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_glist_nothing_return2():
 </item>
 </terms>
 
-  
-  
 </page>
index ac3f3d6..f403de3 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_glist_null_in</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_glist_null_in</title>
+  <synopsis><code mime="text/x-python">
 @accepts([unicode])
 @returns(none)
 def test_glist_null_in(in):
     # Python wrapper for regress_test_glist_null_in()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -42,6 +34,4 @@ def test_glist_null_in(in):
 </item>
 </terms>
 
-  
-  
 </page>
index 335d1b2..86bf40d 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>out_list</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_glist_null_out</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_glist_null_out</title>
+  <synopsis><code mime="text/x-python">
 @accepts([unicode])
 @returns(none)
 def test_glist_null_out(out_list):
     # Python wrapper for regress_test_glist_null_out()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>out_list</code></title>
@@ -42,6 +34,4 @@ def test_glist_null_out(out_list):
 </item>
 </terms>
 
-  
-  
 </page>
index 702c635..89b98f4 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_gslist_container_return</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_gslist_container_return</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_gslist_container_return</title>
+  <synopsis><code mime="text/x-python">
 @returns([unicode])
 def test_gslist_container_return():
     # Python wrapper for regress_test_gslist_container_return()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_gslist_container_return():
 </item>
 </terms>
 
-  
-  
 </page>
index 95fd40c..49d81db 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_gslist_everything_return</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_gslist_everything_return</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_gslist_everything_return</title>
+  <synopsis><code mime="text/x-python">
 @returns([unicode])
 def test_gslist_everything_return():
     # Python wrapper for regress_test_gslist_everything_return()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_gslist_everything_return():
 </item>
 </terms>
 
-  
-  
 </page>
index 534ac13..b72f0c5 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_gslist_nothing_in</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_gslist_nothing_in</title>
+  <synopsis><code mime="text/x-python">
 @accepts([unicode])
 @returns(none)
 def test_gslist_nothing_in(in):
     # Python wrapper for regress_test_gslist_nothing_in()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -42,6 +34,4 @@ def test_gslist_nothing_in(in):
 </item>
 </terms>
 
-  
-  
 </page>
index a7e0635..016ab04 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_gslist_nothing_in2</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_gslist_nothing_in2</title>
+  <synopsis><code mime="text/x-python">
 @accepts([unicode])
 @returns(none)
 def test_gslist_nothing_in2(in):
     # Python wrapper for regress_test_gslist_nothing_in2()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -42,6 +34,4 @@ def test_gslist_nothing_in2(in):
 </item>
 </terms>
 
-  
-  
 </page>
index ff7d7e5..e250994 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_gslist_nothing_return</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_gslist_nothing_return</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_gslist_nothing_return</title>
+  <synopsis><code mime="text/x-python">
 @returns([unicode])
 def test_gslist_nothing_return():
     # Python wrapper for regress_test_gslist_nothing_return()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_gslist_nothing_return():
 </item>
 </terms>
 
-  
-  
 </page>
index cf0f67a..fe208c1 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_gslist_nothing_return2</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_gslist_nothing_return2</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_gslist_nothing_return2</title>
+  <synopsis><code mime="text/x-python">
 @returns([unicode])
 def test_gslist_nothing_return2():
     # Python wrapper for regress_test_gslist_nothing_return2()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_gslist_nothing_return2():
 </item>
 </terms>
 
-  
-  
 </page>
index b017466..d6872af 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_gslist_null_in</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_gslist_null_in</title>
+  <synopsis><code mime="text/x-python">
 @accepts([unicode])
 @returns(none)
 def test_gslist_null_in(in):
     # Python wrapper for regress_test_gslist_null_in()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -42,6 +34,4 @@ def test_gslist_null_in(in):
 </item>
 </terms>
 
-  
-  
 </page>
index 24ef27f..2bdeb03 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>out_list</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_gslist_null_out</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_gslist_null_out</title>
+  <synopsis><code mime="text/x-python">
 @accepts([unicode])
 @returns(none)
 def test_gslist_null_out(out_list):
     # Python wrapper for regress_test_gslist_null_out()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>out_list</code></title>
@@ -42,6 +34,4 @@ def test_gslist_null_out(out_list):
 </item>
 </terms>
 
-  
-  
 </page>
index 38ffb44..3f936fd 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_gtype</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_gtype</title>
+  <synopsis><code mime="text/x-python">
 @accepts(GType)
 @returns(GType)
 def test_gtype(in):
     # Python wrapper for regress_test_gtype()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -46,6 +38,4 @@ def test_gtype(in):
 </item>
 </terms>
 
-  
-  
 </page>
index f4c4cd8..b2bd44b 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_gvariant_as</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_gvariant_as</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_gvariant_as</title>
+  <synopsis><code mime="text/x-python">
 @returns(GLib.Variant)
 def test_gvariant_as():
     # Python wrapper for regress_test_gvariant_as()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_gvariant_as():
 </item>
 </terms>
 
-  
-  
 </page>
index 8357191..dbb9c2b 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_gvariant_asv</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_gvariant_asv</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_gvariant_asv</title>
+  <synopsis><code mime="text/x-python">
 @returns(GLib.Variant)
 def test_gvariant_asv():
     # Python wrapper for regress_test_gvariant_asv()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_gvariant_asv():
 </item>
 </terms>
 
-  
-  
 </page>
index c0db460..238b002 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_gvariant_i</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_gvariant_i</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_gvariant_i</title>
+  <synopsis><code mime="text/x-python">
 @returns(GLib.Variant)
 def test_gvariant_i():
     # Python wrapper for regress_test_gvariant_i()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_gvariant_i():
 </item>
 </terms>
 
-  
-  
 </page>
index 454fc8a..f360849 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_gvariant_s</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_gvariant_s</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_gvariant_s</title>
+  <synopsis><code mime="text/x-python">
 @returns(GLib.Variant)
 def test_gvariant_s():
     # Python wrapper for regress_test_gvariant_s()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_gvariant_s():
 </item>
 </terms>
 
-  
-  
 </page>
index e8a6c00..d13b7a1 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_gvariant_v</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_gvariant_v</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_gvariant_v</title>
+  <synopsis><code mime="text/x-python">
 @returns(GLib.Variant)
 def test_gvariant_v():
     # Python wrapper for regress_test_gvariant_v()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_gvariant_v():
 </item>
 </terms>
 
-  
-  
 </page>
index 2f8ebcb..1264f29 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_hash_table_callback</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_hash_table_callback</title>
+  <synopsis><code mime="text/x-python">
 @accepts({unicode: int}, Regress.TestCallbackHashtable)
 @returns(none)
 def test_hash_table_callback(data, callback):
     # Python wrapper for regress_test_hash_table_callback()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>data</code></title>
-<p>GHashTable that gets passed to callback</p>
+  <p>GHashTable that gets passed to callback</p>
 </item>
 <item>
 <title><code>callback</code></title>
@@ -50,6 +42,4 @@ def test_hash_table_callback(data, callback):
 </item>
 </terms>
 
-  
-  
 </page>
index d039883..b695f1b 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_int</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_int</title>
+  <synopsis><code mime="text/x-python">
 @accepts(int)
 @returns(int)
 def test_int(in):
     # Python wrapper for regress_test_int()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -46,6 +38,4 @@ def test_int(in):
 </item>
 </terms>
 
-  
-  
 </page>
index 7e99517..23cd04f 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_int16</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_int16</title>
+  <synopsis><code mime="text/x-python">
 @accepts(gint16)
 @returns(gint16)
 def test_int16(in):
     # Python wrapper for regress_test_int16()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -46,6 +38,4 @@ def test_int16(in):
 </item>
 </terms>
 
-  
-  
 </page>
index 03e5c07..7f69a51 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_int32</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_int32</title>
+  <synopsis><code mime="text/x-python">
 @accepts(gint32)
 @returns(gint32)
 def test_int32(in):
     # Python wrapper for regress_test_int32()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -46,6 +38,4 @@ def test_int32(in):
 </item>
 </terms>
 
-  
-  
 </page>
index 645792c..94b67ed 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_int64</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_int64</title>
+  <synopsis><code mime="text/x-python">
 @accepts(int)
 @returns(int)
 def test_int64(in):
     # Python wrapper for regress_test_int64()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -46,6 +38,4 @@ def test_int64(in):
 </item>
 </terms>
 
-  
-  
 </page>
index c733d1b..80c27ed 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_int8</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_int8</title>
+  <synopsis><code mime="text/x-python">
 @accepts(gint8)
 @returns(gint8)
 def test_int8(in):
     # Python wrapper for regress_test_int8()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -46,6 +38,4 @@ def test_int8(in):
 </item>
 </terms>
 
-  
-  
 </page>
index f43f0bc..1123838 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_int_out_utf8</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_int_out_utf8</title>
+  <synopsis><code mime="text/x-python">
 @accepts(int, unicode)
 @returns(none)
 def test_int_out_utf8(length, in):
     # Python wrapper for regress_test_int_out_utf8()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>length</code></title>
@@ -50,6 +42,4 @@ def test_int_out_utf8(length, in):
 </item>
 </terms>
 
-  
-  
 </page>
index d7210b5..b759240 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>v</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_int_value_arg</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_int_value_arg</title>
+  <synopsis><code mime="text/x-python">
 @accepts(GObject.Value)
 @returns(int)
 def test_int_value_arg(v):
     # Python wrapper for regress_test_int_value_arg()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>v</code></title>
@@ -46,6 +38,4 @@ def test_int_value_arg(v):
 </item>
 </terms>
 
-  
-  
 </page>
index 147cae2..bef24f9 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_long</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_long</title>
+  <synopsis><code mime="text/x-python">
 @accepts(int)
 @returns(int)
 def test_long(in):
     # Python wrapper for regress_test_long()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -46,6 +38,4 @@ def test_long(in):
 </item>
 </terms>
 
-  
-  
 </page>
index c195b82..9f25f97 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_multi_callback</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_multi_callback</title>
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestCallback)
 @returns(int)
 def test_multi_callback(callback):
     # Python wrapper for regress_test_multi_callback()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -46,6 +38,4 @@ def test_multi_callback(callback):
 </item>
 </terms>
 
-  
-  
 </page>
index 7946d57..ee94e27 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>two</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_multi_double_args</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_multi_double_args</title>
+  <synopsis><code mime="text/x-python">
 @accepts(float, float, float)
 @returns(none)
 def test_multi_double_args(in, one, two):
     # Python wrapper for regress_test_multi_double_args()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -58,6 +50,4 @@ def test_multi_double_args(in, one, two):
 </item>
 </terms>
 
-  
-  
 </page>
index 2516138..80ec8cd 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_multiline_doc_comments</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_multiline_doc_comments</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_multiline_doc_comments</title>
+  <synopsis><code mime="text/x-python">
 @returns(none)
 def test_multiline_doc_comments():
     # Python wrapper for regress_test_multiline_doc_comments()
-</code></synopsis>
+  </code></synopsis>
+  <p>This is a function.</p>  <p>It has multiple lines in the documentation.</p>  <p>The sky is blue.</p>  <p>You will give me your credit card number.</p>
 
-  
-    <p>This is a function.</p><p>It has multiple lines in the documentation.</p><p>The sky is blue.</p><p>You will give me your credit card number.</p>
-  
-  
-  
-  
 <terms>
 </terms>
 
-  
-  
 </page>
index 98c1fd3..c386b91 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>a</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_nested_parameter</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_nested_parameter</title>
+  <synopsis><code mime="text/x-python">
 @accepts(int)
 @returns(none)
 def test_nested_parameter(a):
     # Python wrapper for regress_test_nested_parameter()
-</code></synopsis>
-
-  
-    <p>&lt;informaltable&gt;
+  </code></synopsis>
+  <p>&lt;informaltable&gt;
   &lt;tgroup cols="3"&gt;
     &lt;thead&gt;
       &lt;row&gt;
@@ -55,18 +50,13 @@ rgb(20%, 30%, 0%)&lt;/literallayout&gt;&lt;/entry&gt;
       &lt;/row&gt;
    &lt;/tbody&gt;
  &lt;/tgroup&gt;
-&lt;/informaltable&gt;</p><p>What we're testing here is that the scanner ignores the <code>a</code> nested inside XML.</p>
-  
-  
-  
-  
+&lt;/informaltable&gt;</p>  <p>What we're testing here is that the scanner ignores the <code>a</code> nested inside XML.</p>
+
 <terms>
 <item>
 <title><code>a</code></title>
-<p>An integer</p>
+  <p>An integer</p>
 </item>
 </terms>
 
-  
-  
 </page>
index cdb1b92..5c71e87 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_null_gerror_callback</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_null_gerror_callback</title>
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestCallbackGError)
 @returns(none)
 def test_null_gerror_callback(callback):
     # Python wrapper for regress_test_null_gerror_callback()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -42,6 +34,4 @@ def test_null_gerror_callback(callback):
 </item>
 </terms>
 
-  
-  
 </page>
index f33b39e..882083e 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_owned_gerror_callback</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_owned_gerror_callback</title>
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestCallbackOwnedGError)
 @returns(none)
 def test_owned_gerror_callback(callback):
     # Python wrapper for regress_test_owned_gerror_callback()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -42,6 +34,4 @@ def test_owned_gerror_callback(callback):
 </item>
 </terms>
 
-  
-  
 </page>
index e2f4563..5deeb7d 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_short</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_short</title>
+  <synopsis><code mime="text/x-python">
 @accepts(gshort)
 @returns(gshort)
 def test_short(in):
     # Python wrapper for regress_test_short()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -46,6 +38,4 @@ def test_short(in):
 </item>
 </terms>
 
-  
-  
 </page>
index a9fa29c..4a5da37 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>callback</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_simple_callback</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_simple_callback</title>
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestSimpleCallback)
 @returns(none)
 def test_simple_callback(callback):
     # Python wrapper for regress_test_simple_callback()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>callback</code></title>
@@ -42,6 +34,4 @@ def test_simple_callback(callback):
 </item>
 </terms>
 
-  
-  
 </page>
index 7935c21..fb761b3 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_size</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_size</title>
+  <synopsis><code mime="text/x-python">
 @accepts(gsize)
 @returns(gsize)
 def test_size(in):
     # Python wrapper for regress_test_size()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -46,6 +38,4 @@ def test_size(in):
 </item>
 </terms>
 
-  
-  
 </page>
index 47fe2cd..a681b17 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_ssize</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_ssize</title>
+  <synopsis><code mime="text/x-python">
 @accepts(gssize)
 @returns(gssize)
 def test_ssize(in):
     # Python wrapper for regress_test_ssize()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -46,6 +38,4 @@ def test_ssize(in):
 </item>
 </terms>
 
-  
-  
 </page>
index 1121a7d..f70904d 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>arr</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_strv_in</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_strv_in</title>
+  <synopsis><code mime="text/x-python">
 @accepts([unicode])
 @returns(bool)
 def test_strv_in(arr):
     # Python wrapper for regress_test_strv_in()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>arr</code></title>
@@ -46,6 +38,4 @@ def test_strv_in(arr):
 </item>
 </terms>
 
-  
-  
 </page>
index fcffe1b..6481456 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_strv_in_gvalue</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_strv_in_gvalue</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_strv_in_gvalue</title>
+  <synopsis><code mime="text/x-python">
 @returns(GObject.Value)
 def test_strv_in_gvalue():
     # Python wrapper for regress_test_strv_in_gvalue()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_strv_in_gvalue():
 </item>
 </terms>
 
-  
-  
 </page>
index eea084c..0c69875 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_strv_out</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_strv_out</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_strv_out</title>
+  <synopsis><code mime="text/x-python">
 @returns([unicode])
 def test_strv_out():
     # Python wrapper for regress_test_strv_out()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_strv_out():
 </item>
 </terms>
 
-  
-  
 </page>
index c800fa0..bce768a 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_strv_out_c</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_strv_out_c</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_strv_out_c</title>
+  <synopsis><code mime="text/x-python">
 @returns([unicode])
 def test_strv_out_c():
     # Python wrapper for regress_test_strv_out_c()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_strv_out_c():
 </item>
 </terms>
 
-  
-  
 </page>
index 69f6c56..4f8a906 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_strv_out_container</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_strv_out_container</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_strv_out_container</title>
+  <synopsis><code mime="text/x-python">
 @returns([unicode])
 def test_strv_out_container():
     # Python wrapper for regress_test_strv_out_container()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_strv_out_container():
 </item>
 </terms>
 
-  
-  
 </page>
index 3624f8a..cf37489 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>retp</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_strv_outarg</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_strv_outarg</title>
+  <synopsis><code mime="text/x-python">
 @accepts([unicode])
 @returns(none)
 def test_strv_outarg(retp):
     # Python wrapper for regress_test_strv_outarg()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>retp</code></title>
@@ -42,6 +34,4 @@ def test_strv_outarg(retp):
 </item>
 </terms>
 
-  
-  
 </page>
index 5169828..7ba8fe5 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_timet</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_timet</title>
+  <synopsis><code mime="text/x-python">
 @accepts(int)
 @returns(int)
 def test_timet(in):
     # Python wrapper for regress_test_timet()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -46,6 +38,4 @@ def test_timet(in):
 </item>
 </terms>
 
-  
-  
 </page>
index 7875a81..0f2413f 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>m</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_torture_signature_0</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_torture_signature_0</title>
+  <synopsis><code mime="text/x-python">
 @accepts(int, float, int, unicode, int, int)
 @returns(none)
 def test_torture_signature_0(x, y, z, foo, q, m):
     # Python wrapper for regress_test_torture_signature_0()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>x</code></title>
@@ -82,6 +74,4 @@ def test_torture_signature_0(x, y, z, foo, q, m):
 </item>
 </terms>
 
-  
-  
 </page>
index 6a499a5..8a99c2c 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>m</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_torture_signature_1</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_torture_signature_1</title>
+  <synopsis><code mime="text/x-python">
 @accepts(int, float, int, unicode, int, int)
 @returns(bool)
 def test_torture_signature_1(x, y, z, foo, q, m):
     # Python wrapper for regress_test_torture_signature_1()
-</code></synopsis>
+  </code></synopsis>
+  <p>This function throws an error if m is odd.</p>
 
-  
-    <p>This function throws an error if m is odd.</p>
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>x</code></title>
@@ -86,6 +78,4 @@ def test_torture_signature_1(x, y, z, foo, q, m):
 </item>
 </terms>
 
-  
-  
 </page>
index 01f7778..f982841 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>m</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_torture_signature_2</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_torture_signature_2</title>
+  <synopsis><code mime="text/x-python">
 @accepts(int, Regress.TestCallbackUserData, gpointer, GLib.DestroyNotify, float, int, unicode, int, int)
 @returns(none)
 def test_torture_signature_2(x, callback, user_data, notify, y, z, foo, q, m):
     # Python wrapper for regress_test_torture_signature_2()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>x</code></title>
@@ -106,6 +98,4 @@ def test_torture_signature_2(x, callback, user_data, notify, y, z, foo, q, m):
 </item>
 </terms>
 
-  
-  
 </page>
index f6943c0..d4bcf56 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_uint</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_uint</title>
+  <synopsis><code mime="text/x-python">
 @accepts(int)
 @returns(int)
 def test_uint(in):
     # Python wrapper for regress_test_uint()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -46,6 +38,4 @@ def test_uint(in):
 </item>
 </terms>
 
-  
-  
 </page>
index 5ace288..181beae 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_uint16</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_uint16</title>
+  <synopsis><code mime="text/x-python">
 @accepts(guint16)
 @returns(guint16)
 def test_uint16(in):
     # Python wrapper for regress_test_uint16()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -46,6 +38,4 @@ def test_uint16(in):
 </item>
 </terms>
 
-  
-  
 </page>
index 084d619..ea052bc 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_uint32</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_uint32</title>
+  <synopsis><code mime="text/x-python">
 @accepts(guint32)
 @returns(guint32)
 def test_uint32(in):
     # Python wrapper for regress_test_uint32()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -46,6 +38,4 @@ def test_uint32(in):
 </item>
 </terms>
 
-  
-  
 </page>
index b2234a3..63841e4 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_uint64</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_uint64</title>
+  <synopsis><code mime="text/x-python">
 @accepts(int)
 @returns(int)
 def test_uint64(in):
     # Python wrapper for regress_test_uint64()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -46,6 +38,4 @@ def test_uint64(in):
 </item>
 </terms>
 
-  
-  
 </page>
index 94e367b..377cf5d 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_uint8</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_uint8</title>
+  <synopsis><code mime="text/x-python">
 @accepts(guint8)
 @returns(guint8)
 def test_uint8(in):
     # Python wrapper for regress_test_uint8()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -46,6 +38,4 @@ def test_uint8(in):
 </item>
 </terms>
 
-  
-  
 </page>
index dc98e47..10e75d9 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_ulong</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_ulong</title>
+  <synopsis><code mime="text/x-python">
 @accepts(int)
 @returns(int)
 def test_ulong(in):
     # Python wrapper for regress_test_ulong()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -46,6 +38,4 @@ def test_ulong(in):
 </item>
 </terms>
 
-  
-  
 </page>
index abc373e..4fe338d 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_unichar</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_unichar</title>
+  <synopsis><code mime="text/x-python">
 @accepts(unicode)
 @returns(unicode)
 def test_unichar(in):
     # Python wrapper for regress_test_unichar()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -46,6 +38,4 @@ def test_unichar(in):
 </item>
 </terms>
 
-  
-  
 </page>
index eb7ff64..0a99c9a 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>e</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_unsigned_enum_param</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_unsigned_enum_param</title>
+  <synopsis><code mime="text/x-python">
 @accepts(Regress.TestEnumUnsigned)
 @returns(unicode)
 def test_unsigned_enum_param(e):
     # Python wrapper for regress_test_unsigned_enum_param()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>e</code></title>
@@ -46,6 +38,4 @@ def test_unsigned_enum_param(e):
 </item>
 </terms>
 
-  
-  
 </page>
index 4bebadc..383547a 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_ushort</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_ushort</title>
+  <synopsis><code mime="text/x-python">
 @accepts(gushort)
 @returns(gushort)
 def test_ushort(in):
     # Python wrapper for regress_test_ushort()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -46,6 +38,4 @@ def test_ushort(in):
 </item>
 </terms>
 
-  
-  
 </page>
index 4d4ff1a..05eb0d4 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_utf8_const_in</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_utf8_const_in</title>
+  <synopsis><code mime="text/x-python">
 @accepts(unicode)
 @returns(none)
 def test_utf8_const_in(in):
     # Python wrapper for regress_test_utf8_const_in()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -42,6 +34,4 @@ def test_utf8_const_in(in):
 </item>
 </terms>
 
-  
-  
 </page>
index 7149eac..04c7325 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_utf8_const_return</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_utf8_const_return</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_utf8_const_return</title>
+  <synopsis><code mime="text/x-python">
 @returns(unicode)
 def test_utf8_const_return():
     # Python wrapper for regress_test_utf8_const_return()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_utf8_const_return():
 </item>
 </terms>
 
-  
-  
 </page>
index 28ecfc2..a47d745 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>inout</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_utf8_inout</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_utf8_inout</title>
+  <synopsis><code mime="text/x-python">
 @accepts(unicode)
 @returns(none)
 def test_utf8_inout(inout):
     # Python wrapper for regress_test_utf8_inout()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>inout</code></title>
@@ -42,6 +34,4 @@ def test_utf8_inout(inout):
 </item>
 </terms>
 
-  
-  
 </page>
index 1d1be7d..82bc903 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_utf8_nonconst_return</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_utf8_nonconst_return</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_utf8_nonconst_return</title>
+  <synopsis><code mime="text/x-python">
 @returns(unicode)
 def test_utf8_nonconst_return():
     # Python wrapper for regress_test_utf8_nonconst_return()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>Returns</code></title>
@@ -37,6 +29,4 @@ def test_utf8_nonconst_return():
 </item>
 </terms>
 
-  
-  
 </page>
index 8074caf..8f01c44 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>in</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_utf8_null_in</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_utf8_null_in</title>
+  <synopsis><code mime="text/x-python">
 @accepts(unicode)
 @returns(none)
 def test_utf8_null_in(in):
     # Python wrapper for regress_test_utf8_null_in()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>in</code></title>
@@ -42,6 +34,4 @@ def test_utf8_null_in(in):
 </item>
 </terms>
 
-  
-  
 </page>
index da98d74..0beedb3 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>char_out</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_utf8_null_out</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_utf8_null_out</title>
+  <synopsis><code mime="text/x-python">
 @accepts(unicode)
 @returns(none)
 def test_utf8_null_out(char_out):
     # Python wrapper for regress_test_utf8_null_out()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>char_out</code></title>
@@ -42,6 +34,4 @@ def test_utf8_null_out(char_out):
 </item>
 </terms>
 
-  
-  
 </page>
index 3aa56f0..9fbf938 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>out</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_utf8_out</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_utf8_out</title>
+  <synopsis><code mime="text/x-python">
 @accepts(unicode)
 @returns(none)
 def test_utf8_out(out):
     # Python wrapper for regress_test_utf8_out()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>out</code></title>
@@ -42,6 +34,4 @@ def test_utf8_out(out):
 </item>
 </terms>
 
-  
-  
 </page>
index 0b775cc..127c763 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>out</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_utf8_out_nonconst_return</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_utf8_out_nonconst_return</title>
+  <synopsis><code mime="text/x-python">
 @accepts(unicode)
 @returns(unicode)
 def test_utf8_out_nonconst_return(out):
     # Python wrapper for regress_test_utf8_out_nonconst_return()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>out</code></title>
-<p>a copy of "second"</p>
+  <p>a copy of "second"</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -46,6 +38,4 @@ def test_utf8_out_nonconst_return(out):
 </item>
 </terms>
 
-  
-  
 </page>
index 5a6bc2e..a93227d 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>out1</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_utf8_out_out</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_utf8_out_out</title>
+  <synopsis><code mime="text/x-python">
 @accepts(unicode, unicode)
 @returns(none)
 def test_utf8_out_out(out0, out1):
     # Python wrapper for regress_test_utf8_out_out()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>out0</code></title>
-<p>a copy of "first"</p>
+  <p>a copy of "first"</p>
 </item>
 <item>
 <title><code>out1</code></title>
-<p>a copy of "second"</p>
+  <p>a copy of "second"</p>
 </item>
 </terms>
 
-  
-  
 </page>
index ef9f97e..d35a11a 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:name>i</api:name>
       </api:arg>
     </api:function>
-
   </info>
-  <title>Index.test_value_return</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_value_return</title>
+  <synopsis><code mime="text/x-python">
 @accepts(int)
 @returns(GObject.Value)
 def test_value_return(i):
     # Python wrapper for regress_test_value_return()
-</code></synopsis>
+  </code></synopsis>
+
 
-  
-    
-  
-  
-  
-  
 <terms>
 <item>
 <title><code>i</code></title>
-<p>an int</p>
+  <p>an int</p>
 </item>
 <item>
 <title><code>Returns</code></title>
@@ -46,6 +38,4 @@ def test_value_return(i):
 </item>
 </terms>
 
-  
-  
 </page>
index 847a5c3..de64f26 100644 (file)
@@ -6,7 +6,6 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    
     <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
       </api:returns>
       <api:name>regress_test_versioning</api:name>
     </api:function>
-
   </info>
-  <title>Index.test_versioning</title>
-  
-<synopsis><code mime="text/x-python">
+  <title>Regress.test_versioning</title>
+  <synopsis><code mime="text/x-python">
 @returns(none)
 def test_versioning():
     # Python wrapper for regress_test_versioning()
-</code></synopsis>
+  </code></synopsis>
 
-  
-    
-  
-  
-    <p>Since 1.32.1</p>
-  
-  
+  <p>Since 1.32.1</p>
 <terms>
 </terms>
 
-  
-  
 </page>
index a5426d8..426ebed 100644 (file)
@@ -5,21 +5,9 @@
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-
-  </info>
-  <title>Index</title>
-  
-  
-  
-
-  
-
-  
-  
-  
-  <links type="topic" ui:expanded="true" groups="class" style="linklist">
+  <info>  </info>
+  <title>Regress</title>
+  <links type="topic" ui:expanded="true" groups="class interface" style="linklist">
     <title>Classes</title>
   </links>
   <links type="topic" ui:expanded="true" groups="function" style="linklist">
index a565113..82c11d3 100644 (file)
@@ -2140,6 +2140,18 @@ use it should be.</doc>
           </parameter>
         </parameters>
       </constructor>
+      <method name="_not_a_method"
+              c:identifier="regress_test_boxeds_not_a_method"
+              moved-to="test_boxeds_not_a_method">
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="boxed" transfer-ownership="none">
+            <type name="TestBoxed" c:type="RegressTestBoxed*"/>
+          </instance-parameter>
+        </parameters>
+      </method>
       <method name="copy" c:identifier="regress_test_boxed_copy">
         <return-value transfer-ownership="full">
           <type name="TestBoxed" c:type="RegressTestBoxed*"/>
@@ -2466,6 +2478,20 @@ use it should be.</doc>
         </return-value>
       </function>
     </enumeration>
+    <callback name="TestExternallyDefinedCallback"
+              c:type="RegressTestExternallyDefinedCallback">
+      <return-value transfer-ownership="none">
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="obj" transfer-ownership="none">
+          <type name="TestObj" c:type="RegressTestObj*"/>
+        </parameter>
+        <parameter name="someint" transfer-ownership="none">
+          <type name="gint" c:type="int"/>
+        </parameter>
+      </parameters>
+    </callback>
     <bitfield name="TestFlags"
               glib:type-name="RegressTestFlags"
               glib:get-type="regress_test_flags_get_type"
@@ -2523,6 +2549,29 @@ use it should be.</doc>
            glib:unref-func="regress_test_fundamental_object_unref"
            glib:set-value-func="regress_test_value_set_fundamental_object"
            glib:get-value-func="regress_test_value_get_fundamental_object">
+      <virtual-method name="copy">
+        <return-value transfer-ownership="full">
+          <type name="TestFundamentalObject"
+                c:type="RegressTestFundamentalObject*"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="obj" transfer-ownership="none">
+            <type name="TestFundamentalObject"
+                  c:type="const RegressTestFundamentalObject*"/>
+          </instance-parameter>
+        </parameters>
+      </virtual-method>
+      <virtual-method name="finalize">
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="obj" transfer-ownership="none">
+            <type name="TestFundamentalObject"
+                  c:type="RegressTestFundamentalObject*"/>
+          </instance-parameter>
+        </parameters>
+      </virtual-method>
       <method name="ref" c:identifier="regress_test_fundamental_object_ref">
         <return-value transfer-ownership="full">
           <doc xml:space="preserve">A new #RegressTestFundamentalObject</doc>
@@ -2866,6 +2915,19 @@ use it should be.</doc>
           </parameter>
         </parameters>
       </virtual-method>
+      <virtual-method name="complex_vfunc">
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="obj" transfer-ownership="none">
+            <type name="TestObj" c:type="RegressTestObj*"/>
+          </instance-parameter>
+          <parameter name="someint" transfer-ownership="none">
+            <type name="gint" c:type="int"/>
+          </parameter>
+        </parameters>
+      </virtual-method>
       <virtual-method name="matrix" invoker="do_matrix">
         <doc xml:space="preserve">This method is virtual.  Notably its name differs from the virtual
 slot name, which makes it useful for testing bindings handle this
@@ -3388,6 +3450,13 @@ raise an error.</doc>
       <field name="gtype">
         <type name="GType" c:type="GType"/>
       </field>
+      <field name="function_ptr">
+        <callback name="function_ptr">
+          <return-value transfer-ownership="none">
+            <type name="none" c:type="void"/>
+          </return-value>
+        </callback>
+      </field>
       <glib:signal name="all"
                    when="first"
                    no-recurse="1"
@@ -3597,6 +3666,10 @@ the introspection client langage.</doc>
       <field name="test_signal_with_static_scope_arg">
         <type name="guint" c:type="guint"/>
       </field>
+      <field name="complex_vfunc">
+        <type name="TestExternallyDefinedCallback"
+              c:type="RegressTestExternallyDefinedCallback"/>
+      </field>
       <field name="_regress_reserved1" introspectable="0">
         <callback name="_regress_reserved1">
           <return-value transfer-ownership="none">
@@ -5055,6 +5128,23 @@ libgnome-keyring.</doc>
         </parameter>
       </parameters>
     </function>
+    <function name="test_boxeds_not_a_method"
+              c:identifier="regress_test_boxeds_not_a_method">
+      <return-value transfer-ownership="none">
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="boxed" transfer-ownership="none">
+          <type name="TestBoxed" c:type="RegressTestBoxed*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="test_boxeds_not_a_static"
+              c:identifier="regress_test_boxeds_not_a_static">
+      <return-value transfer-ownership="none">
+        <type name="none" c:type="void"/>
+      </return-value>
+    </function>
     <function name="test_cairo_context_full_return"
               c:identifier="regress_test_cairo_context_full_return">
       <return-value transfer-ownership="full">
index 96df7c5..c9ff60a 100644 (file)
@@ -74,6 +74,8 @@ regress_test_async_ready_callback
 regress_test_boolean
 regress_test_boolean_false
 regress_test_boolean_true
+regress_test_boxeds_not_a_method
+regress_test_boxeds_not_a_static
 regress_test_cairo_context_full_return
 regress_test_cairo_context_none_in
 regress_test_cairo_surface_full_out
index c55def4..9c2f3c3 100644 (file)
@@ -502,7 +502,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 INTROSPECTION_SCANNER = \
-    env PATH=.libs:$(PATH) \
+    env PATH=".libs:$(PATH)" \
         LPATH=.libs \
         CC="$(CC)" \
         PYTHONPATH=$(top_builddir):$(top_srcdir) \
@@ -519,7 +519,7 @@ INTROSPECTION_SCANNER_ARGS = \
     --add-include-path=$(top_builddir)
 
 INTROSPECTION_COMPILER = \
-    env PATH=.libs:$(PATH) \
+    env PATH=".libs:$(PATH)" \
         $(top_builddir)/g-ir-compiler$(EXEEXT)
 
 INTROSPECTION_COMPILER_ARGS = \
@@ -529,7 +529,7 @@ INTROSPECTION_COMPILER_ARGS = \
     --includedir=$(top_builddir)
 
 INTROSPECTION_DOCTOOL = \
-    env PATH=.libs:$(PATH) \
+    env PATH=".libs:$(PATH)" \
         LPATH=.libs \
         PYTHONPATH=$(top_builddir):$(top_srcdir) \
         UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
index 4507bc6..1bad36e 100644 (file)
@@ -1872,6 +1872,16 @@ regress_test_boxed_equals (RegressTestBoxed *boxed,
          regress_test_simple_boxed_a_equals(&other->nested_a, &boxed->nested_a));
 }
 
+void
+regress_test_boxeds_not_a_method (RegressTestBoxed *boxed)
+{
+}
+
+void
+regress_test_boxeds_not_a_static (void)
+{
+}
+
 static void
 regress_test_boxed_free (RegressTestBoxed *boxed)
 {
index 3f917e6..e2e645b 100644 (file)
@@ -426,6 +426,9 @@ RegressTestBoxed *regress_test_boxed_copy     (RegressTestBoxed *boxed);
 gboolean   regress_test_boxed_equals   (RegressTestBoxed *boxed,
                                        RegressTestBoxed *other);
 
+void       regress_test_boxeds_not_a_method (RegressTestBoxed *boxed);
+void       regress_test_boxeds_not_a_static (void);
+
 typedef struct _RegressTestBoxedB RegressTestBoxedB;
 
 struct _RegressTestBoxedB
@@ -485,8 +488,13 @@ struct _RegressTestObj
   double some_double;
   char* string;
   GType gtype;
+
+  /* < private > */
+  void (*function_ptr) (void);
 };
 
+typedef void (*RegressTestExternallyDefinedCallback) (RegressTestObj *obj, int someint);
+
 struct _RegressTestObjClass
 {
   GObjectClass parent_class;
@@ -502,6 +510,8 @@ struct _RegressTestObjClass
   guint test_signal;
   guint test_signal_with_static_scope_arg;
 
+  RegressTestExternallyDefinedCallback complex_vfunc;
+
   /* Should be replaced with simple "gpointer" and not be callback */
   void (*_regress_reserved1) (void);
   void (*_regress_reserved2) (void);
index 1ad7654..3cf9642 100644 (file)
@@ -501,7 +501,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 INTROSPECTION_SCANNER = \
-    env PATH=.libs:$(PATH) \
+    env PATH=".libs:$(PATH)" \
         LPATH=.libs \
         CC="$(CC)" \
         PYTHONPATH=$(top_builddir):$(top_srcdir) \
@@ -518,7 +518,7 @@ INTROSPECTION_SCANNER_ARGS = \
     --add-include-path=$(top_builddir)
 
 INTROSPECTION_COMPILER = \
-    env PATH=.libs:$(PATH) \
+    env PATH=".libs:$(PATH)" \
         $(top_builddir)/g-ir-compiler$(EXEEXT)
 
 INTROSPECTION_COMPILER_ARGS = \
@@ -528,7 +528,7 @@ INTROSPECTION_COMPILER_ARGS = \
     --includedir=$(top_builddir)
 
 INTROSPECTION_DOCTOOL = \
-    env PATH=.libs:$(PATH) \
+    env PATH=".libs:$(PATH)" \
         LPATH=.libs \
         PYTHONPATH=$(top_builddir):$(top_srcdir) \
         UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \