summaryrefslogtreecommitdiff
path: root/tests/doctool/GIRepository-2.0-C-expected
diff options
context:
space:
mode:
authorTomeu Vizoso <tomeu.vizoso@collabora.com>2012-02-20 18:18:04 +0100
committerTomeu Vizoso <tomeu.vizoso@collabora.com>2012-02-20 18:18:04 +0100
commitad5c6abcbcd6c1cd26b9a714995c622f5dbe3b07 (patch)
treec040697e6ad1bb8269351968c3612927d9daea80 /tests/doctool/GIRepository-2.0-C-expected
parent4fbb34bb0ea4a1d142052e62a29480c704550f8b (diff)
parent990b33b9fb5856b62550725bcff29f7e39a488a4 (diff)
downloadgobject-introspection-ad5c6abcbcd6c1cd26b9a714995c622f5dbe3b07.tar.gz
Merge branch 'mallard-templates'
Diffstat (limited to 'tests/doctool/GIRepository-2.0-C-expected')
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.ArgInfo.page5
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.ArrayType.page10
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.AttributeIter.page3
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.equal.page33
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_attribute.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_container.page23
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_name.page23
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_namespace.page21
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_typelib.page21
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.is_deprecated.page21
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.iterate_attributes.page47
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.page11
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.ref.page21
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.unref.page21
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.CallableInfo.page7
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.CallbackInfo.page5
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.ConstantInfo.page5
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Direction.page10
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.EnumInfo.page5
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.FieldInfo.page5
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.FieldInfoFlags.page5
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.FunctionInfo.page5
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.FunctionInfoFlags.page5
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.InfoType.page10
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.InterfaceInfo.page5
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfo.page5
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoGetValueFunction.page5
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoRefFunction.page5
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoSetValueFunction.page5
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoUnrefFunction.page5
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.PropertyInfo.page5
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.RegisteredTypeInfo.page5
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.dump.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.enumerate_versions.page34
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.error_quark.page30
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_error_domain.page35
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_gtype.page34
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_name.page43
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_c_prefix.page34
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_default.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_dependencies.page34
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_info.page43
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_loaded_namespaces.page25
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_n_infos.page34
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_option_group.page32
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_search_path.page32
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_shared_library.page34
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_typelib_path.page34
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_version.page34
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.is_registered.page43
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.load_typelib.page41
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.page23
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.prepend_search_path.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.require.page52
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.require_private.page61
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryClass.page1
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryError.page8
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryLoadFlags.page5
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryPrivate.page11
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.ScopeType.page12
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.SignalInfo.page5
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.StructInfo.page5
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Transfer.page12
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.TypeInfo.page5
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.TypeTag.page10
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Typelib.free.page11
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Typelib.get_namespace.page11
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Typelib.page11
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Typelib.symbol.page11
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.UnionInfo.page5
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.UnresolvedInfo.page11
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.VFuncInfo.page5
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.VFuncInfoFlags.page5
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.ValueInfo.page5
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository._Argument.page3
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository._BaseInfoStub.page1
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_closure.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_destroy.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_direction.page31
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_ownership_transfer.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_scope.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_type.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_caller_allocates.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_optional.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_return_value.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_skip.page30
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_load_type.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_may_be_null.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.base_info_get_type.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_arg.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_caller_owns.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_n_args.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_return_attribute.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_return_type.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_iterate_return_attributes.page56
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_load_arg.page47
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_load_return_type.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_may_return_null.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_skip_return.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_free_value.page48
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_get_type.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_get_value.page41
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_error_domain.page27
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_method.page48
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_n_methods.page39
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_n_values.page27
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_storage_type.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_value.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_field.page47
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_flags.page31
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_offset.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_size.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_type.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_set_field.page47
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_flags.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_property.page33
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_symbol.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_vfunc.page33
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_invoke.page74
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.info_new.page54
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.info_type_to_string.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_find_method.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_find_vfunc.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_constant.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_iface_struct.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_method.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_constants.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_methods.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_prerequisites.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_properties.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_signals.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_vfuncs.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_prerequisite.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_property.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_signal.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_vfunc.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.invoke_error_quark.page19
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.nvokeError.page10
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_method.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_method_using_interfaces.page47
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_signal.page36
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_vfunc.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_abstract.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_class_struct.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_constant.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_field.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_fundamental.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_get_value_function.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_get_value_function_pointer.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_interface.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_method.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_constants.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_fields.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_interfaces.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_methods.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_properties.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_signals.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_vfuncs.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_parent.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_property.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_ref_function.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_ref_function_pointer.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_set_value_function.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_set_value_function_pointer.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_signal.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_type_init.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_type_name.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_unref_function.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_unref_function_pointer.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_vfunc.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_flags.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_ownership_transfer.page31
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_type.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_g_type.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_type_init.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_type_name.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_get_class_closure.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_get_flags.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_true_stops_emit.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_find_method.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_alignment.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_field.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_method.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_n_fields.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_n_methods.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_size.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_is_foreign.page27
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_is_gtype_struct.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_fixed_size.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_length.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_type.page31
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_interface.page31
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_param_type.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_tag.page31
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_is_pointer.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_is_zero_terminated.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_tag_to_string.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_find_method.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_alignment.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator_offset.page27
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator_type.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_field.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_method.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_n_fields.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_n_methods.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_size.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_is_discriminated.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.value_info_get_value.page31
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_address.page38
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_flags.page31
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_invoker.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_offset.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_signal.page29
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_invoke.page83
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/index.page6
216 files changed, 5648 insertions, 336 deletions
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ArgInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ArgInfo.page
index 87893a98..8cddb854 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ArgInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ArgInfo.page
@@ -6,5 +6,6 @@
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
</info>
- <title>GIRepositoryArgInfo</title>
-<p>Represents an argument.</p></page>
+ <title>GIRepository.ArgInfo</title>
+<p>Represents an argument.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ArrayType.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ArrayType.page
index bb0afd47..b169ec67 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ArrayType.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ArrayType.page
@@ -1,10 +1,12 @@
<?xml version="1.0"?>
<page id="GIRepository.ArrayType"
- type="topic"
- style=""
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
+ <link type="guide" xref="index"/>
</info>
- <title>GIRepositoryArrayType</title>
-<p>The type of array in a <link xref="GITypeInfo">GITypeInfo</link>.</p></page>
+ <title>GIRepository.ArrayType</title>
+<p>The type of array in a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.AttributeIter.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.AttributeIter.page
index bcd5f4b1..ed856912 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.AttributeIter.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.AttributeIter.page
@@ -9,4 +9,5 @@
</info>
<title>GIRepositoryAttributeIter</title>
<p>An opaque structure used to iterate over attributes
-in a <link xref="GIBaseInfo">GIBaseInfo</link> struct.</p></page>
+in a <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> struct.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.equal.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.equal.page
index c0aa7e80..1194cd10 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.equal.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.equal.page
@@ -1,13 +1,40 @@
<?xml version="1.0"?>
+
<page id="GIRepository.BaseInfo.equal"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="GIRepository.BaseInfo" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gboolean</api:type>
+ </api:returns>
+ <api:name>g_base_info_equal</api:name>
+ <api:arg>
+ <api:type>GIBaseInfo*</api:type>
+ <api:name>info2</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_base_info_equal</title>
-<p>Compare two <link xref="GIBaseInfo">GIBaseInfo</link>.</p><p>Using pointer comparison is not practical since many functions return
-different instances of <link xref="GIBaseInfo">GIBaseInfo</link> that refers to the same part of the
-TypeLib; use this function instead to do <link xref="GIBaseInfo">GIBaseInfo</link> comparisons.</p></page>
+<synopsis><code mime="text/x-csrc">
+gboolean g_base_info_equal (GIBaseInfo* info2);
+</code></synopsis>
+<p>Compare two <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link>.</p><p>Using pointer comparison is not practical since many functions return
+different instances of <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> that refers to the same part of the
+TypeLib; use this function instead to do <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> comparisons.</p>
+
+<table>
+<tr>
+<td><p>info2 :</p></td>
+<td><p>a <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if and only if @info1 equals @info2.</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_attribute.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_attribute.page
index 4a98a952..caab8b8b 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_attribute.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_attribute.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.BaseInfo.get_attribute"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="GIRepository.BaseInfo" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gchar*</api:type>
+ </api:returns>
+ <api:name>g_base_info_get_attribute</api:name>
+ <api:arg>
+ <api:type>gchar*</api:type>
+ <api:name>name</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_base_info_get_attribute</title>
-<p>Retrieve an arbitrary attribute associated with this node.</p></page>
+<synopsis><code mime="text/x-csrc">
+gchar* g_base_info_get_attribute (gchar* name);
+</code></synopsis>
+<p>Retrieve an arbitrary attribute associated with this node.</p>
+
+<table>
+<tr>
+<td><p>name :</p></td>
+<td><p>a freeform string naming an attribute</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>The value of the attribute, or %NULL if no such attribute exists</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_container.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_container.page
index 71a8d55e..89acaa6c 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_container.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_container.page
@@ -1,13 +1,32 @@
<?xml version="1.0"?>
+
<page id="GIRepository.BaseInfo.get_container"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="GIRepository.BaseInfo" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIBaseInfo*</api:type>
+ </api:returns>
+ <api:name>g_base_info_get_container</api:name>
+ </api:function>
</info>
<title>g_base_info_get_container</title>
+<synopsis><code mime="text/x-csrc">
+GIBaseInfo* g_base_info_get_container (void);
+</code></synopsis>
<p>Obtain the container of the @info. The container is the parent
-GIBaseInfo. For instance, the parent of a <link xref="GIFunctionInfo">GIFunctionInfo</link> is an
-<link xref="GIObjectInfo">GIObjectInfo</link> or <link xref="GIInterfaceInfo">GIInterfaceInfo</link>.</p></page>
+GIBaseInfo. For instance, the parent of a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> is an
+<link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link> or <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link>.</p>
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the container</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_name.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_name.page
index d4c1286b..09675891 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_name.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_name.page
@@ -1,13 +1,32 @@
<?xml version="1.0"?>
+
<page id="GIRepository.BaseInfo.get_name"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="GIRepository.BaseInfo" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gchar*</api:type>
+ </api:returns>
+ <api:name>g_base_info_get_name</api:name>
+ </api:function>
</info>
<title>g_base_info_get_name</title>
+<synopsis><code mime="text/x-csrc">
+gchar* g_base_info_get_name (void);
+</code></synopsis>
<p>Obtain the name of the @info. What the name represents depends on
-the <link xref="GIInfoType">GIInfoType</link> of the @info. For instance for <link xref="GIFunctionInfo">GIFunctionInfo</link> it is
-the name of the function.</p></page>
+the <link xref="GIRepository.InfoType">GIRepository.InfoType</link> of the @info. For instance for <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> it is
+the name of the function.</p>
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the name of @info or %NULL if it lacks a name.</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_namespace.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_namespace.page
index 1cdeb07f..352c66e2 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_namespace.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_namespace.page
@@ -1,11 +1,30 @@
<?xml version="1.0"?>
+
<page id="GIRepository.BaseInfo.get_namespace"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="GIRepository.BaseInfo" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gchar*</api:type>
+ </api:returns>
+ <api:name>g_base_info_get_namespace</api:name>
+ </api:function>
</info>
<title>g_base_info_get_namespace</title>
-<p>Obtain the namespace of @info.</p></page>
+<synopsis><code mime="text/x-csrc">
+gchar* g_base_info_get_namespace (void);
+</code></synopsis>
+<p>Obtain the namespace of @info.</p>
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the namespace</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_typelib.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_typelib.page
index e9ada1f8..6c904dc1 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_typelib.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_typelib.page
@@ -1,11 +1,30 @@
<?xml version="1.0"?>
+
<page id="GIRepository.BaseInfo.get_typelib"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="GIRepository.BaseInfo" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GITypelib*</api:type>
+ </api:returns>
+ <api:name>g_base_info_get_typelib</api:name>
+ </api:function>
</info>
<title>g_base_info_get_typelib</title>
-<p>Obtain the typelib this @info belongs to</p></page>
+<synopsis><code mime="text/x-csrc">
+GITypelib* g_base_info_get_typelib (void);
+</code></synopsis>
+<p>Obtain the typelib this @info belongs to</p>
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the typelib.</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.is_deprecated.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.is_deprecated.page
index c8206c49..0cd6ff0f 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.is_deprecated.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.is_deprecated.page
@@ -1,12 +1,31 @@
<?xml version="1.0"?>
+
<page id="GIRepository.BaseInfo.is_deprecated"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="GIRepository.BaseInfo" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gboolean</api:type>
+ </api:returns>
+ <api:name>g_base_info_is_deprecated</api:name>
+ </api:function>
</info>
<title>g_base_info_is_deprecated</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_base_info_is_deprecated (void);
+</code></synopsis>
<p>Obtain whether the @info is represents a metadata which is
-deprecated or not.</p></page>
+deprecated or not.</p>
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if deprecated</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.iterate_attributes.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.iterate_attributes.page
index 82ef15f0..76c6766b 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.iterate_attributes.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.iterate_attributes.page
@@ -1,13 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.BaseInfo.iterate_attributes"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="GIRepository.BaseInfo" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gboolean</api:type>
+ </api:returns>
+ <api:name>g_base_info_iterate_attributes</api:name>
+ <api:arg>
+ <api:type>GIAttributeIter*</api:type>
+ <api:name>iterator</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>char**</api:type>
+ <api:name>name</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>char**</api:type>
+ <api:name>value</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_base_info_iterate_attributes</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_base_info_iterate_attributes (GIAttributeIter* iterator,
+ char** name,
+ char** value);
+</code></synopsis>
<p>Iterate over all attributes associated with this node. The iterator
structure is typically stack allocated, and must have its first
member initialized to %NULL.</p><p>Both the @name and @value should be treated as constants
@@ -26,4 +51,24 @@ g_print ("attribute name: %s value: %s", name, value);
}
}
&lt;/programlisting&gt;
-&lt;/example&gt;</p></page>
+&lt;/example&gt;</p>
+
+<table>
+<tr>
+<td><p>iterator :</p></td>
+<td><p>a <link xref="GIRepository.AttributeIter">GIRepository.AttributeIter</link> structure, must be initialized; see below</p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>Returned name, must not be freed</p></td>
+</tr>
+<tr>
+<td><p>value :</p></td>
+<td><p>Returned name, must not be freed</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if there are more attributes</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.page
index 1e29c309..87dd1ae2 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.page
@@ -9,16 +9,16 @@
</info>
<title>GIRepositoryBaseInfo</title>
<p>GIBaseInfo is the common base struct of all other *Info structs
-accessible through the <link xref="GIRepository">GIRepository</link> API.
-All other structs can be casted to a <link xref="GIBaseInfo">GIBaseInfo</link>, for instance:
+accessible through the <link xref="GIRepository.Repository">GIRepository.Repository</link> API.
+All other structs can be casted to a <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link>, for instance:
&lt;example&gt;
-&lt;title&gt;Casting a <link xref="GIFunctionInfo">GIFunctionInfo</link> to <link xref="GIBaseInfo">GIBaseInfo</link>&lt;/title&gt;
+&lt;title&gt;Casting a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> to <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link>&lt;/title&gt;
&lt;programlisting&gt;
GIFunctionInfo *function_info = ...;
GIBaseInfo *info = (GIBaseInfo*)function_info;
&lt;/programlisting&gt;
&lt;/example&gt;
-Most <link xref="GIRepository">GIRepository</link> APIs returning a <link xref="GIBaseInfo">GIBaseInfo</link> is actually creating a new struct, in other
+Most <link xref="GIRepository.Repository">GIRepository.Repository</link> APIs returning a <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> is actually creating a new struct, in other
words, g_base_info_unref() has to be called when done accessing the data.
GIBaseInfos are normally accessed by calling either
g_irepository_find_by_name(), g_irepository_find_by_gtype() or g_irepository_get_info().</p><p>&lt;example&gt;
@@ -40,4 +40,5 @@ GIBaseInfo
+----&lt;link linkend="gi-GIRegisteredTypeInfo"&gt;GIRegisteredTypeInfo&lt;/link&gt;
+----&lt;link linkend="gi-GITypeInfo"&gt;GITypeInfo&lt;/link&gt;
&lt;/synopsis&gt;
-&lt;/refsect1&gt;</p></page>
+&lt;/refsect1&gt;</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.ref.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.ref.page
index b25dabb8..307b6225 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.ref.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.ref.page
@@ -1,11 +1,30 @@
<?xml version="1.0"?>
+
<page id="GIRepository.BaseInfo.ref"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="GIRepository.BaseInfo" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIBaseInfo*</api:type>
+ </api:returns>
+ <api:name>g_base_info_ref</api:name>
+ </api:function>
</info>
<title>g_base_info_ref</title>
-<p>Increases the reference count of @info.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIBaseInfo* g_base_info_ref (void);
+</code></synopsis>
+<p>Increases the reference count of @info.</p>
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the same @info.</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.unref.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.unref.page
index 9402169d..9a14d4ee 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.unref.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.unref.page
@@ -1,12 +1,31 @@
<?xml version="1.0"?>
+
<page id="GIRepository.BaseInfo.unref"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="GIRepository.BaseInfo" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>void</api:type>
+ </api:returns>
+ <api:name>g_base_info_unref</api:name>
+ </api:function>
</info>
<title>g_base_info_unref</title>
+<synopsis><code mime="text/x-csrc">
+void g_base_info_unref (void);
+</code></synopsis>
<p>Decreases the reference count of @info. When its reference count
-drops to 0, the info is freed.</p></page>
+drops to 0, the info is freed.</p>
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.CallableInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.CallableInfo.page
index 5f1b5973..ab20f816 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.CallableInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.CallableInfo.page
@@ -6,6 +6,7 @@
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
</info>
- <title>GIRepositoryCallableInfo</title>
-<p>Represents a callable, either <link xref="GIFunctionInfo">GIFunctionInfo</link>, <link xref="GICallbackInfo">GICallbackInfo</link> or
-<link xref="GIVFuncInfo">GIVFuncInfo</link>.</p></page>
+ <title>GIRepository.CallableInfo</title>
+<p>Represents a callable, either <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>, <link xref="GIRepository.CallbackInfo">GIRepository.CallbackInfo</link> or
+<link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link>.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.CallbackInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.CallbackInfo.page
index f04546f9..e5a71709 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.CallbackInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.CallbackInfo.page
@@ -6,5 +6,6 @@
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
</info>
- <title>GIRepositoryCallbackInfo</title>
-<p>Represents a callback, eg arguments and return value.</p></page>
+ <title>GIRepository.CallbackInfo</title>
+<p>Represents a callback, eg arguments and return value.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ConstantInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ConstantInfo.page
index af0ea673..4ed05edb 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ConstantInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ConstantInfo.page
@@ -6,5 +6,6 @@
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
</info>
- <title>GIRepositoryConstantInfo</title>
-<p>Represents a constant.</p></page>
+ <title>GIRepository.ConstantInfo</title>
+<p>Represents a constant.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Direction.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Direction.page
index b4eb5f3f..6378b774 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Direction.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Direction.page
@@ -1,10 +1,12 @@
<?xml version="1.0"?>
<page id="GIRepository.Direction"
- type="topic"
- style=""
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
+ <link type="guide" xref="index"/>
</info>
- <title>GIRepositoryDirection</title>
-<p>The direction of a <link xref="GIArgInfo">GIArgInfo</link>.</p></page>
+ <title>GIRepository.Direction</title>
+<p>The direction of a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link>.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.EnumInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.EnumInfo.page
index 73da91d7..eebac1b0 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.EnumInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.EnumInfo.page
@@ -6,5 +6,6 @@
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
</info>
- <title>GIRepositoryEnumInfo</title>
-<p>Represents an enum or a flag.</p></page>
+ <title>GIRepository.EnumInfo</title>
+<p>Represents an enum or a flag.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FieldInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FieldInfo.page
index d9a813d8..0e90ebad 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FieldInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FieldInfo.page
@@ -6,5 +6,6 @@
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
</info>
- <title>GIRepositoryFieldInfo</title>
-<p>Represents a field of a <link xref="GIStructInfo">GIStructInfo</link> or a <link xref="GIUnionInfo">GIUnionInfo</link>.</p></page>
+ <title>GIRepository.FieldInfo</title>
+<p>Represents a field of a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link> or a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link>.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FieldInfoFlags.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FieldInfoFlags.page
index 28166d74..87df966c 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FieldInfoFlags.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FieldInfoFlags.page
@@ -6,5 +6,6 @@
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
</info>
- <title>GIRepositoryFieldInfoFlags</title>
-<p>Flags for a <link xref="GIFieldInfo">GIFieldInfo</link>.</p></page>
+ <title>GIRepository.FieldInfoFlags</title>
+<p>Flags for a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link>.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FunctionInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FunctionInfo.page
index 8d45f6e4..d0b0f457 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FunctionInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FunctionInfo.page
@@ -6,5 +6,6 @@
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
</info>
- <title>GIRepositoryFunctionInfo</title>
-<p>Represents a function, eg arguments and return value.</p></page>
+ <title>GIRepository.FunctionInfo</title>
+<p>Represents a function, eg arguments and return value.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FunctionInfoFlags.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FunctionInfoFlags.page
index b19947d4..962e3ffa 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FunctionInfoFlags.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FunctionInfoFlags.page
@@ -6,5 +6,6 @@
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
</info>
- <title>GIRepositoryFunctionInfoFlags</title>
-<p>Flags for a <link xref="GIFunctionInfo">GIFunctionInfo</link> struct.</p></page>
+ <title>GIRepository.FunctionInfoFlags</title>
+<p>Flags for a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> struct.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.InfoType.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.InfoType.page
index d37bac04..f447a0f8 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.InfoType.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.InfoType.page
@@ -1,10 +1,12 @@
<?xml version="1.0"?>
<page id="GIRepository.InfoType"
- type="topic"
- style=""
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
+ <link type="guide" xref="index"/>
</info>
- <title>GIRepositoryInfoType</title>
-<p>The type of a GIBaseInfo struct.</p></page>
+ <title>GIRepository.InfoType</title>
+<p>The type of a GIBaseInfo struct.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.InterfaceInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.InterfaceInfo.page
index 3623797a..27ebf8f8 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.InterfaceInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.InterfaceInfo.page
@@ -6,5 +6,6 @@
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
</info>
- <title>GIRepositoryInterfaceInfo</title>
-<p>Represents an interface.</p></page>
+ <title>GIRepository.InterfaceInfo</title>
+<p>Represents an interface.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfo.page
index 09428320..fd74384c 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfo.page
@@ -6,5 +6,6 @@
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
</info>
- <title>GIRepositoryObjectInfo</title>
-<p>Represents an object.</p></page>
+ <title>GIRepository.ObjectInfo</title>
+<p>Represents an object.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoGetValueFunction.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoGetValueFunction.page
index 61c9ea8e..a8a86392 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoGetValueFunction.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoGetValueFunction.page
@@ -6,5 +6,6 @@
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
</info>
- <title>GIRepositoryObjectInfoGetValueFunction</title>
-<p>Extract an object instance out of @value</p></page>
+ <title>GIRepository.ObjectInfoGetValueFunction</title>
+<p>Extract an object instance out of @value</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoRefFunction.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoRefFunction.page
index 1fd55579..12b8b52a 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoRefFunction.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoRefFunction.page
@@ -6,5 +6,6 @@
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
</info>
- <title>GIRepositoryObjectInfoRefFunction</title>
-<p>Increases the reference count of an object instance.</p></page>
+ <title>GIRepository.ObjectInfoRefFunction</title>
+<p>Increases the reference count of an object instance.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoSetValueFunction.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoSetValueFunction.page
index 4ad842f1..3d5c677d 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoSetValueFunction.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoSetValueFunction.page
@@ -6,5 +6,6 @@
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
</info>
- <title>GIRepositoryObjectInfoSetValueFunction</title>
-<p>Update @value and attach the object instance pointer @object to it.</p></page>
+ <title>GIRepository.ObjectInfoSetValueFunction</title>
+<p>Update @value and attach the object instance pointer @object to it.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoUnrefFunction.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoUnrefFunction.page
index d52002b3..11120095 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoUnrefFunction.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoUnrefFunction.page
@@ -6,5 +6,6 @@
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
</info>
- <title>GIRepositoryObjectInfoUnrefFunction</title>
-<p>Decreases the reference count of an object instance.</p></page>
+ <title>GIRepository.ObjectInfoUnrefFunction</title>
+<p>Decreases the reference count of an object instance.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.PropertyInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.PropertyInfo.page
index d24aea5d..4d383595 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.PropertyInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.PropertyInfo.page
@@ -6,5 +6,6 @@
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
</info>
- <title>GIRepositoryPropertyInfo</title>
-<p>Represents a property of a <link xref="GIObjectInfo">GIObjectInfo</link> or a <link xref="GIInterfaceInfo">GIInterfaceInfo</link>.</p></page>
+ <title>GIRepository.PropertyInfo</title>
+<p>Represents a property of a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link> or a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link>.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RegisteredTypeInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RegisteredTypeInfo.page
index 14de0329..d98e976c 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RegisteredTypeInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RegisteredTypeInfo.page
@@ -6,5 +6,6 @@
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
</info>
- <title>GIRepositoryRegisteredTypeInfo</title>
-<p>Represent a registered type.</p></page>
+ <title>GIRepository.RegisteredTypeInfo</title>
+<p>Represent a registered type.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.dump.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.dump.page
new file mode 100644
index 00000000..7d674d25
--- /dev/null
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.dump.page
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+
+<page id="GIRepository.Repository.dump"
+ type="topic"
+ style="function"
+ xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
+ xmlns:ui="http://projectmallard.org/experimental/ui/">
+ <info>
+ <link type="guide" xref="GIRepository.Repository" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gboolean</api:type>
+ </api:returns>
+ <api:name>g_irepository_dump</api:name>
+ <api:arg>
+ <api:type>char*</api:type>
+ <api:name>arg</api:name>
+ </api:arg>
+ </api:function>
+ </info>
+ <title>g_irepository_dump</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_irepository_dump (char* arg);
+</code></synopsis>
+
+
+<table>
+<tr>
+<td><p>arg :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.enumerate_versions.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.enumerate_versions.page
index c54c2174..32354748 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.enumerate_versions.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.enumerate_versions.page
@@ -1,12 +1,44 @@
<?xml version="1.0"?>
+
<page id="GIRepository.Repository.enumerate_versions"
type="topic"
style="method"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="GIRepository.Repository" group="method"/>
+ <api:function>
+ <api:returns>
+ <api:type>GList*</api:type>
+ </api:returns>
+ <api:name>g_irepository_enumerate_versions</api:name>
+ <api:arg>
+ <api:type>GIRepository *</api:type>
+ <api:name>self</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gchar*</api:type>
+ <api:name>namespace_</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_irepository_enumerate_versions</title>
+<synopsis><code mime="text/x-csrc">
+GList* g_irepository_enumerate_versions (GIRepository *self,
+gchar* namespace_);
+</code></synopsis>
<p>Obtain an unordered list of versions (either currently loaded or
-available) for @namespace_ in this @repository.</p></page>
+available) for @namespace_ in this @repository.</p>
+
+<table>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>GI namespace, e.g. "Gtk"</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the array of versions.</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.error_quark.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.error_quark.page
new file mode 100644
index 00000000..b9534309
--- /dev/null
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.error_quark.page
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+
+<page id="GIRepository.Repository.error_quark"
+ type="topic"
+ style="function"
+ xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
+ xmlns:ui="http://projectmallard.org/experimental/ui/">
+ <info>
+ <link type="guide" xref="GIRepository.Repository" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GQuark</api:type>
+ </api:returns>
+ <api:name>g_irepository_error_quark</api:name>
+ </api:function>
+ </info>
+ <title>g_irepository_error_quark</title>
+<synopsis><code mime="text/x-csrc">
+GQuark g_irepository_error_quark (void);
+</code></synopsis>
+
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_error_domain.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_error_domain.page
index d2e40825..56f3b93e 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_error_domain.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_error_domain.page
@@ -1,14 +1,47 @@
<?xml version="1.0"?>
+
<page id="GIRepository.Repository.find_by_error_domain"
type="topic"
style="method"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="GIRepository.Repository" group="method"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIEnumInfo*</api:type>
+ </api:returns>
+ <api:name>g_irepository_find_by_error_domain</api:name>
+ <api:arg>
+ <api:type>GIRepository *</api:type>
+ <api:name>self</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>GQuark</api:type>
+ <api:name>domain</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_irepository_find_by_error_domain</title>
+<synopsis><code mime="text/x-csrc">
+GIEnumInfo* g_irepository_find_by_error_domain (GIRepository *self,
+GQuark domain);
+</code></synopsis>
<p>Searches for the enum type corresponding to the given <link xref="GError">GError</link>
domain. Before calling this function for a particular namespace,
you must call g_irepository_require() once to load the namespace, or
-otherwise ensure the namespace has already been loaded.</p><p>enum type, or %NULL</p></page>
+otherwise ensure the namespace has already been loaded.</p><p>enum type, or %NULL</p>
+
+<table>
+<tr>
+<td><p>domain :</p></td>
+<td><p>a <link xref="GError">GError</link> domain</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p><link xref="GIRepository.EnumInfo">GIRepository.EnumInfo</link> representing metadata about @domain's</p></td>
+</tr>
+</table>
+<p>Since 1.29.17</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_gtype.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_gtype.page
index 26775036..07e562c4 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_gtype.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_gtype.page
@@ -1,16 +1,48 @@
<?xml version="1.0"?>
+
<page id="GIRepository.Repository.find_by_gtype"
type="topic"
style="method"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="GIRepository.Repository" group="method"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIBaseInfo*</api:type>
+ </api:returns>
+ <api:name>g_irepository_find_by_gtype</api:name>
+ <api:arg>
+ <api:type>GIRepository *</api:type>
+ <api:name>self</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>GType</api:type>
+ <api:name>gtype</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_irepository_find_by_gtype</title>
+<synopsis><code mime="text/x-csrc">
+GIBaseInfo* g_irepository_find_by_gtype (GIRepository *self,
+GType gtype);
+</code></synopsis>
<p>Searches all loaded namespaces for a particular <link xref="GType">GType</link>. Note that
in order to locate the metadata, the namespace corresponding to
the type must first have been loaded. There is currently no
mechanism for determining the namespace which corresponds to an
arbitrary GType - thus, this function will operate most reliably
-when you know the GType to originate from be from a loaded namespace.</p></page>
+when you know the GType to originate from be from a loaded namespace.</p>
+
+<table>
+<tr>
+<td><p>gtype :</p></td>
+<td><p>GType to search for</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p><link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> representing metadata about @type, or %NULL</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_name.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_name.page
index 7eada692..39fe665e 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_name.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_name.page
@@ -1,14 +1,55 @@
<?xml version="1.0"?>
+
<page id="GIRepository.Repository.find_by_name"
type="topic"
style="method"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="GIRepository.Repository" group="method"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIBaseInfo*</api:type>
+ </api:returns>
+ <api:name>g_irepository_find_by_name</api:name>
+ <api:arg>
+ <api:type>GIRepository *</api:type>
+ <api:name>self</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gchar*</api:type>
+ <api:name>namespace_</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gchar*</api:type>
+ <api:name>name</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_irepository_find_by_name</title>
+<synopsis><code mime="text/x-csrc">
+GIBaseInfo* g_irepository_find_by_name (GIRepository *self,
+gchar* namespace_,
+ gchar* name);
+</code></synopsis>
<p>Searches for a particular entry in a namespace. Before calling
this function for a particular namespace, you must call
g_irepository_require() once to load the namespace, or otherwise
-ensure the namespace has already been loaded.</p></page>
+ensure the namespace has already been loaded.</p>
+
+<table>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>Namespace which will be searched</p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>Entry name to find</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p><link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> representing metadata about @name, or %NULL</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_c_prefix.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_c_prefix.page
index e23faa9d..4c7147be 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_c_prefix.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_c_prefix.page
@@ -1,14 +1,46 @@
<?xml version="1.0"?>
+
<page id="GIRepository.Repository.get_c_prefix"
type="topic"
style="method"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="GIRepository.Repository" group="method"/>
+ <api:function>
+ <api:returns>
+ <api:type>gchar*</api:type>
+ </api:returns>
+ <api:name>g_irepository_get_c_prefix</api:name>
+ <api:arg>
+ <api:type>GIRepository *</api:type>
+ <api:name>self</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gchar*</api:type>
+ <api:name>namespace_</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_irepository_get_c_prefix</title>
+<synopsis><code mime="text/x-csrc">
+gchar* g_irepository_get_c_prefix (GIRepository *self,
+gchar* namespace_);
+</code></synopsis>
<p>This function returns the "C prefix", or the C level namespace
associated with the given introspection namespace. Each C symbol
starts with this prefix, as well each <link xref="GType">GType</link> in the library.</p><p>Note: The namespace must have already been loaded using a function
-such as g_irepository_require() before calling this function.</p></page>
+such as g_irepository_require() before calling this function.</p>
+
+<table>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>Namespace to inspect</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>C namespace prefix, or %NULL if none associated</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_default.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_default.page
new file mode 100644
index 00000000..07cee8c8
--- /dev/null
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_default.page
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+
+<page id="GIRepository.Repository.get_default"
+ type="topic"
+ style="function"
+ xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
+ xmlns:ui="http://projectmallard.org/experimental/ui/">
+ <info>
+ <link type="guide" xref="GIRepository.Repository" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIRepository*</api:type>
+ </api:returns>
+ <api:name>g_irepository_get_default</api:name>
+ </api:function>
+ </info>
+ <title>g_irepository_get_default</title>
+<synopsis><code mime="text/x-csrc">
+GIRepository* g_irepository_get_default (void);
+</code></synopsis>
+<p>Returns the singleton process-global default <link xref="GIRepository.Repository">GIRepository.Repository</link>. It is
+not currently supported to have multiple repositories in a
+particular process, but this function is provided in the unlikely
+eventuality that it would become possible, and as a convenience for
+higher level language bindings to conform to the GObject method
+call conventions.
+All methods on <link xref="GIRepository.Repository">GIRepository.Repository</link> also accept %NULL as an instance
+parameter to mean this default repository, which is usually more
+convenient for C.</p>
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>The global singleton <link xref="GIRepository.Repository">GIRepository.Repository</link></p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_dependencies.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_dependencies.page
index f88f13c9..69eab53a 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_dependencies.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_dependencies.page
@@ -1,14 +1,46 @@
<?xml version="1.0"?>
+
<page id="GIRepository.Repository.get_dependencies"
type="topic"
style="method"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="GIRepository.Repository" group="method"/>
+ <api:function>
+ <api:returns>
+ <api:type>utf8*</api:type>
+ </api:returns>
+ <api:name>g_irepository_get_dependencies</api:name>
+ <api:arg>
+ <api:type>GIRepository *</api:type>
+ <api:name>self</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gchar*</api:type>
+ <api:name>namespace_</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_irepository_get_dependencies</title>
+<synopsis><code mime="text/x-csrc">
+gchar** g_irepository_get_dependencies (GIRepository *self,
+gchar* namespace_);
+</code></synopsis>
<p>Return an array of all (transitive) dependencies for namespace
@namespace_, including version. The returned strings are of the
form &lt;code&gt;namespace-version&lt;/code&gt;.</p><p>Note: The namespace must have already been loaded using a function
-such as g_irepository_require() before calling this function.</p></page>
+such as g_irepository_require() before calling this function.</p>
+
+<table>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>Namespace of interest</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>Zero-terminated string array of versioned dependencies</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_info.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_info.page
index fbfb4eda..05beefe8 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_info.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_info.page
@@ -1,15 +1,56 @@
<?xml version="1.0"?>
+
<page id="GIRepository.Repository.get_info"
type="topic"
style="method"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="GIRepository.Repository" group="method"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIBaseInfo*</api:type>
+ </api:returns>
+ <api:name>g_irepository_get_info</api:name>
+ <api:arg>
+ <api:type>GIRepository *</api:type>
+ <api:name>self</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gchar*</api:type>
+ <api:name>namespace_</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gint</api:type>
+ <api:name>index</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_irepository_get_info</title>
+<synopsis><code mime="text/x-csrc">
+GIBaseInfo* g_irepository_get_info (GIRepository *self,
+gchar* namespace_,
+ gint index);
+</code></synopsis>
<p>This function returns a particular metadata entry in the
given namespace @namespace_. The namespace must have
already been loaded before calling this function.
See g_irepository_get_n_infos() to find the maximum number of
-entries.</p></page>
+entries.</p>
+
+<table>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>Namespace to inspect</p></td>
+</tr>
+<tr>
+<td><p>index :</p></td>
+<td><p>0-based offset into namespace metadata for entry</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p><link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> containing metadata</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_loaded_namespaces.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_loaded_namespaces.page
index c206e892..1c42c7dc 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_loaded_namespaces.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_loaded_namespaces.page
@@ -1,11 +1,34 @@
<?xml version="1.0"?>
+
<page id="GIRepository.Repository.get_loaded_namespaces"
type="topic"
style="method"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="GIRepository.Repository" group="method"/>
+ <api:function>
+ <api:returns>
+ <api:type>utf8*</api:type>
+ </api:returns>
+ <api:name>g_irepository_get_loaded_namespaces</api:name>
+ <api:arg>
+ <api:type>GIRepository *</api:type>
+ <api:name>self</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_irepository_get_loaded_namespaces</title>
-<p>Return the list of currently loaded namespaces.</p></page>
+<synopsis><code mime="text/x-csrc">
+gchar** g_irepository_get_loaded_namespaces (GIRepository *self);
+</code></synopsis>
+<p>Return the list of currently loaded namespaces.</p>
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>List of namespaces</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_n_infos.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_n_infos.page
index dc1f6a42..c9a4ca67 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_n_infos.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_n_infos.page
@@ -1,13 +1,45 @@
<?xml version="1.0"?>
+
<page id="GIRepository.Repository.get_n_infos"
type="topic"
style="method"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="GIRepository.Repository" group="method"/>
+ <api:function>
+ <api:returns>
+ <api:type>gint</api:type>
+ </api:returns>
+ <api:name>g_irepository_get_n_infos</api:name>
+ <api:arg>
+ <api:type>GIRepository *</api:type>
+ <api:name>self</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gchar*</api:type>
+ <api:name>namespace_</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_irepository_get_n_infos</title>
+<synopsis><code mime="text/x-csrc">
+gint g_irepository_get_n_infos (GIRepository *self,
+gchar* namespace_);
+</code></synopsis>
<p>This function returns the number of metadata entries in
given namespace @namespace_. The namespace must have
-already been loaded before calling this function.</p></page>
+already been loaded before calling this function.</p>
+
+<table>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>Namespace to inspect</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of metadata entries</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_option_group.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_option_group.page
new file mode 100644
index 00000000..e3fac668
--- /dev/null
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_option_group.page
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+
+<page id="GIRepository.Repository.get_option_group"
+ type="topic"
+ style="function"
+ xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
+ xmlns:ui="http://projectmallard.org/experimental/ui/">
+ <info>
+ <link type="guide" xref="GIRepository.Repository" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GOptionGroup*</api:type>
+ </api:returns>
+ <api:name>g_irepository_get_option_group</api:name>
+ </api:function>
+ </info>
+ <title>g_irepository_get_option_group</title>
+<synopsis><code mime="text/x-csrc">
+GOptionGroup* g_irepository_get_option_group (void);
+</code></synopsis>
+<p>Obtain the option group for girepository, it's used
+by the dumper and for programs that wants to provide
+introspection information</p>
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the option group</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_search_path.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_search_path.page
new file mode 100644
index 00000000..6d3785fa
--- /dev/null
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_search_path.page
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+
+<page id="GIRepository.Repository.get_search_path"
+ type="topic"
+ style="function"
+ xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
+ xmlns:ui="http://projectmallard.org/experimental/ui/">
+ <info>
+ <link type="guide" xref="GIRepository.Repository" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GSList*</api:type>
+ </api:returns>
+ <api:name>g_irepository_get_search_path</api:name>
+ </api:function>
+ </info>
+ <title>g_irepository_get_search_path</title>
+<synopsis><code mime="text/x-csrc">
+GSList* g_irepository_get_search_path (void);
+</code></synopsis>
+<p>Returns the search path the GIRepository will use when looking for typelibs.
+The string is internal to GIRespository and should not be freed, nor should
+the elements.</p>
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>list of strings</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_shared_library.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_shared_library.page
index 4ae1a365..203441ab 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_shared_library.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_shared_library.page
@@ -1,15 +1,47 @@
<?xml version="1.0"?>
+
<page id="GIRepository.Repository.get_shared_library"
type="topic"
style="method"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="GIRepository.Repository" group="method"/>
+ <api:function>
+ <api:returns>
+ <api:type>gchar*</api:type>
+ </api:returns>
+ <api:name>g_irepository_get_shared_library</api:name>
+ <api:arg>
+ <api:type>GIRepository *</api:type>
+ <api:name>self</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gchar*</api:type>
+ <api:name>namespace_</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_irepository_get_shared_library</title>
+<synopsis><code mime="text/x-csrc">
+gchar* g_irepository_get_shared_library (GIRepository *self,
+gchar* namespace_);
+</code></synopsis>
<p>This function returns the full path to the shared C library
associated with the given namespace @namespace_. There may be no
shared library path associated, in which case this function will
return %NULL.</p><p>Note: The namespace must have already been loaded using a function
-such as g_irepository_require() before calling this function.</p></page>
+such as g_irepository_require() before calling this function.</p>
+
+<table>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>Namespace to inspect</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>Full path to shared library, or %NULL if none associated</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_typelib_path.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_typelib_path.page
index ad702fe9..ad6046c6 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_typelib_path.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_typelib_path.page
@@ -1,14 +1,46 @@
<?xml version="1.0"?>
+
<page id="GIRepository.Repository.get_typelib_path"
type="topic"
style="method"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="GIRepository.Repository" group="method"/>
+ <api:function>
+ <api:returns>
+ <api:type>gchar*</api:type>
+ </api:returns>
+ <api:name>g_irepository_get_typelib_path</api:name>
+ <api:arg>
+ <api:type>GIRepository *</api:type>
+ <api:name>self</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gchar*</api:type>
+ <api:name>namespace_</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_irepository_get_typelib_path</title>
+<synopsis><code mime="text/x-csrc">
+gchar* g_irepository_get_typelib_path (GIRepository *self,
+gchar* namespace_);
+</code></synopsis>
<p>If namespace @namespace_ is loaded, return the full path to the
.typelib file it was loaded from. If the typelib for
namespace @namespace_ was included in a shared library, return
-the special string "$lt;builtin$gt;".</p></page>
+the special string "$lt;builtin$gt;".</p>
+
+<table>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>GI namespace to use, e.g. "Gtk"</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>Filesystem path (or $lt;builtin$gt;) if successful, %NULL if namespace is not loaded</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_version.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_version.page
index 860bc08d..a7cc98dd 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_version.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_version.page
@@ -1,13 +1,45 @@
<?xml version="1.0"?>
+
<page id="GIRepository.Repository.get_version"
type="topic"
style="method"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="GIRepository.Repository" group="method"/>
+ <api:function>
+ <api:returns>
+ <api:type>gchar*</api:type>
+ </api:returns>
+ <api:name>g_irepository_get_version</api:name>
+ <api:arg>
+ <api:type>GIRepository *</api:type>
+ <api:name>self</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gchar*</api:type>
+ <api:name>namespace_</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_irepository_get_version</title>
+<synopsis><code mime="text/x-csrc">
+gchar* g_irepository_get_version (GIRepository *self,
+gchar* namespace_);
+</code></synopsis>
<p>This function returns the loaded version associated with the given
namespace @namespace_.</p><p>Note: The namespace must have already been loaded using a function
-such as g_irepository_require() before calling this function.</p></page>
+such as g_irepository_require() before calling this function.</p>
+
+<table>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>Namespace to inspect</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>Loaded version</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.is_registered.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.is_registered.page
index 95f2b4dc..a659800d 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.is_registered.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.is_registered.page
@@ -1,16 +1,57 @@
<?xml version="1.0"?>
+
<page id="GIRepository.Repository.is_registered"
type="topic"
style="method"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="GIRepository.Repository" group="method"/>
+ <api:function>
+ <api:returns>
+ <api:type>gboolean</api:type>
+ </api:returns>
+ <api:name>g_irepository_is_registered</api:name>
+ <api:arg>
+ <api:type>GIRepository *</api:type>
+ <api:name>self</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gchar*</api:type>
+ <api:name>namespace_</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gchar*</api:type>
+ <api:name>version</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_irepository_is_registered</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_irepository_is_registered (GIRepository *self,
+gchar* namespace_,
+ gchar* version);
+</code></synopsis>
<p>Check whether a particular namespace (and optionally, a specific
version thereof) is currently loaded. This function is likely to
only be useful in unusual circumstances; in order to act upon
metadata in the namespace, you should call g_irepository_require()
instead which will ensure the namespace is loaded, and return as
-quickly as this function will if it has already been loaded.</p></page>
+quickly as this function will if it has already been loaded.</p>
+
+<table>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>Namespace of interest</p></td>
+</tr>
+<tr>
+<td><p>version :</p></td>
+<td><p>Required version, may be %NULL for latest</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if namespace-version is loaded, %FALSE otherwise</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.load_typelib.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.load_typelib.page
index d5bdf264..6219a878 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.load_typelib.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.load_typelib.page
@@ -1,11 +1,52 @@
<?xml version="1.0"?>
+
<page id="GIRepository.Repository.load_typelib"
type="topic"
style="method"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="GIRepository.Repository" group="method"/>
+ <api:function>
+ <api:returns>
+ <api:type>char*</api:type>
+ </api:returns>
+ <api:name>g_irepository_load_typelib</api:name>
+ <api:arg>
+ <api:type>GIRepository *</api:type>
+ <api:name>self</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>GITypelib*</api:type>
+ <api:name>typelib</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>GIRepositoryLoadFlags</api:type>
+ <api:name>flags</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_irepository_load_typelib</title>
+<synopsis><code mime="text/x-csrc">
+char* g_irepository_load_typelib (GIRepository *self,
+GITypelib* typelib,
+ GIRepositoryLoadFlags flags);
+</code></synopsis>
+
+
+<table>
+<tr>
+<td><p>typelib :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>flags :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.page
index 24e0f0b3..456c1c09 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.page
@@ -3,11 +3,13 @@
type="guide"
style="class"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="class"/>
</info>
- <title>GIRepositoryRepository</title>
+ <title>GIRepository</title>
+
<synopsis ui:expanded="no">
<title>Hierarchy</title>
<tree>
@@ -16,19 +18,28 @@
</item>
</tree>
</synopsis>
- <links type="topic" ui:expanded="yes" groups="constructor">
+ <links type="topic" ui:expanded="yes"
+ api:type="function" api:mime="text/x-csrc"
+ groups="constructor" style="linklist">
<title>Constructors</title>
</links>
- <links type="topic" ui:expanded="yes" groups="method">
+ <links type="topic" ui:expanded="yes"
+ api:type="function" api:mime="text/x-csrc"
+ groups="method" style="linklist">
<title>Methods</title>
</links>
- <links type="topic" ui:expanded="yes" groups="property">
+ <links type="topic" ui:expanded="yes"
+ api:type="function" api:mime="text/x-csrc"
+ groups="function" style="linklist">
+ <title>Functions</title>
+ </links>
+ <links type="topic" ui:expanded="yes" groups="property" style="linklist">
<title>Properties</title>
</links>
- <links type="topic" ui:expanded="yes" groups="signal">
+ <links type="topic" ui:expanded="yes" groups="signal" style="linklist">
<title>Signals</title>
</links>
- <links type="topic" ui:expanded="yes" groups="#first #default #last">
+ <links type="topic" ui:expanded="yes" groups="#first #default #last" style="linklist">
<title>Other</title>
</links>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.prepend_search_path.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.prepend_search_path.page
new file mode 100644
index 00000000..c3ba8309
--- /dev/null
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.prepend_search_path.page
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+
+<page id="GIRepository.Repository.prepend_search_path"
+ type="topic"
+ style="function"
+ xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
+ xmlns:ui="http://projectmallard.org/experimental/ui/">
+ <info>
+ <link type="guide" xref="GIRepository.Repository" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>void</api:type>
+ </api:returns>
+ <api:name>g_irepository_prepend_search_path</api:name>
+ <api:arg>
+ <api:type>char*</api:type>
+ <api:name>directory</api:name>
+ </api:arg>
+ </api:function>
+ </info>
+ <title>g_irepository_prepend_search_path</title>
+<synopsis><code mime="text/x-csrc">
+void g_irepository_prepend_search_path (char* directory);
+</code></synopsis>
+
+
+<table>
+<tr>
+<td><p>directory :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.require.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.require.page
index 4eea3fa3..423eaf70 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.require.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.require.page
@@ -1,15 +1,65 @@
<?xml version="1.0"?>
+
<page id="GIRepository.Repository.require"
type="topic"
style="method"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="GIRepository.Repository" group="method"/>
+ <api:function>
+ <api:returns>
+ <api:type>GITypelib*</api:type>
+ </api:returns>
+ <api:name>g_irepository_require</api:name>
+ <api:arg>
+ <api:type>GIRepository *</api:type>
+ <api:name>self</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gchar*</api:type>
+ <api:name>namespace_</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gchar*</api:type>
+ <api:name>version</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>GIRepositoryLoadFlags</api:type>
+ <api:name>flags</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_irepository_require</title>
+<synopsis><code mime="text/x-csrc">
+GITypelib* g_irepository_require (GIRepository *self,
+gchar* namespace_,
+ gchar* version,
+ GIRepositoryLoadFlags flags);
+</code></synopsis>
<p>Force the namespace @namespace_ to be loaded if it isn't already.
If @namespace_ is not loaded, this function will search for a
".typelib" file using the repository search path. In addition, a
version @version of namespace may be specified. If @version is
-not specified, the latest will be used.</p></page>
+not specified, the latest will be used.</p>
+
+<table>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>GI namespace to use, e.g. "Gtk"</p></td>
+</tr>
+<tr>
+<td><p>version :</p></td>
+<td><p>Version of namespace, may be %NULL for latest</p></td>
+</tr>
+<tr>
+<td><p>flags :</p></td>
+<td><p>Set of %GIRepositoryLoadFlags, may be 0</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>a pointer to the <link xref="GIRepository.Typelib">GIRepository.Typelib</link> if successful, %NULL otherwise</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.require_private.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.require_private.page
index 3b18a06b..f539b312 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.require_private.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.require_private.page
@@ -1,15 +1,74 @@
<?xml version="1.0"?>
+
<page id="GIRepository.Repository.require_private"
type="topic"
style="method"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="GIRepository.Repository" group="method"/>
+ <api:function>
+ <api:returns>
+ <api:type>GITypelib*</api:type>
+ </api:returns>
+ <api:name>g_irepository_require_private</api:name>
+ <api:arg>
+ <api:type>GIRepository *</api:type>
+ <api:name>self</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gchar*</api:type>
+ <api:name>typelib_dir</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gchar*</api:type>
+ <api:name>namespace_</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gchar*</api:type>
+ <api:name>version</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>GIRepositoryLoadFlags</api:type>
+ <api:name>flags</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_irepository_require_private</title>
+<synopsis><code mime="text/x-csrc">
+GITypelib* g_irepository_require_private (GIRepository *self,
+gchar* typelib_dir,
+ gchar* namespace_,
+ gchar* version,
+ GIRepositoryLoadFlags flags);
+</code></synopsis>
<p>Force the namespace @namespace_ to be loaded if it isn't already.
If @namespace_ is not loaded, this function will search for a
".typelib" file within the private directory only. In addition, a
version @version of namespace should be specified. If @version is
-not specified, the latest will be used.</p></page>
+not specified, the latest will be used.</p>
+
+<table>
+<tr>
+<td><p>typelib_dir :</p></td>
+<td><p>Private directory where to find the requested typelib</p></td>
+</tr>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>GI namespace to use, e.g. "Gtk"</p></td>
+</tr>
+<tr>
+<td><p>version :</p></td>
+<td><p>Version of namespace, may be %NULL for latest</p></td>
+</tr>
+<tr>
+<td><p>flags :</p></td>
+<td><p>Set of %GIRepositoryLoadFlags, may be 0</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>a pointer to the <link xref="GIRepository.Typelib">GIRepository.Typelib</link> if successful, %NULL otherwise</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryClass.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryClass.page
index 4170b9eb..337999a7 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryClass.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryClass.page
@@ -8,4 +8,5 @@
<link type="guide" xref="index"/>
</info>
<title>GIRepositoryRepositoryClass</title>
+
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryError.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryError.page
index 8c5880cc..81fbd70f 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryError.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryError.page
@@ -1,10 +1,12 @@
<?xml version="1.0"?>
<page id="GIRepository.RepositoryError"
- type="topic"
- style=""
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
+ <link type="guide" xref="index"/>
</info>
- <title>GIRepositoryRepositoryError</title>
+ <title>GIRepository.RepositoryError</title>
+
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryLoadFlags.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryLoadFlags.page
index a1a838ec..6ad05e8b 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryLoadFlags.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryLoadFlags.page
@@ -6,6 +6,7 @@
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
</info>
- <title>GIRepositoryRepositoryLoadFlags</title>
+ <title>GIRepository.RepositoryLoadFlags</title>
<p>Flags that controlls how a typelib is loaded by
-GIRepositry, used by g_irepository_load_typelib().</p></page>
+GIRepositry, used by g_irepository_load_typelib().</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryPrivate.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryPrivate.page
deleted file mode 100644
index 2d159d7f..00000000
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryPrivate.page
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<page id="GIRepository.RepositoryPrivate"
- type="guide"
- style="record"
- xmlns="http://projectmallard.org/1.0/"
- xmlns:ui="http://projectmallard.org/experimental/ui/">
- <info>
- <link type="guide" xref="index"/>
- </info>
- <title>GIRepositoryRepositoryPrivate</title>
-</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ScopeType.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ScopeType.page
index 14b21a70..2d9360cc 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ScopeType.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ScopeType.page
@@ -1,12 +1,14 @@
<?xml version="1.0"?>
<page id="GIRepository.ScopeType"
- type="topic"
- style=""
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
+ <link type="guide" xref="index"/>
</info>
- <title>GIRepositoryScopeType</title>
-<p>Scope type of a <link xref="GIArgInfo">GIArgInfo</link> representing callback, determines how the
+ <title>GIRepository.ScopeType</title>
+<p>Scope type of a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link> representing callback, determines how the
callback is invoked and is used to decided when the invoke structs
-can be freed.</p></page>
+can be freed.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.SignalInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.SignalInfo.page
index 1b905241..24f8471c 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.SignalInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.SignalInfo.page
@@ -6,5 +6,6 @@
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
</info>
- <title>GIRepositorySignalInfo</title>
-<p>Represents a signal.</p></page>
+ <title>GIRepository.SignalInfo</title>
+<p>Represents a signal.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.StructInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.StructInfo.page
index 8cc73823..5e1cb0dc 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.StructInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.StructInfo.page
@@ -6,5 +6,6 @@
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
</info>
- <title>GIRepositoryStructInfo</title>
-<p>Represents a struct.</p></page>
+ <title>GIRepository.StructInfo</title>
+<p>Represents a struct.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Transfer.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Transfer.page
index 0aa94ec0..86fbf348 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Transfer.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Transfer.page
@@ -1,19 +1,21 @@
<?xml version="1.0"?>
<page id="GIRepository.Transfer"
- type="topic"
- style=""
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
+ <link type="guide" xref="index"/>
</info>
- <title>GIRepositoryTransfer</title>
+ <title>GIRepository.Transfer</title>
<p>The transfer is the exchange of data between two parts, from the callee to
the caller. The callee is either a function/method/signal or an
object/interface where a property is defined. The caller is the side
accessing a property or calling a function.
-<link xref="GITransfer">GITransfer</link> specifies who's responsible for freeing the resources after the
+<link xref="GIRepository.Transfer">GIRepository.Transfer</link> specifies who's responsible for freeing the resources after the
ownership transfer is complete. In case of a containing type such as a list,
an array or a hash table the container itself is specified differently from
the items within the container itself. Each container is freed differently,
check the documentation for the types themselves for information on how to
-free them.</p></page>
+free them.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.TypeInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.TypeInfo.page
index 946b898a..5b46d876 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.TypeInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.TypeInfo.page
@@ -6,5 +6,6 @@
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
</info>
- <title>GIRepositoryTypeInfo</title>
-<p>Represents type information, direction, transfer etc.</p></page>
+ <title>GIRepository.TypeInfo</title>
+<p>Represents type information, direction, transfer etc.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.TypeTag.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.TypeTag.page
index c7f4f0ee..a2da1552 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.TypeTag.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.TypeTag.page
@@ -1,10 +1,12 @@
<?xml version="1.0"?>
<page id="GIRepository.TypeTag"
- type="topic"
- style=""
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
+ <link type="guide" xref="index"/>
</info>
- <title>GIRepositoryTypeTag</title>
-<p>The type tag of a <link xref="GITypeInfo">GITypeInfo</link>.</p></page>
+ <title>GIRepository.TypeTag</title>
+<p>The type tag of a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Typelib.free.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Typelib.free.page
deleted file mode 100644
index 87b8f0e8..00000000
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Typelib.free.page
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<page id="GIRepository.Typelib.free"
- type="topic"
- style="function"
- xmlns="http://projectmallard.org/1.0/"
- xmlns:ui="http://projectmallard.org/experimental/ui/">
- <info>
- <link type="guide" xref="GIRepository.Typelib" group="function"/>
- </info>
- <title>g_typelib_free</title>
-</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Typelib.get_namespace.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Typelib.get_namespace.page
deleted file mode 100644
index 5eeca51d..00000000
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Typelib.get_namespace.page
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<page id="GIRepository.Typelib.get_namespace"
- type="topic"
- style="function"
- xmlns="http://projectmallard.org/1.0/"
- xmlns:ui="http://projectmallard.org/experimental/ui/">
- <info>
- <link type="guide" xref="GIRepository.Typelib" group="function"/>
- </info>
- <title>g_typelib_get_namespace</title>
-</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Typelib.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Typelib.page
deleted file mode 100644
index 4abc4f5a..00000000
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Typelib.page
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<page id="GIRepository.Typelib"
- type="guide"
- style="record"
- xmlns="http://projectmallard.org/1.0/"
- xmlns:ui="http://projectmallard.org/experimental/ui/">
- <info>
- <link type="guide" xref="index"/>
- </info>
- <title>GIRepositoryTypelib</title>
-</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Typelib.symbol.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Typelib.symbol.page
deleted file mode 100644
index eff8ed1e..00000000
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Typelib.symbol.page
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<page id="GIRepository.Typelib.symbol"
- type="topic"
- style="function"
- xmlns="http://projectmallard.org/1.0/"
- xmlns:ui="http://projectmallard.org/experimental/ui/">
- <info>
- <link type="guide" xref="GIRepository.Typelib" group="function"/>
- </info>
- <title>g_typelib_symbol</title>
-</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.UnionInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.UnionInfo.page
index 792f5c61..013ecb53 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.UnionInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.UnionInfo.page
@@ -6,5 +6,6 @@
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
</info>
- <title>GIRepositoryUnionInfo</title>
-<p>Represents a union.</p></page>
+ <title>GIRepository.UnionInfo</title>
+<p>Represents a union.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.UnresolvedInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.UnresolvedInfo.page
deleted file mode 100644
index c0685b45..00000000
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.UnresolvedInfo.page
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<page id="GIRepository.UnresolvedInfo"
- type="guide"
- style="record"
- xmlns="http://projectmallard.org/1.0/"
- xmlns:ui="http://projectmallard.org/experimental/ui/">
- <info>
- <link type="guide" xref="index"/>
- </info>
- <title>GIRepositoryUnresolvedInfo</title>
-<p>Represents a unresolved type in a typelib.</p></page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.VFuncInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.VFuncInfo.page
index f5009326..a864ec1d 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.VFuncInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.VFuncInfo.page
@@ -6,5 +6,6 @@
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
</info>
- <title>GIRepositoryVFuncInfo</title>
-<p>Represents a virtual function.</p></page>
+ <title>GIRepository.VFuncInfo</title>
+<p>Represents a virtual function.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.VFuncInfoFlags.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.VFuncInfoFlags.page
index 44c8512a..a750dfde 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.VFuncInfoFlags.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.VFuncInfoFlags.page
@@ -6,5 +6,6 @@
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
</info>
- <title>GIRepositoryVFuncInfoFlags</title>
-<p>Flags of a <link xref="GIVFuncInfo">GIVFuncInfo</link> struct.</p></page>
+ <title>GIRepository.VFuncInfoFlags</title>
+<p>Flags of a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link> struct.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ValueInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ValueInfo.page
index 54761684..39ad0fa5 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ValueInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ValueInfo.page
@@ -6,5 +6,6 @@
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
</info>
- <title>GIRepositoryValueInfo</title>
-<p>Represents a enum value of a <link xref="GIEnumInfo">GIEnumInfo</link>.</p></page>
+ <title>GIRepository.ValueInfo</title>
+<p>Represents a enum value of a <link xref="GIRepository.EnumInfo">GIRepository.EnumInfo</link>.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository._Argument.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository._Argument.page
index ad4e308b..b5472b97 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository._Argument.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository._Argument.page
@@ -6,5 +6,6 @@
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
</info>
- <title>GIRepository_Argument</title>
+ <title>GIRepository._Argument</title>
+
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository._BaseInfoStub.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository._BaseInfoStub.page
index 69fb24b7..42ab6af2 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository._BaseInfoStub.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository._BaseInfoStub.page
@@ -8,4 +8,5 @@
<link type="guide" xref="index"/>
</info>
<title>GIRepository_BaseInfoStub</title>
+
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_closure.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_closure.page
index 00102ce4..090a24e4 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_closure.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_closure.page
@@ -1,12 +1,39 @@
<?xml version="1.0"?>
+
<page id="GIRepository.arg_info_get_closure"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gint</api:type>
+ </api:returns>
+ <api:name>g_arg_info_get_closure</api:name>
+ <api:arg>
+ <api:type>GIArgInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_arg_info_get_closure</title>
+<synopsis><code mime="text/x-csrc">
+gint g_arg_info_get_closure (GIArgInfo* info);
+</code></synopsis>
<p>Obtain the index of the user data argument. This is only valid
-for arguments which are callbacks.</p></page>
+for arguments which are callbacks.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>index of the user data argument or -1 if there is none</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_destroy.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_destroy.page
index 712afa99..3c04cd1d 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_destroy.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_destroy.page
@@ -1,12 +1,39 @@
<?xml version="1.0"?>
+
<page id="GIRepository.arg_info_get_destroy"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gint</api:type>
+ </api:returns>
+ <api:name>g_arg_info_get_destroy</api:name>
+ <api:arg>
+ <api:type>GIArgInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_arg_info_get_destroy</title>
+<synopsis><code mime="text/x-csrc">
+gint g_arg_info_get_destroy (GIArgInfo* info);
+</code></synopsis>
<p>Obtains the index of the <link xref="GDestroyNotify">GDestroyNotify</link> argument. This is only valid
-for arguments which are callbacks.</p></page>
+for arguments which are callbacks.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>index of the <link xref="GDestroyNotify">GDestroyNotify</link> argument or -1 if there is none</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_direction.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_direction.page
index 8fa3d814..eb27640d 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_direction.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_direction.page
@@ -1,12 +1,39 @@
<?xml version="1.0"?>
+
<page id="GIRepository.arg_info_get_direction"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIDirection</api:type>
+ </api:returns>
+ <api:name>g_arg_info_get_direction</api:name>
+ <api:arg>
+ <api:type>GIArgInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_arg_info_get_direction</title>
-<p>Obtain the direction of the argument. Check <link xref="GIDirection">GIDirection</link> for possible
-direction values.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIDirection g_arg_info_get_direction (GIArgInfo* info);
+</code></synopsis>
+<p>Obtain the direction of the argument. Check <link xref="GIRepository.Direction">GIRepository.Direction</link> for possible
+direction values.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the direction</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_ownership_transfer.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_ownership_transfer.page
index 0b969ba3..679e068e 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_ownership_transfer.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_ownership_transfer.page
@@ -1,12 +1,39 @@
<?xml version="1.0"?>
+
<page id="GIRepository.arg_info_get_ownership_transfer"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GITransfer</api:type>
+ </api:returns>
+ <api:name>g_arg_info_get_ownership_transfer</api:name>
+ <api:arg>
+ <api:type>GIArgInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_arg_info_get_ownership_transfer</title>
+<synopsis><code mime="text/x-csrc">
+GITransfer g_arg_info_get_ownership_transfer (GIArgInfo* info);
+</code></synopsis>
<p>Obtain the ownership transfer for this argument.
-<link xref="GITransfer">GITransfer</link> contains a list of possible values.</p></page>
+<link xref="GIRepository.Transfer">GIRepository.Transfer</link> contains a list of possible values.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the transfer</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_scope.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_scope.page
index 3dece4c2..1367c1ef 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_scope.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_scope.page
@@ -1,14 +1,41 @@
<?xml version="1.0"?>
+
<page id="GIRepository.arg_info_get_scope"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIScopeType</api:type>
+ </api:returns>
+ <api:name>g_arg_info_get_scope</api:name>
+ <api:arg>
+ <api:type>GIArgInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_arg_info_get_scope</title>
+<synopsis><code mime="text/x-csrc">
+GIScopeType g_arg_info_get_scope (GIArgInfo* info);
+</code></synopsis>
<p>Obtain the scope type for this argument. The scope type explains
how a callback is going to be invoked, most importantly when
the resources required to invoke it can be freed.
-<link xref="GIScopeType">GIScopeType</link> contains a list of possible values.</p></page>
+<link xref="GIRepository.ScopeType">GIRepository.ScopeType</link> contains a list of possible values.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the scope type</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_type.page
index e0096a97..abfa566d 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_type.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.arg_info_get_type"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GITypeInfo*</api:type>
+ </api:returns>
+ <api:name>g_arg_info_get_type</api:name>
+ <api:arg>
+ <api:type>GIArgInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_arg_info_get_type</title>
-<p>Obtain the type information for @info.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GITypeInfo* g_arg_info_get_type (GIArgInfo* info);
+</code></synopsis>
+<p>Obtain the type information for @info.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link>, free it with</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_caller_allocates.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_caller_allocates.page
index d1cdd436..22aa6517 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_caller_allocates.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_caller_allocates.page
@@ -1,14 +1,41 @@
<?xml version="1.0"?>
+
<page id="GIRepository.arg_info_is_caller_allocates"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gboolean</api:type>
+ </api:returns>
+ <api:name>g_arg_info_is_caller_allocates</api:name>
+ <api:arg>
+ <api:type>GIArgInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_arg_info_is_caller_allocates</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_arg_info_is_caller_allocates (GIArgInfo* info);
+</code></synopsis>
<p>Obtain if the argument is a pointer to a struct or object that will
receive an output of a function. The default assumption for
%GI_DIRECTION_OUT arguments which have allocation is that the
-callee allocates; if this is %TRUE, then the caller must allocate.</p></page>
+callee allocates; if this is %TRUE, then the caller must allocate.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if caller is required to have allocated the argument</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_optional.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_optional.page
index bf5482cb..42254f27 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_optional.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_optional.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.arg_info_is_optional"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gboolean</api:type>
+ </api:returns>
+ <api:name>g_arg_info_is_optional</api:name>
+ <api:arg>
+ <api:type>GIArgInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_arg_info_is_optional</title>
-<p>Obtain if the argument is optional.</p></page>
+<synopsis><code mime="text/x-csrc">
+gboolean g_arg_info_is_optional (GIArgInfo* info);
+</code></synopsis>
+<p>Obtain if the argument is optional.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if it is an optional argument</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_return_value.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_return_value.page
index a65a74f2..90010c2e 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_return_value.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_return_value.page
@@ -1,12 +1,39 @@
<?xml version="1.0"?>
+
<page id="GIRepository.arg_info_is_return_value"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gboolean</api:type>
+ </api:returns>
+ <api:name>g_arg_info_is_return_value</api:name>
+ <api:arg>
+ <api:type>GIArgInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_arg_info_is_return_value</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_arg_info_is_return_value (GIArgInfo* info);
+</code></synopsis>
<p>Obtain if the argument is a return value. It can either be a
-parameter or a return value.</p></page>
+parameter or a return value.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if it is a return value</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_skip.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_skip.page
index 04bf674e..10647329 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_skip.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_skip.page
@@ -1,11 +1,39 @@
<?xml version="1.0"?>
+
<page id="GIRepository.arg_info_is_skip"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gboolean</api:type>
+ </api:returns>
+ <api:name>g_arg_info_is_skip</api:name>
+ <api:arg>
+ <api:type>GIArgInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_arg_info_is_skip</title>
-<p>Obtain if an argument is only useful in C.</p></page>
+<synopsis><code mime="text/x-csrc">
+gboolean g_arg_info_is_skip (GIArgInfo* info);
+</code></synopsis>
+<p>Obtain if an argument is only useful in C.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if argument is only useful in C.</p></td>
+</tr>
+</table>
+<p>Since 1.29.0</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_load_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_load_type.page
index 88a90d31..c5be3027 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_load_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_load_type.page
@@ -1,13 +1,49 @@
<?xml version="1.0"?>
+
<page id="GIRepository.arg_info_load_type"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>void</api:type>
+ </api:returns>
+ <api:name>g_arg_info_load_type</api:name>
+ <api:arg>
+ <api:type>GIArgInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>GITypeInfo*</api:type>
+ <api:name>type</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_arg_info_load_type</title>
+<synopsis><code mime="text/x-csrc">
+void g_arg_info_load_type (GIArgInfo* info,
+ GITypeInfo* type);
+</code></synopsis>
<p>Obtain information about a the type of given argument @info; this
function is a variant of g_arg_info_get_type() designed for stack
-allocation.</p><p>The initialized @type must not be referenced after @info is deallocated.</p></page>
+allocation.</p><p>The initialized @type must not be referenced after @info is deallocated.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>type :</p></td>
+<td><p>Initialized with information about type of @info</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_may_be_null.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_may_be_null.page
index 549622cc..ad3d6510 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_may_be_null.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_may_be_null.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.arg_info_may_be_null"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gboolean</api:type>
+ </api:returns>
+ <api:name>g_arg_info_may_be_null</api:name>
+ <api:arg>
+ <api:type>GIArgInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_arg_info_may_be_null</title>
-<p>Obtain if the argument accepts %NULL.</p></page>
+<synopsis><code mime="text/x-csrc">
+gboolean g_arg_info_may_be_null (GIArgInfo* info);
+</code></synopsis>
+<p>Obtain if the argument accepts %NULL.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if it accepts %NULL</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.base_info_get_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.base_info_get_type.page
index 214ed0e9..ab56ef96 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.base_info_get_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.base_info_get_type.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.base_info_get_type"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIInfoType</api:type>
+ </api:returns>
+ <api:name>g_base_info_get_type</api:name>
+ <api:arg>
+ <api:type>GIBaseInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_base_info_get_type</title>
-<p>Obtain the info type of the GIBaseInfo.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIInfoType g_base_info_get_type (GIBaseInfo* info);
+</code></synopsis>
+<p>Obtain the info type of the GIBaseInfo.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the info type of @info</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_arg.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_arg.page
index 87bd9694..aa7958dd 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_arg.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_arg.page
@@ -1,11 +1,47 @@
<?xml version="1.0"?>
+
<page id="GIRepository.callable_info_get_arg"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIArgInfo*</api:type>
+ </api:returns>
+ <api:name>g_callable_info_get_arg</api:name>
+ <api:arg>
+ <api:type>GICallableInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gint</api:type>
+ <api:name>n</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_callable_info_get_arg</title>
-<p>Obtain information about a particular argument of this callable.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIArgInfo* g_callable_info_get_arg (GICallableInfo* info,
+ gint n);
+</code></synopsis>
+<p>Obtain information about a particular argument of this callable.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>the argument index to fetch</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link>. Free it with</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_caller_owns.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_caller_owns.page
index 3af152c7..2464f7e9 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_caller_owns.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_caller_owns.page
@@ -1,12 +1,39 @@
<?xml version="1.0"?>
+
<page id="GIRepository.callable_info_get_caller_owns"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GITransfer</api:type>
+ </api:returns>
+ <api:name>g_callable_info_get_caller_owns</api:name>
+ <api:arg>
+ <api:type>GICallableInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_callable_info_get_caller_owns</title>
+<synopsis><code mime="text/x-csrc">
+GITransfer g_callable_info_get_caller_owns (GICallableInfo* info);
+</code></synopsis>
<p>See whether the caller owns the return value of this callable.
-<link xref="GITransfer">GITransfer</link> contains a list of possible transfer values.</p></page>
+<link xref="GIRepository.Transfer">GIRepository.Transfer</link> contains a list of possible transfer values.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if the caller owns the return value, %FALSE otherwise.</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_n_args.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_n_args.page
index 4d3ff478..7ab4bcd4 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_n_args.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_n_args.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.callable_info_get_n_args"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gint</api:type>
+ </api:returns>
+ <api:name>g_callable_info_get_n_args</api:name>
+ <api:arg>
+ <api:type>GICallableInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_callable_info_get_n_args</title>
-<p>Obtain the number of arguments (both IN and OUT) for this callable.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_callable_info_get_n_args (GICallableInfo* info);
+</code></synopsis>
+<p>Obtain the number of arguments (both IN and OUT) for this callable.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>The number of arguments this callable expects.</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_return_attribute.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_return_attribute.page
index 9413f4b8..45290de8 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_return_attribute.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_return_attribute.page
@@ -1,11 +1,47 @@
<?xml version="1.0"?>
+
<page id="GIRepository.callable_info_get_return_attribute"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gchar*</api:type>
+ </api:returns>
+ <api:name>g_callable_info_get_return_attribute</api:name>
+ <api:arg>
+ <api:type>GICallableInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gchar*</api:type>
+ <api:name>name</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_callable_info_get_return_attribute</title>
-<p>Retrieve an arbitrary attribute associated with the return value.</p></page>
+<synopsis><code mime="text/x-csrc">
+gchar* g_callable_info_get_return_attribute (GICallableInfo* info,
+ gchar* name);
+</code></synopsis>
+<p>Retrieve an arbitrary attribute associated with the return value.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>a freeform string naming an attribute</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>The value of the attribute, or %NULL if no such attribute exists</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_return_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_return_type.page
index 729d8438..b2199374 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_return_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_return_type.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.callable_info_get_return_type"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GITypeInfo*</api:type>
+ </api:returns>
+ <api:name>g_callable_info_get_return_type</api:name>
+ <api:arg>
+ <api:type>GICallableInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_callable_info_get_return_type</title>
-<p>Obtain the return type of a callable item as a <link xref="GITypeInfo">GITypeInfo</link>.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GITypeInfo* g_callable_info_get_return_type (GICallableInfo* info);
+</code></synopsis>
+<p>Obtain the return type of a callable item as a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_iterate_return_attributes.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_iterate_return_attributes.page
index 9a76370c..2e38de20 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_iterate_return_attributes.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_iterate_return_attributes.page
@@ -1,15 +1,69 @@
<?xml version="1.0"?>
+
<page id="GIRepository.callable_info_iterate_return_attributes"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gboolean</api:type>
+ </api:returns>
+ <api:name>g_callable_info_iterate_return_attributes</api:name>
+ <api:arg>
+ <api:type>GICallableInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>GIAttributeIter*</api:type>
+ <api:name>iterator</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>char**</api:type>
+ <api:name>name</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>char**</api:type>
+ <api:name>value</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_callable_info_iterate_return_attributes</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_callable_info_iterate_return_attributes (GICallableInfo* info,
+ GIAttributeIter* iterator,
+ char** name,
+ char** value);
+</code></synopsis>
<p>Iterate over all attributes associated with the return value. The
iterator structure is typically stack allocated, and must have its
first member initialized to %NULL.</p><p>Both the @name and @value should be treated as constants
and must not be freed.</p><p>See g_base_info_iterate_attributes() for an example of how to use a
-similar API.</p></page>
+similar API.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
+</tr>
+<tr>
+<td><p>iterator :</p></td>
+<td><p>a <link xref="GIRepository.AttributeIter">GIRepository.AttributeIter</link> structure, must be initialized; see below</p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>Returned name, must not be freed</p></td>
+</tr>
+<tr>
+<td><p>value :</p></td>
+<td><p>Returned name, must not be freed</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if there are more attributes</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_load_arg.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_load_arg.page
index c00ca542..9dd576a6 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_load_arg.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_load_arg.page
@@ -1,13 +1,58 @@
<?xml version="1.0"?>
+
<page id="GIRepository.callable_info_load_arg"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>void</api:type>
+ </api:returns>
+ <api:name>g_callable_info_load_arg</api:name>
+ <api:arg>
+ <api:type>GICallableInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gint</api:type>
+ <api:name>n</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>GIArgInfo*</api:type>
+ <api:name>arg</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_callable_info_load_arg</title>
+<synopsis><code mime="text/x-csrc">
+void g_callable_info_load_arg (GICallableInfo* info,
+ gint n,
+ GIArgInfo* arg);
+</code></synopsis>
<p>Obtain information about a particular argument of this callable; this
function is a variant of g_callable_info_get_arg() designed for stack
-allocation.</p><p>The initialized @arg must not be referenced after @info is deallocated.</p></page>
+allocation.</p><p>The initialized @arg must not be referenced after @info is deallocated.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>the argument index to fetch</p></td>
+</tr>
+<tr>
+<td><p>arg :</p></td>
+<td><p>Initialize with argument number @n</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_load_return_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_load_return_type.page
index e64c6e92..47fc89c0 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_load_return_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_load_return_type.page
@@ -1,13 +1,49 @@
<?xml version="1.0"?>
+
<page id="GIRepository.callable_info_load_return_type"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>void</api:type>
+ </api:returns>
+ <api:name>g_callable_info_load_return_type</api:name>
+ <api:arg>
+ <api:type>GICallableInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>GITypeInfo*</api:type>
+ <api:name>type</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_callable_info_load_return_type</title>
+<synopsis><code mime="text/x-csrc">
+void g_callable_info_load_return_type (GICallableInfo* info,
+ GITypeInfo* type);
+</code></synopsis>
<p>Obtain information about a return value of callable; this
function is a variant of g_callable_info_get_return_type() designed for stack
-allocation.</p><p>The initialized @type must not be referenced after @info is deallocated.</p></page>
+allocation.</p><p>The initialized @type must not be referenced after @info is deallocated.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
+</tr>
+<tr>
+<td><p>type :</p></td>
+<td><p>Initialized with return type of @info</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_may_return_null.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_may_return_null.page
index 59ef2af1..08d4639d 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_may_return_null.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_may_return_null.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.callable_info_may_return_null"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gboolean</api:type>
+ </api:returns>
+ <api:name>g_callable_info_may_return_null</api:name>
+ <api:arg>
+ <api:type>GICallableInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_callable_info_may_return_null</title>
-<p>See if a callable could return %NULL.</p></page>
+<synopsis><code mime="text/x-csrc">
+gboolean g_callable_info_may_return_null (GICallableInfo* info);
+</code></synopsis>
+<p>See if a callable could return %NULL.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if callable could return %NULL</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_skip_return.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_skip_return.page
index 0e9fa95f..142d2bbd 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_skip_return.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_skip_return.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.callable_info_skip_return"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gboolean</api:type>
+ </api:returns>
+ <api:name>g_callable_info_skip_return</api:name>
+ <api:arg>
+ <api:type>GICallableInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_callable_info_skip_return</title>
-<p>See if a callable's return value is only useful in C.</p></page>
+<synopsis><code mime="text/x-csrc">
+gboolean g_callable_info_skip_return (GICallableInfo* info);
+</code></synopsis>
+<p>See if a callable's return value is only useful in C.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if return value is only useful in C.</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_free_value.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_free_value.page
new file mode 100644
index 00000000..dd13a310
--- /dev/null
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_free_value.page
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+
+<page id="GIRepository.constant_info_free_value"
+ type="topic"
+ style="function"
+ xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
+ xmlns:ui="http://projectmallard.org/experimental/ui/">
+ <info>
+ <link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>void</api:type>
+ </api:returns>
+ <api:name>g_constant_info_free_value</api:name>
+ <api:arg>
+ <api:type>GIConstantInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>GIArgument*</api:type>
+ <api:name>value</api:name>
+ </api:arg>
+ </api:function>
+ </info>
+ <title>g_constant_info_free_value</title>
+<synopsis><code mime="text/x-csrc">
+void g_constant_info_free_value (GIConstantInfo* info,
+ GIArgument* value);
+</code></synopsis>
+<p>Free the value returned from g_constant_info_get_value().</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link></p></td>
+</tr>
+<tr>
+<td><p>value :</p></td>
+<td><p>the argument</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
+<p>Since 1.30.1</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_get_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_get_type.page
index 9e4309b6..50ee4dfd 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_get_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_get_type.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.constant_info_get_type"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GITypeInfo*</api:type>
+ </api:returns>
+ <api:name>g_constant_info_get_type</api:name>
+ <api:arg>
+ <api:type>GIConstantInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_constant_info_get_type</title>
-<p>Obtain the type of the constant as a <link xref="GITypeInfo">GITypeInfo</link>.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GITypeInfo* g_constant_info_get_type (GIConstantInfo* info);
+</code></synopsis>
+<p>Obtain the type of the constant as a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_get_value.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_get_value.page
index e004e64e..c2747442 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_get_value.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_get_value.page
@@ -1,13 +1,50 @@
<?xml version="1.0"?>
+
<page id="GIRepository.constant_info_get_value"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gint</api:type>
+ </api:returns>
+ <api:name>g_constant_info_get_value</api:name>
+ <api:arg>
+ <api:type>GIConstantInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>GIArgument*</api:type>
+ <api:name>value</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_constant_info_get_value</title>
-<p>Obtain the value associated with the <link xref="GIConstantInfo">GIConstantInfo</link> and store it in the
+<synopsis><code mime="text/x-csrc">
+gint g_constant_info_get_value (GIConstantInfo* info,
+ GIArgument* value);
+</code></synopsis>
+<p>Obtain the value associated with the <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link> and store it in the
@value parameter. @argument needs to be allocated before passing it in.
-The size of the constant value stored in @argument will be returned.</p></page>
+The size of the constant value stored in @argument will be returned.
+Free the value with g_constant_info_free_value().</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link></p></td>
+</tr>
+<tr>
+<td><p>value :</p></td>
+<td><p>an argument</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>size of the constant</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_error_domain.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_error_domain.page
index 6dc3ff4b..b08c6581 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_error_domain.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_error_domain.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.enum_info_get_error_domain"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gchar*</api:type>
+ </api:returns>
+ <api:name>g_enum_info_get_error_domain</api:name>
+ <api:arg>
+ <api:type>GIEnumInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_enum_info_get_error_domain</title>
+<synopsis><code mime="text/x-csrc">
+gchar* g_enum_info_get_error_domain (GIEnumInfo* info);
+</code></synopsis>
+
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_method.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_method.page
new file mode 100644
index 00000000..c8c0ba6f
--- /dev/null
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_method.page
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+
+<page id="GIRepository.enum_info_get_method"
+ type="topic"
+ style="function"
+ xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
+ xmlns:ui="http://projectmallard.org/experimental/ui/">
+ <info>
+ <link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIFunctionInfo*</api:type>
+ </api:returns>
+ <api:name>g_enum_info_get_method</api:name>
+ <api:arg>
+ <api:type>GIEnumInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gint</api:type>
+ <api:name>n</api:name>
+ </api:arg>
+ </api:function>
+ </info>
+ <title>g_enum_info_get_method</title>
+<synopsis><code mime="text/x-csrc">
+GIFunctionInfo* g_enum_info_get_method (GIEnumInfo* info,
+ gint n);
+</code></synopsis>
+<p>Obtain an enum type method at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.EnumInfo">GIRepository.EnumInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of method to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+<p>Since 1.29.17</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_n_methods.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_n_methods.page
new file mode 100644
index 00000000..99db1419
--- /dev/null
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_n_methods.page
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+
+<page id="GIRepository.enum_info_get_n_methods"
+ type="topic"
+ style="function"
+ xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
+ xmlns:ui="http://projectmallard.org/experimental/ui/">
+ <info>
+ <link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gint</api:type>
+ </api:returns>
+ <api:name>g_enum_info_get_n_methods</api:name>
+ <api:arg>
+ <api:type>GIEnumInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
+ </info>
+ <title>g_enum_info_get_n_methods</title>
+<synopsis><code mime="text/x-csrc">
+gint g_enum_info_get_n_methods (GIEnumInfo* info);
+</code></synopsis>
+<p>Obtain the number of methods that this enum type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.EnumInfo">GIRepository.EnumInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of methods</p></td>
+</tr>
+</table>
+<p>Since 1.29.17</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_n_values.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_n_values.page
index 4ff16624..6ac04975 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_n_values.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_n_values.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.enum_info_get_n_values"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gint</api:type>
+ </api:returns>
+ <api:name>g_enum_info_get_n_values</api:name>
+ <api:arg>
+ <api:type>GIEnumInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_enum_info_get_n_values</title>
+<synopsis><code mime="text/x-csrc">
+gint g_enum_info_get_n_values (GIEnumInfo* info);
+</code></synopsis>
+
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_storage_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_storage_type.page
index 5ee1eebb..0a599f0c 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_storage_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_storage_type.page
@@ -1,15 +1,42 @@
<?xml version="1.0"?>
+
<page id="GIRepository.enum_info_get_storage_type"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GITypeTag</api:type>
+ </api:returns>
+ <api:name>g_enum_info_get_storage_type</api:name>
+ <api:arg>
+ <api:type>GIEnumInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_enum_info_get_storage_type</title>
+<synopsis><code mime="text/x-csrc">
+GITypeTag g_enum_info_get_storage_type (GIEnumInfo* info);
+</code></synopsis>
<p>Obtain the tag of the type used for the enum in the C ABI. This will
will be a signed or unsigned integral type.
Note that in the current implementation the width of the type is
computed correctly, but the signed or unsigned nature of the type
-may not match the sign of the type used by the C compiler.</p></page>
+may not match the sign of the type used by the C compiler.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.EnumInfo">GIRepository.EnumInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the storage type for the enumeration</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_value.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_value.page
index 86075c72..648d5fde 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_value.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_value.page
@@ -1,11 +1,47 @@
<?xml version="1.0"?>
+
<page id="GIRepository.enum_info_get_value"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIValueInfo*</api:type>
+ </api:returns>
+ <api:name>g_enum_info_get_value</api:name>
+ <api:arg>
+ <api:type>GIEnumInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gint</api:type>
+ <api:name>n</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_enum_info_get_value</title>
-<p>Obtain a value for this enumeration.</p><p>free the struct with g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIValueInfo* g_enum_info_get_value (GIEnumInfo* info,
+ gint n);
+</code></synopsis>
+<p>Obtain a value for this enumeration.</p><p>free the struct with g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.EnumInfo">GIRepository.EnumInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of value to fetch</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the enumeration value or %NULL if type tag is wrong,</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_field.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_field.page
index 2435dbd7..c7672099 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_field.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_field.page
@@ -1,14 +1,59 @@
<?xml version="1.0"?>
+
<page id="GIRepository.field_info_get_field"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gboolean</api:type>
+ </api:returns>
+ <api:name>g_field_info_get_field</api:name>
+ <api:arg>
+ <api:type>GIFieldInfo*</api:type>
+ <api:name>field_info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gpointer</api:type>
+ <api:name>mem</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>GIArgument*</api:type>
+ <api:name>value</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_field_info_get_field</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_field_info_get_field (GIFieldInfo* field_info,
+ gpointer mem,
+ GIArgument* value);
+</code></synopsis>
<p>Reads a field identified by a <link xref="GFieldInfo">GFieldInfo</link> from a C structure or
union. This only handles fields of simple C types. It will fail
for a field of a composite type like a nested structure or union
-even if that is actually readable.</p></page>
+even if that is actually readable.</p>
+
+<table>
+<tr>
+<td><p>field_info :</p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link></p></td>
+</tr>
+<tr>
+<td><p>mem :</p></td>
+<td><p>pointer to a block of memory representing a C structure or union</p></td>
+</tr>
+<tr>
+<td><p>value :</p></td>
+<td><p>a <link xref="GIArgument">GIArgument</link> into which to store the value retrieved</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if reading the field succeeded, otherwise %FALSE</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_flags.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_flags.page
index cac65ed5..eee2a089 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_flags.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_flags.page
@@ -1,12 +1,39 @@
<?xml version="1.0"?>
+
<page id="GIRepository.field_info_get_flags"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIFieldInfoFlags</api:type>
+ </api:returns>
+ <api:name>g_field_info_get_flags</api:name>
+ <api:arg>
+ <api:type>GIFieldInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_field_info_get_flags</title>
-<p>Obtain the flags for this <link xref="GIFieldInfo">GIFieldInfo</link>. See <link xref="GIFieldInfoFlags">GIFieldInfoFlags</link> for possible
-flag values.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIFieldInfoFlags g_field_info_get_flags (GIFieldInfo* info);
+</code></synopsis>
+<p>Obtain the flags for this <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link>. See <link xref="GIRepository.FieldInfoFlags">GIRepository.FieldInfoFlags</link> for possible
+flag values.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the flags</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_offset.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_offset.page
index 406c67f7..343ae75b 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_offset.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_offset.page
@@ -1,12 +1,39 @@
<?xml version="1.0"?>
+
<page id="GIRepository.field_info_get_offset"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gint</api:type>
+ </api:returns>
+ <api:name>g_field_info_get_offset</api:name>
+ <api:arg>
+ <api:type>GIFieldInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_field_info_get_offset</title>
+<synopsis><code mime="text/x-csrc">
+gint g_field_info_get_offset (GIFieldInfo* info);
+</code></synopsis>
<p>Obtain the offset in bits of the field member, this is relative
-to the beginning of the struct or union.</p></page>
+to the beginning of the struct or union.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the field offset</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_size.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_size.page
index 6c4534b0..76719c94 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_size.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_size.page
@@ -1,12 +1,39 @@
<?xml version="1.0"?>
+
<page id="GIRepository.field_info_get_size"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gint</api:type>
+ </api:returns>
+ <api:name>g_field_info_get_size</api:name>
+ <api:arg>
+ <api:type>GIFieldInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_field_info_get_size</title>
+<synopsis><code mime="text/x-csrc">
+gint g_field_info_get_size (GIFieldInfo* info);
+</code></synopsis>
<p>Obtain the size in bits of the field member, this is how
-much space you need to allocate to store the field.</p></page>
+much space you need to allocate to store the field.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the field size</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_type.page
index 9f0de8ac..28706303 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_type.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.field_info_get_type"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GITypeInfo*</api:type>
+ </api:returns>
+ <api:name>g_field_info_get_type</api:name>
+ <api:arg>
+ <api:type>GIFieldInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_field_info_get_type</title>
-<p>Obtain the type of a field as a <link xref="GITypeInfo">GITypeInfo</link>.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GITypeInfo* g_field_info_get_type (GIFieldInfo* info);
+</code></synopsis>
+<p>Obtain the type of a field as a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_set_field.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_set_field.page
index 81eac7eb..624c4278 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_set_field.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_set_field.page
@@ -1,16 +1,61 @@
<?xml version="1.0"?>
+
<page id="GIRepository.field_info_set_field"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gboolean</api:type>
+ </api:returns>
+ <api:name>g_field_info_set_field</api:name>
+ <api:arg>
+ <api:type>GIFieldInfo*</api:type>
+ <api:name>field_info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gpointer</api:type>
+ <api:name>mem</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>GIArgument*</api:type>
+ <api:name>value</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_field_info_set_field</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_field_info_set_field (GIFieldInfo* field_info,
+ gpointer mem,
+ GIArgument* value);
+</code></synopsis>
<p>Writes a field identified by a <link xref="GFieldInfo">GFieldInfo</link> to a C structure or
union. This only handles fields of simple C types. It will fail
for a field of a composite type like a nested structure or union
even if that is actually writable. Note also that that it will refuse
to write fields where memory management would by required. A field
-with a type such as 'char *' must be set with a setter function.</p></page>
+with a type such as 'char *' must be set with a setter function.</p>
+
+<table>
+<tr>
+<td><p>field_info :</p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link></p></td>
+</tr>
+<tr>
+<td><p>mem :</p></td>
+<td><p>pointer to a block of memory representing a C structure or union</p></td>
+</tr>
+<tr>
+<td><p>value :</p></td>
+<td><p>a <link xref="GIArgument">GIArgument</link> holding the value to store</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if writing the field succeeded, otherwise %FALSE</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_flags.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_flags.page
index 1f5a9882..06e35cdc 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_flags.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_flags.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.function_info_get_flags"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIFunctionInfoFlags</api:type>
+ </api:returns>
+ <api:name>g_function_info_get_flags</api:name>
+ <api:arg>
+ <api:type>GIFunctionInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_function_info_get_flags</title>
-<p>Obtain the <link xref="GIFunctionInfoFlags">GIFunctionInfoFlags</link> for the @info.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIFunctionInfoFlags g_function_info_get_flags (GIFunctionInfo* info);
+</code></synopsis>
+<p>Obtain the <link xref="GIRepository.FunctionInfoFlags">GIRepository.FunctionInfoFlags</link> for the @info.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the flags</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_property.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_property.page
index f1c9b2a0..0a58368d 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_property.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_property.page
@@ -1,14 +1,41 @@
<?xml version="1.0"?>
+
<page id="GIRepository.function_info_get_property"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIPropertyInfo*</api:type>
+ </api:returns>
+ <api:name>g_function_info_get_property</api:name>
+ <api:arg>
+ <api:type>GIFunctionInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_function_info_get_property</title>
-<p>Obtain the property associated with this <link xref="GIFunctionInfo">GIFunctionInfo</link>.
-Only <link xref="GIFunctionInfo">GIFunctionInfo</link> with the flag %GI_FUNCTION_IS_GETTER or
+<synopsis><code mime="text/x-csrc">
+GIPropertyInfo* g_function_info_get_property (GIFunctionInfo* info);
+</code></synopsis>
+<p>Obtain the property associated with this <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>.
+Only <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> with the flag %GI_FUNCTION_IS_GETTER or
%GI_FUNCTION_IS_SETTER have a property set. For other cases,
-%NULL will be returned.</p><p>g_base_info_unref() when done.</p></page>
+%NULL will be returned.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the property or %NULL if not set. Free it with</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_symbol.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_symbol.page
index b34d0d88..69a18a9b 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_symbol.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_symbol.page
@@ -1,13 +1,40 @@
<?xml version="1.0"?>
+
<page id="GIRepository.function_info_get_symbol"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gchar*</api:type>
+ </api:returns>
+ <api:name>g_function_info_get_symbol</api:name>
+ <api:arg>
+ <api:type>GIFunctionInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_function_info_get_symbol</title>
+<synopsis><code mime="text/x-csrc">
+gchar* g_function_info_get_symbol (GIFunctionInfo* info);
+</code></synopsis>
<p>Obtain the symbol of the function. The symbol is the name of the
exported function, suitable to be used as an argument to
-g_module_symbol().</p></page>
+g_module_symbol().</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the symbol</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_vfunc.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_vfunc.page
index 6187a76d..e36ee57a 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_vfunc.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_vfunc.page
@@ -1,13 +1,40 @@
<?xml version="1.0"?>
+
<page id="GIRepository.function_info_get_vfunc"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIVFuncInfo*</api:type>
+ </api:returns>
+ <api:name>g_function_info_get_vfunc</api:name>
+ <api:arg>
+ <api:type>GIFunctionInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_function_info_get_vfunc</title>
-<p>Obtain the virtual function associated with this <link xref="GIFunctionInfo">GIFunctionInfo</link>.
-Only <link xref="GIFunctionInfo">GIFunctionInfo</link> with the flag %GI_FUNCTION_WRAPS_VFUNC has
-a virtual function set. For other cases, %NULL will be returned.</p><p>Free it by calling g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIVFuncInfo* g_function_info_get_vfunc (GIFunctionInfo* info);
+</code></synopsis>
+<p>Obtain the virtual function associated with this <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>.
+Only <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> with the flag %GI_FUNCTION_WRAPS_VFUNC has
+a virtual function set. For other cases, %NULL will be returned.</p><p>Free it by calling g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the virtual function or %NULL if not set.</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_invoke.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_invoke.page
index c2b73a45..318ccc93 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_invoke.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_invoke.page
@@ -1,16 +1,88 @@
<?xml version="1.0"?>
+
<page id="GIRepository.function_info_invoke"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gboolean</api:type>
+ </api:returns>
+ <api:name>g_function_info_invoke</api:name>
+ <api:arg>
+ <api:type>GIFunctionInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>GIArgument*</api:type>
+ <api:name>in_args</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>int</api:type>
+ <api:name>n_in_args</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>GIArgument*</api:type>
+ <api:name>out_args</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>int</api:type>
+ <api:name>n_out_args</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>GIArgument*</api:type>
+ <api:name>return_value</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_function_info_invoke</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_function_info_invoke (GIFunctionInfo* info,
+ GIArgument* in_args,
+ int n_in_args,
+ GIArgument* out_args,
+ int n_out_args,
+ GIArgument* return_value);
+</code></synopsis>
<p>Invokes the function described in @info with the given
arguments. Note that inout parameters must appear in both
argument lists. This function uses dlsym() to obtain a pointer
to the function, so the library or shared object containing the
described function must either be linked to the caller, or must
-have been g_module_symbol()&lt;!-- --&gt;ed before calling this function.</p><p>error occurred.</p></page>
+have been g_module_symbol()&lt;!-- --&gt;ed before calling this function.</p><p>error occurred.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> describing the function to invoke</p></td>
+</tr>
+<tr>
+<td><p>in_args :</p></td>
+<td><p>an array of <link xref="GIArgument">GIArgument</link>&lt;!-- --&gt;s, one for each in parameter of @info. If there are no in parameter, @in_args can be %NULL</p></td>
+</tr>
+<tr>
+<td><p>n_in_args :</p></td>
+<td><p>the length of the @in_args array</p></td>
+</tr>
+<tr>
+<td><p>out_args :</p></td>
+<td><p>an array of <link xref="GIArgument">GIArgument</link>&lt;!-- --&gt;s, one for each out parameter of @info. If there are no out parameters, @out_args may be %NULL</p></td>
+</tr>
+<tr>
+<td><p>n_out_args :</p></td>
+<td><p>the length of the @out_args array</p></td>
+</tr>
+<tr>
+<td><p>return_value :</p></td>
+<td><p>return location for the return value of the function. If the function returns void, @return_value may be %NULL</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if the function has been invoked, %FALSE if an</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.info_new.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.info_new.page
index 75cbf8d7..9942e803 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.info_new.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.info_new.page
@@ -1,11 +1,65 @@
<?xml version="1.0"?>
+
<page id="GIRepository.info_new"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIBaseInfo*</api:type>
+ </api:returns>
+ <api:name>g_info_new</api:name>
+ <api:arg>
+ <api:type>GIInfoType</api:type>
+ <api:name>type</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>GIBaseInfo*</api:type>
+ <api:name>container</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>GITypelib*</api:type>
+ <api:name>typelib</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>guint32</api:type>
+ <api:name>offset</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_info_new</title>
+<synopsis><code mime="text/x-csrc">
+GIBaseInfo* g_info_new (GIInfoType type,
+ GIBaseInfo* container,
+ GITypelib* typelib,
+ guint32 offset);
+</code></synopsis>
+
+
+<table>
+<tr>
+<td><p>type :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>container :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>typelib :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>offset :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.info_type_to_string.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.info_type_to_string.page
index 8102182b..1b45b230 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.info_type_to_string.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.info_type_to_string.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.info_type_to_string"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gchar*</api:type>
+ </api:returns>
+ <api:name>g_info_type_to_string</api:name>
+ <api:arg>
+ <api:type>GIInfoType</api:type>
+ <api:name>type</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_info_type_to_string</title>
-<p>Obtain a string representation of @type</p></page>
+<synopsis><code mime="text/x-csrc">
+gchar* g_info_type_to_string (GIInfoType type);
+</code></synopsis>
+<p>Obtain a string representation of @type</p>
+
+<table>
+<tr>
+<td><p>type :</p></td>
+<td><p>the info type</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the string</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_find_method.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_find_method.page
index b4f7a269..6c4df0d9 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_find_method.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_find_method.page
@@ -1,12 +1,48 @@
<?xml version="1.0"?>
+
<page id="GIRepository.interface_info_find_method"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIFunctionInfo*</api:type>
+ </api:returns>
+ <api:name>g_interface_info_find_method</api:name>
+ <api:arg>
+ <api:type>GIInterfaceInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gchar*</api:type>
+ <api:name>name</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_interface_info_find_method</title>
+<synopsis><code mime="text/x-csrc">
+GIFunctionInfo* g_interface_info_find_method (GIInterfaceInfo* info,
+ gchar* name);
+</code></synopsis>
<p>Obtain a method of the interface type given a @name. %NULL will be
-returned if there's no method available with that name.</p><p>Free the struct by calling g_base_info_unref() when done.</p></page>
+returned if there's no method available with that name.</p><p>Free the struct by calling g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>name of method to obtain</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> or %NULL if none found.</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_find_vfunc.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_find_vfunc.page
index 6b5878f6..d78596e6 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_find_vfunc.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_find_vfunc.page
@@ -1,12 +1,48 @@
<?xml version="1.0"?>
+
<page id="GIRepository.interface_info_find_vfunc"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIVFuncInfo*</api:type>
+ </api:returns>
+ <api:name>g_interface_info_find_vfunc</api:name>
+ <api:arg>
+ <api:type>GIInterfaceInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gchar*</api:type>
+ <api:name>name</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_interface_info_find_vfunc</title>
+<synopsis><code mime="text/x-csrc">
+GIVFuncInfo* g_interface_info_find_vfunc (GIInterfaceInfo* info,
+ gchar* name);
+</code></synopsis>
<p>Locate a virtual function slot with name @name. See the documentation
-for g_object_info_find_vfunc() for more information on virtuals.</p><p>g_base_info_unref() when done.</p></page>
+for g_object_info_find_vfunc() for more information on virtuals.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>The name of a virtual function to find.</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link>, or %NULL. Free it with</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_constant.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_constant.page
index 8f3e1e84..5634b169 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_constant.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_constant.page
@@ -1,11 +1,47 @@
<?xml version="1.0"?>
+
<page id="GIRepository.interface_info_get_constant"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIConstantInfo*</api:type>
+ </api:returns>
+ <api:name>g_interface_info_get_constant</api:name>
+ <api:arg>
+ <api:type>GIInterfaceInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gint</api:type>
+ <api:name>n</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_interface_info_get_constant</title>
-<p>Obtain an interface type constant at index @n.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIConstantInfo* g_interface_info_get_constant (GIInterfaceInfo* info,
+ gint n);
+</code></synopsis>
+<p>Obtain an interface type constant at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of constant to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_iface_struct.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_iface_struct.page
index d8ac1a76..89d83a5e 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_iface_struct.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_iface_struct.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.interface_info_get_iface_struct"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIStructInfo*</api:type>
+ </api:returns>
+ <api:name>g_interface_info_get_iface_struct</api:name>
+ <api:arg>
+ <api:type>GIInterfaceInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_interface_info_get_iface_struct</title>
-<p>Returns the layout C structure associated with this <link xref="GInterface">GInterface</link>.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIStructInfo* g_interface_info_get_iface_struct (GIInterfaceInfo* info);
+</code></synopsis>
+<p>Returns the layout C structure associated with this <link xref="GInterface">GInterface</link>.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link> or %NULL. Free it with</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_method.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_method.page
index 3de6eee7..f98c84f8 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_method.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_method.page
@@ -1,11 +1,47 @@
<?xml version="1.0"?>
+
<page id="GIRepository.interface_info_get_method"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIFunctionInfo*</api:type>
+ </api:returns>
+ <api:name>g_interface_info_get_method</api:name>
+ <api:arg>
+ <api:type>GIInterfaceInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gint</api:type>
+ <api:name>n</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_interface_info_get_method</title>
-<p>Obtain an interface type method at index @n.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIFunctionInfo* g_interface_info_get_method (GIInterfaceInfo* info,
+ gint n);
+</code></synopsis>
+<p>Obtain an interface type method at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of method to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_constants.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_constants.page
index 03c41fb1..7139f14c 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_constants.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_constants.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.interface_info_get_n_constants"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gint</api:type>
+ </api:returns>
+ <api:name>g_interface_info_get_n_constants</api:name>
+ <api:arg>
+ <api:type>GIInterfaceInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_interface_info_get_n_constants</title>
-<p>Obtain the number of constants that this interface type has.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_interface_info_get_n_constants (GIInterfaceInfo* info);
+</code></synopsis>
+<p>Obtain the number of constants that this interface type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of constants</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_methods.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_methods.page
index 138954b9..2ea816f4 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_methods.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_methods.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.interface_info_get_n_methods"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gint</api:type>
+ </api:returns>
+ <api:name>g_interface_info_get_n_methods</api:name>
+ <api:arg>
+ <api:type>GIInterfaceInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_interface_info_get_n_methods</title>
-<p>Obtain the number of methods that this interface type has.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_interface_info_get_n_methods (GIInterfaceInfo* info);
+</code></synopsis>
+<p>Obtain the number of methods that this interface type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of methods</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_prerequisites.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_prerequisites.page
index 8b6456b4..712f2d14 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_prerequisites.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_prerequisites.page
@@ -1,13 +1,40 @@
<?xml version="1.0"?>
+
<page id="GIRepository.interface_info_get_n_prerequisites"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gint</api:type>
+ </api:returns>
+ <api:name>g_interface_info_get_n_prerequisites</api:name>
+ <api:arg>
+ <api:type>GIInterfaceInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_interface_info_get_n_prerequisites</title>
+<synopsis><code mime="text/x-csrc">
+gint g_interface_info_get_n_prerequisites (GIInterfaceInfo* info);
+</code></synopsis>
<p>Obtain the number of prerequisites for this interface type.
A prerequisites is another interface that needs to be implemented for
-interface, similar to an base class for GObjects.</p></page>
+interface, similar to an base class for GObjects.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of prerequisites</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_properties.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_properties.page
index 9856351e..f0805f58 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_properties.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_properties.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.interface_info_get_n_properties"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gint</api:type>
+ </api:returns>
+ <api:name>g_interface_info_get_n_properties</api:name>
+ <api:arg>
+ <api:type>GIInterfaceInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_interface_info_get_n_properties</title>
-<p>Obtain the number of properties that this interface type has.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_interface_info_get_n_properties (GIInterfaceInfo* info);
+</code></synopsis>
+<p>Obtain the number of properties that this interface type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of properties</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_signals.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_signals.page
index e9070e99..79bff47d 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_signals.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_signals.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.interface_info_get_n_signals"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gint</api:type>
+ </api:returns>
+ <api:name>g_interface_info_get_n_signals</api:name>
+ <api:arg>
+ <api:type>GIInterfaceInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_interface_info_get_n_signals</title>
-<p>Obtain the number of signals that this interface type has.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_interface_info_get_n_signals (GIInterfaceInfo* info);
+</code></synopsis>
+<p>Obtain the number of signals that this interface type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of signals</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_vfuncs.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_vfuncs.page
index aa048198..3e202f22 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_vfuncs.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_vfuncs.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.interface_info_get_n_vfuncs"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gint</api:type>
+ </api:returns>
+ <api:name>g_interface_info_get_n_vfuncs</api:name>
+ <api:arg>
+ <api:type>GIInterfaceInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_interface_info_get_n_vfuncs</title>
-<p>Obtain the number of virtual functions that this interface type has.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_interface_info_get_n_vfuncs (GIInterfaceInfo* info);
+</code></synopsis>
+<p>Obtain the number of virtual functions that this interface type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of virtual functions</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_prerequisite.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_prerequisite.page
index 095f4bae..db11a191 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_prerequisite.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_prerequisite.page
@@ -1,11 +1,47 @@
<?xml version="1.0"?>
+
<page id="GIRepository.interface_info_get_prerequisite"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIBaseInfo*</api:type>
+ </api:returns>
+ <api:name>g_interface_info_get_prerequisite</api:name>
+ <api:arg>
+ <api:type>GIInterfaceInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gint</api:type>
+ <api:name>n</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_interface_info_get_prerequisite</title>
-<p>Obtain an interface type prerequisites index @n.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIBaseInfo* g_interface_info_get_prerequisite (GIInterfaceInfo* info,
+ gint n);
+</code></synopsis>
+<p>Obtain an interface type prerequisites index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of prerequisites to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the prerequisites as a <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_property.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_property.page
index 44609b31..366d742b 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_property.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_property.page
@@ -1,11 +1,47 @@
<?xml version="1.0"?>
+
<page id="GIRepository.interface_info_get_property"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIPropertyInfo*</api:type>
+ </api:returns>
+ <api:name>g_interface_info_get_property</api:name>
+ <api:arg>
+ <api:type>GIInterfaceInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gint</api:type>
+ <api:name>n</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_interface_info_get_property</title>
-<p>Obtain an interface type property at index @n.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIPropertyInfo* g_interface_info_get_property (GIInterfaceInfo* info,
+ gint n);
+</code></synopsis>
+<p>Obtain an interface type property at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of property to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.PropertyInfo">GIRepository.PropertyInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_signal.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_signal.page
index 046a6c49..f8ef5592 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_signal.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_signal.page
@@ -1,11 +1,47 @@
<?xml version="1.0"?>
+
<page id="GIRepository.interface_info_get_signal"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GISignalInfo*</api:type>
+ </api:returns>
+ <api:name>g_interface_info_get_signal</api:name>
+ <api:arg>
+ <api:type>GIInterfaceInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gint</api:type>
+ <api:name>n</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_interface_info_get_signal</title>
-<p>Obtain an interface type signal at index @n.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GISignalInfo* g_interface_info_get_signal (GIInterfaceInfo* info,
+ gint n);
+</code></synopsis>
+<p>Obtain an interface type signal at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of signal to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.SignalInfo">GIRepository.SignalInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_vfunc.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_vfunc.page
index 7bf28868..6e7c62dc 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_vfunc.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_vfunc.page
@@ -1,11 +1,47 @@
<?xml version="1.0"?>
+
<page id="GIRepository.interface_info_get_vfunc"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIVFuncInfo*</api:type>
+ </api:returns>
+ <api:name>g_interface_info_get_vfunc</api:name>
+ <api:arg>
+ <api:type>GIInterfaceInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gint</api:type>
+ <api:name>n</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_interface_info_get_vfunc</title>
-<p>Obtain an interface type virtual function at index @n.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIVFuncInfo* g_interface_info_get_vfunc (GIInterfaceInfo* info,
+ gint n);
+</code></synopsis>
+<p>Obtain an interface type virtual function at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of virtual function to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.invoke_error_quark.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.invoke_error_quark.page
index 5b8f56e8..d59baa93 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.invoke_error_quark.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.invoke_error_quark.page
@@ -1,11 +1,30 @@
<?xml version="1.0"?>
+
<page id="GIRepository.invoke_error_quark"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GQuark</api:type>
+ </api:returns>
+ <api:name>g_invoke_error_quark</api:name>
+ </api:function>
</info>
<title>g_invoke_error_quark</title>
+<synopsis><code mime="text/x-csrc">
+GQuark g_invoke_error_quark (void);
+</code></synopsis>
+
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.nvokeError.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.nvokeError.page
index b942d98b..269351b6 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.nvokeError.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.nvokeError.page
@@ -1,11 +1,13 @@
<?xml version="1.0"?>
<page id="GIRepository.nvokeError"
- type="topic"
- style=""
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
+ <link type="guide" xref="index"/>
</info>
- <title>GIRepositorynvokeError</title>
+ <title>GIRepository.nvokeError</title>
<p>An error occuring while invoking a function via
-g_function_info_invoke().</p></page>
+g_function_info_invoke().</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_method.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_method.page
index 5e99574c..ebf712a1 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_method.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_method.page
@@ -1,12 +1,48 @@
<?xml version="1.0"?>
+
<page id="GIRepository.object_info_find_method"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIFunctionInfo*</api:type>
+ </api:returns>
+ <api:name>g_object_info_find_method</api:name>
+ <api:arg>
+ <api:type>GIObjectInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gchar*</api:type>
+ <api:name>name</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_object_info_find_method</title>
+<synopsis><code mime="text/x-csrc">
+GIFunctionInfo* g_object_info_find_method (GIObjectInfo* info,
+ gchar* name);
+</code></synopsis>
<p>Obtain a method of the object type given a @name. %NULL will be
-returned if there's no method available with that name.</p><p>g_base_info_unref() when done.</p></page>
+returned if there's no method available with that name.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>name of method to obtain</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_method_using_interfaces.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_method_using_interfaces.page
index a30510e0..a4a57f68 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_method_using_interfaces.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_method_using_interfaces.page
@@ -1,14 +1,59 @@
<?xml version="1.0"?>
+
<page id="GIRepository.object_info_find_method_using_interfaces"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIFunctionInfo*</api:type>
+ </api:returns>
+ <api:name>g_object_info_find_method_using_interfaces</api:name>
+ <api:arg>
+ <api:type>GIObjectInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gchar*</api:type>
+ <api:name>name</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>GIObjectInfo**</api:type>
+ <api:name>implementor</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_object_info_find_method_using_interfaces</title>
+<synopsis><code mime="text/x-csrc">
+GIFunctionInfo* g_object_info_find_method_using_interfaces (GIObjectInfo* info,
+ gchar* name,
+ GIObjectInfo** implementor);
+</code></synopsis>
<p>Obtain a method of the object given a @name, searching both the
object @info and any interfaces it implements. %NULL will be
returned if there's no method available with that name.</p><p>Note that this function does *not* search parent classes; you will have
-to chain up if that's desired.</p><p>g_base_info_unref() when done.</p></page>
+to chain up if that's desired.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>name of method to obtain</p></td>
+</tr>
+<tr>
+<td><p>implementor :</p></td>
+<td><p>The implementor of the interface</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_signal.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_signal.page
index 3b7662c4..2e451f9e 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_signal.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_signal.page
@@ -1,11 +1,47 @@
<?xml version="1.0"?>
+
<page id="GIRepository.object_info_find_signal"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GISignalInfo*</api:type>
+ </api:returns>
+ <api:name>g_object_info_find_signal</api:name>
+ <api:arg>
+ <api:type>GIObjectInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gchar*</api:type>
+ <api:name>name</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_object_info_find_signal</title>
+<synopsis><code mime="text/x-csrc">
+GISignalInfo* g_object_info_find_signal (GIObjectInfo* info,
+ gchar* name);
+</code></synopsis>
+
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>Name of signal</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>Info for the signal with name @name in @info, or %NULL on failure.</p></td>
+</tr>
+</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_vfunc.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_vfunc.page
index d3f7990f..0a99d39f 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_vfunc.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_vfunc.page
@@ -1,17 +1,53 @@
<?xml version="1.0"?>
+
<page id="GIRepository.object_info_find_vfunc"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIVFuncInfo*</api:type>
+ </api:returns>
+ <api:name>g_object_info_find_vfunc</api:name>
+ <api:arg>
+ <api:type>GIObjectInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gchar*</api:type>
+ <api:name>name</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_object_info_find_vfunc</title>
+<synopsis><code mime="text/x-csrc">
+GIVFuncInfo* g_object_info_find_vfunc (GIObjectInfo* info,
+ gchar* name);
+</code></synopsis>
<p>Locate a virtual function slot with name @name. Note that the namespace
for virtuals is distinct from that of methods; there may or may not be
a concrete method associated for a virtual. If there is one, it may
be retrieved using g_vfunc_info_get_invoker(), otherwise %NULL will be
returned.
See the documentation for g_vfunc_info_get_invoker() for more
-information on invoking virtuals.</p><p>g_base_info_unref() when done.</p></page>
+information on invoking virtuals.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>The name of a virtual function to find.</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link>, or %NULL. Free it with</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_abstract.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_abstract.page
index 068650fe..2b5c7c5b 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_abstract.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_abstract.page
@@ -1,12 +1,39 @@
<?xml version="1.0"?>
+
<page id="GIRepository.object_info_get_abstract"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gboolean</api:type>
+ </api:returns>
+ <api:name>g_object_info_get_abstract</api:name>
+ <api:arg>
+ <api:type>GIObjectInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_object_info_get_abstract</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_object_info_get_abstract (GIObjectInfo* info);
+</code></synopsis>
<p>Obtain if the object type is an abstract type, eg if it cannot be
-instantiated</p></page>
+instantiated</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if the object type is abstract</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_class_struct.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_class_struct.page
index 8da2729c..ddb04488 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_class_struct.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_class_struct.page
@@ -1,12 +1,39 @@
<?xml version="1.0"?>
+
<page id="GIRepository.object_info_get_class_struct"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIStructInfo*</api:type>
+ </api:returns>
+ <api:name>g_object_info_get_class_struct</api:name>
+ <api:arg>
+ <api:type>GIObjectInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_object_info_get_class_struct</title>
+<synopsis><code mime="text/x-csrc">
+GIStructInfo* g_object_info_get_class_struct (GIObjectInfo* info);
+</code></synopsis>
<p>Every <link xref="GObject">GObject</link> has two structures; an instance structure and a class
-structure. This function returns the metadata for the class structure.</p><p>g_base_info_unref() when done.</p></page>
+structure. This function returns the metadata for the class structure.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link> or %NULL. Free with</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_constant.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_constant.page
index bcf08e83..3064b45f 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_constant.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_constant.page
@@ -1,11 +1,47 @@
<?xml version="1.0"?>
+
<page id="GIRepository.object_info_get_constant"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIConstantInfo*</api:type>
+ </api:returns>
+ <api:name>g_object_info_get_constant</api:name>
+ <api:arg>
+ <api:type>GIObjectInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gint</api:type>
+ <api:name>n</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_object_info_get_constant</title>
-<p>Obtain an object type constant at index @n.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIConstantInfo* g_object_info_get_constant (GIObjectInfo* info,
+ gint n);
+</code></synopsis>
+<p>Obtain an object type constant at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of constant to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_field.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_field.page
index 22cc7019..cb46abbe 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_field.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_field.page
@@ -1,11 +1,47 @@
<?xml version="1.0"?>
+
<page id="GIRepository.object_info_get_field"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIFieldInfo*</api:type>
+ </api:returns>
+ <api:name>g_object_info_get_field</api:name>
+ <api:arg>
+ <api:type>GIObjectInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gint</api:type>
+ <api:name>n</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_object_info_get_field</title>
-<p>Obtain an object type field at index @n.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIFieldInfo* g_object_info_get_field (GIObjectInfo* info,
+ gint n);
+</code></synopsis>
+<p>Obtain an object type field at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of field to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_fundamental.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_fundamental.page
index b8cd0420..b0f52449 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_fundamental.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_fundamental.page
@@ -1,12 +1,39 @@
<?xml version="1.0"?>
+
<page id="GIRepository.object_info_get_fundamental"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gboolean</api:type>
+ </api:returns>
+ <api:name>g_object_info_get_fundamental</api:name>
+ <api:arg>
+ <api:type>GIObjectInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_object_info_get_fundamental</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_object_info_get_fundamental (GIObjectInfo* info);
+</code></synopsis>
<p>Obtain if the object type is of a fundamental type which is not
-G_TYPE_OBJECT. This is mostly for supporting GstMiniObject.</p></page>
+G_TYPE_OBJECT. This is mostly for supporting GstMiniObject.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if the object type is a fundamental type</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_get_value_function.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_get_value_function.page
index 9d81004e..912a70fc 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_get_value_function.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_get_value_function.page
@@ -1,15 +1,42 @@
<?xml version="1.0"?>
+
<page id="GIRepository.object_info_get_get_value_function"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>char*</api:type>
+ </api:returns>
+ <api:name>g_object_info_get_get_value_function</api:name>
+ <api:arg>
+ <api:type>GIObjectInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_object_info_get_get_value_function</title>
+<synopsis><code mime="text/x-csrc">
+char* g_object_info_get_get_value_function (GIObjectInfo* info);
+</code></synopsis>
<p>Obtain the symbol name of the function that should be called to convert
an object instance pointer of this object type to a GValue.
I's mainly used fundamental types. The type signature for the symbol
is %GIObjectInfoGetValueFunction, to fetch the function pointer
-see g_object_info_get_get_value_function().</p></page>
+see g_object_info_get_get_value_function().</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the symbol or %NULL</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_get_value_function_pointer.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_get_value_function_pointer.page
index 2226ead8..94ade854 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_get_value_function_pointer.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_get_value_function_pointer.page
@@ -1,14 +1,41 @@
<?xml version="1.0"?>
+
<page id="GIRepository.object_info_get_get_value_function_pointer"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIObjectInfoGetValueFunction</api:type>
+ </api:returns>
+ <api:name>g_object_info_get_get_value_function_pointer</api:name>
+ <api:arg>
+ <api:type>GIObjectInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_object_info_get_get_value_function_pointer</title>
+<synopsis><code mime="text/x-csrc">
+GIObjectInfoGetValueFunction g_object_info_get_get_value_function_pointer (GIObjectInfo* info);
+</code></synopsis>
<p>Obtain a pointer to a function which can be used to
extract an instance of this object type out of a GValue.
This takes derivation into account and will reversely traverse
-the base classes of this type, starting at the top type.</p></page>
+the base classes of this type, starting at the top type.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the function pointer or %NULL</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_interface.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_interface.page
index 63c791fe..d751b2f3 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_interface.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_interface.page
@@ -1,11 +1,47 @@
<?xml version="1.0"?>
+
<page id="GIRepository.object_info_get_interface"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIInterfaceInfo*</api:type>
+ </api:returns>
+ <api:name>g_object_info_get_interface</api:name>
+ <api:arg>
+ <api:type>GIObjectInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gint</api:type>
+ <api:name>n</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_object_info_get_interface</title>
-<p>Obtain an object type interface at index @n.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIInterfaceInfo* g_object_info_get_interface (GIObjectInfo* info,
+ gint n);
+</code></synopsis>
+<p>Obtain an object type interface at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of interface to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_method.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_method.page
index a657b4ef..b62b9ead 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_method.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_method.page
@@ -1,11 +1,47 @@
<?xml version="1.0"?>
+
<page id="GIRepository.object_info_get_method"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIFunctionInfo*</api:type>
+ </api:returns>
+ <api:name>g_object_info_get_method</api:name>
+ <api:arg>
+ <api:type>GIObjectInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gint</api:type>
+ <api:name>n</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_object_info_get_method</title>
-<p>Obtain an object type method at index @n.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIFunctionInfo* g_object_info_get_method (GIObjectInfo* info,
+ gint n);
+</code></synopsis>
+<p>Obtain an object type method at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of method to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_constants.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_constants.page
index 35370474..c52ca1d0 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_constants.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_constants.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.object_info_get_n_constants"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gint</api:type>
+ </api:returns>
+ <api:name>g_object_info_get_n_constants</api:name>
+ <api:arg>
+ <api:type>GIObjectInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_object_info_get_n_constants</title>
-<p>Obtain the number of constants that this object type has.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_object_info_get_n_constants (GIObjectInfo* info);
+</code></synopsis>
+<p>Obtain the number of constants that this object type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of constants</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_fields.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_fields.page
index 20bf1c24..99d7f6ea 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_fields.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_fields.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.object_info_get_n_fields"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gint</api:type>
+ </api:returns>
+ <api:name>g_object_info_get_n_fields</api:name>
+ <api:arg>
+ <api:type>GIObjectInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_object_info_get_n_fields</title>
-<p>Obtain the number of fields that this object type has.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_object_info_get_n_fields (GIObjectInfo* info);
+</code></synopsis>
+<p>Obtain the number of fields that this object type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of fields</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_interfaces.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_interfaces.page
index 45145245..421d938f 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_interfaces.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_interfaces.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.object_info_get_n_interfaces"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gint</api:type>
+ </api:returns>
+ <api:name>g_object_info_get_n_interfaces</api:name>
+ <api:arg>
+ <api:type>GIObjectInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_object_info_get_n_interfaces</title>
-<p>Obtain the number of interfaces that this object type has.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_object_info_get_n_interfaces (GIObjectInfo* info);
+</code></synopsis>
+<p>Obtain the number of interfaces that this object type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of interfaces</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_methods.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_methods.page
index a6b4f80c..867bb57c 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_methods.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_methods.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.object_info_get_n_methods"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gint</api:type>
+ </api:returns>
+ <api:name>g_object_info_get_n_methods</api:name>
+ <api:arg>
+ <api:type>GIObjectInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_object_info_get_n_methods</title>
-<p>Obtain the number of methods that this object type has.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_object_info_get_n_methods (GIObjectInfo* info);
+</code></synopsis>
+<p>Obtain the number of methods that this object type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of methods</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_properties.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_properties.page
index 3b1a3f12..cb1b65b9 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_properties.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_properties.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.object_info_get_n_properties"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gint</api:type>
+ </api:returns>
+ <api:name>g_object_info_get_n_properties</api:name>
+ <api:arg>
+ <api:type>GIObjectInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_object_info_get_n_properties</title>
-<p>Obtain the number of properties that this object type has.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_object_info_get_n_properties (GIObjectInfo* info);
+</code></synopsis>
+<p>Obtain the number of properties that this object type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of properties</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_signals.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_signals.page
index 95e3d50e..73ae0e99 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_signals.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_signals.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.object_info_get_n_signals"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gint</api:type>
+ </api:returns>
+ <api:name>g_object_info_get_n_signals</api:name>
+ <api:arg>
+ <api:type>GIObjectInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_object_info_get_n_signals</title>
-<p>Obtain the number of signals that this object type has.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_object_info_get_n_signals (GIObjectInfo* info);
+</code></synopsis>
+<p>Obtain the number of signals that this object type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of signals</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_vfuncs.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_vfuncs.page
index 5a016876..4d9bc224 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_vfuncs.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_vfuncs.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.object_info_get_n_vfuncs"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gint</api:type>
+ </api:returns>
+ <api:name>g_object_info_get_n_vfuncs</api:name>
+ <api:arg>
+ <api:type>GIObjectInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_object_info_get_n_vfuncs</title>
-<p>Obtain the number of virtual functions that this object type has.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_object_info_get_n_vfuncs (GIObjectInfo* info);
+</code></synopsis>
+<p>Obtain the number of virtual functions that this object type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of virtual functions</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_parent.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_parent.page
index ea52bca7..158773e8 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_parent.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_parent.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.object_info_get_parent"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIObjectInfo*</api:type>
+ </api:returns>
+ <api:name>g_object_info_get_parent</api:name>
+ <api:arg>
+ <api:type>GIObjectInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_object_info_get_parent</title>
-<p>Obtain the parent of the object type.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIObjectInfo* g_object_info_get_parent (GIObjectInfo* info);
+</code></synopsis>
+<p>Obtain the parent of the object type.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_property.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_property.page
index b827f850..21701c66 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_property.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_property.page
@@ -1,11 +1,47 @@
<?xml version="1.0"?>
+
<page id="GIRepository.object_info_get_property"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIPropertyInfo*</api:type>
+ </api:returns>
+ <api:name>g_object_info_get_property</api:name>
+ <api:arg>
+ <api:type>GIObjectInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gint</api:type>
+ <api:name>n</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_object_info_get_property</title>
-<p>Obtain an object type property at index @n.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIPropertyInfo* g_object_info_get_property (GIObjectInfo* info,
+ gint n);
+</code></synopsis>
+<p>Obtain an object type property at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of property to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.PropertyInfo">GIRepository.PropertyInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_ref_function.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_ref_function.page
index 25d8406a..b0aba2d4 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_ref_function.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_ref_function.page
@@ -1,14 +1,41 @@
<?xml version="1.0"?>
+
<page id="GIRepository.object_info_get_ref_function"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>char*</api:type>
+ </api:returns>
+ <api:name>g_object_info_get_ref_function</api:name>
+ <api:arg>
+ <api:type>GIObjectInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_object_info_get_ref_function</title>
+<synopsis><code mime="text/x-csrc">
+char* g_object_info_get_ref_function (GIObjectInfo* info);
+</code></synopsis>
<p>Obtain the symbol name of the function that should be called to ref this
object type. It's mainly used fundamental types. The type signature for
the symbol is %GIObjectInfoRefFunction, to fetch the function pointer
-see g_object_info_get_ref_function().</p></page>
+see g_object_info_get_ref_function().</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the symbol or %NULL</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_ref_function_pointer.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_ref_function_pointer.page
index 56a3c3db..67263ae0 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_ref_function_pointer.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_ref_function_pointer.page
@@ -1,14 +1,41 @@
<?xml version="1.0"?>
+
<page id="GIRepository.object_info_get_ref_function_pointer"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIObjectInfoRefFunction</api:type>
+ </api:returns>
+ <api:name>g_object_info_get_ref_function_pointer</api:name>
+ <api:arg>
+ <api:type>GIObjectInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_object_info_get_ref_function_pointer</title>
+<synopsis><code mime="text/x-csrc">
+GIObjectInfoRefFunction g_object_info_get_ref_function_pointer (GIObjectInfo* info);
+</code></synopsis>
<p>Obtain a pointer to a function which can be used to
increase the reference count an instance of this object type.
This takes derivation into account and will reversely traverse
-the base classes of this type, starting at the top type.</p></page>
+the base classes of this type, starting at the top type.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the function pointer or %NULL</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_set_value_function.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_set_value_function.page
index 5cdb04c7..950070a4 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_set_value_function.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_set_value_function.page
@@ -1,15 +1,42 @@
<?xml version="1.0"?>
+
<page id="GIRepository.object_info_get_set_value_function"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>char*</api:type>
+ </api:returns>
+ <api:name>g_object_info_get_set_value_function</api:name>
+ <api:arg>
+ <api:type>GIObjectInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_object_info_get_set_value_function</title>
+<synopsis><code mime="text/x-csrc">
+char* g_object_info_get_set_value_function (GIObjectInfo* info);
+</code></synopsis>
<p>Obtain the symbol name of the function that should be called to convert
set a GValue giving an object instance pointer of this object type.
I's mainly used fundamental types. The type signature for the symbol
is %GIObjectInfoSetValueFunction, to fetch the function pointer
-see g_object_info_get_set_value_function().</p></page>
+see g_object_info_get_set_value_function().</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the symbol or %NULL</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_set_value_function_pointer.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_set_value_function_pointer.page
index 0177dbce..442d6020 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_set_value_function_pointer.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_set_value_function_pointer.page
@@ -1,14 +1,41 @@
<?xml version="1.0"?>
+
<page id="GIRepository.object_info_get_set_value_function_pointer"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIObjectInfoSetValueFunction</api:type>
+ </api:returns>
+ <api:name>g_object_info_get_set_value_function_pointer</api:name>
+ <api:arg>
+ <api:type>GIObjectInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_object_info_get_set_value_function_pointer</title>
+<synopsis><code mime="text/x-csrc">
+GIObjectInfoSetValueFunction g_object_info_get_set_value_function_pointer (GIObjectInfo* info);
+</code></synopsis>
<p>Obtain a pointer to a function which can be used to
set a GValue given an instance of this object type.
This takes derivation into account and will reversely traverse
-the base classes of this type, starting at the top type.</p></page>
+the base classes of this type, starting at the top type.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the function pointer or %NULL</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_signal.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_signal.page
index b33d72c9..ed92e254 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_signal.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_signal.page
@@ -1,11 +1,47 @@
<?xml version="1.0"?>
+
<page id="GIRepository.object_info_get_signal"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GISignalInfo*</api:type>
+ </api:returns>
+ <api:name>g_object_info_get_signal</api:name>
+ <api:arg>
+ <api:type>GIObjectInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gint</api:type>
+ <api:name>n</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_object_info_get_signal</title>
-<p>Obtain an object type signal at index @n.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GISignalInfo* g_object_info_get_signal (GIObjectInfo* info,
+ gint n);
+</code></synopsis>
+<p>Obtain an object type signal at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of signal to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.SignalInfo">GIRepository.SignalInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_type_init.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_type_init.page
index 76aa19de..a21b5b3f 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_type_init.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_type_init.page
@@ -1,12 +1,39 @@
<?xml version="1.0"?>
+
<page id="GIRepository.object_info_get_type_init"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gchar*</api:type>
+ </api:returns>
+ <api:name>g_object_info_get_type_init</api:name>
+ <api:arg>
+ <api:type>GIObjectInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_object_info_get_type_init</title>
+<synopsis><code mime="text/x-csrc">
+gchar* g_object_info_get_type_init (GIObjectInfo* info);
+</code></synopsis>
<p>Obtain the function which when called will return the GType
-function for which this object type is registered.</p></page>
+function for which this object type is registered.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the type init function</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_type_name.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_type_name.page
index 89a2a880..a67af92d 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_type_name.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_type_name.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.object_info_get_type_name"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gchar*</api:type>
+ </api:returns>
+ <api:name>g_object_info_get_type_name</api:name>
+ <api:arg>
+ <api:type>GIObjectInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_object_info_get_type_name</title>
-<p>Obtain the name of the objects class/type.</p></page>
+<synopsis><code mime="text/x-csrc">
+gchar* g_object_info_get_type_name (GIObjectInfo* info);
+</code></synopsis>
+<p>Obtain the name of the objects class/type.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>name of the objects type</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_unref_function.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_unref_function.page
index 4597c898..9b3b2f46 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_unref_function.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_unref_function.page
@@ -1,14 +1,41 @@
<?xml version="1.0"?>
+
<page id="GIRepository.object_info_get_unref_function"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>char*</api:type>
+ </api:returns>
+ <api:name>g_object_info_get_unref_function</api:name>
+ <api:arg>
+ <api:type>GIObjectInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_object_info_get_unref_function</title>
+<synopsis><code mime="text/x-csrc">
+char* g_object_info_get_unref_function (GIObjectInfo* info);
+</code></synopsis>
<p>Obtain the symbol name of the function that should be called to unref this
object type. It's mainly used fundamental types. The type signature for
the symbol is %GIObjectInfoUnrefFunction, to fetch the function pointer
-see g_object_info_get_unref_function().</p></page>
+see g_object_info_get_unref_function().</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the symbol or %NULL</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_unref_function_pointer.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_unref_function_pointer.page
index a152b760..775ece37 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_unref_function_pointer.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_unref_function_pointer.page
@@ -1,14 +1,41 @@
<?xml version="1.0"?>
+
<page id="GIRepository.object_info_get_unref_function_pointer"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIObjectInfoUnrefFunction</api:type>
+ </api:returns>
+ <api:name>g_object_info_get_unref_function_pointer</api:name>
+ <api:arg>
+ <api:type>GIObjectInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_object_info_get_unref_function_pointer</title>
+<synopsis><code mime="text/x-csrc">
+GIObjectInfoUnrefFunction g_object_info_get_unref_function_pointer (GIObjectInfo* info);
+</code></synopsis>
<p>Obtain a pointer to a function which can be used to
decrease the reference count an instance of this object type.
This takes derivation into account and will reversely traverse
-the base classes of this type, starting at the top type.</p></page>
+the base classes of this type, starting at the top type.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the function pointer or %NULL</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_vfunc.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_vfunc.page
index fe27e3e2..846fc455 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_vfunc.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_vfunc.page
@@ -1,11 +1,47 @@
<?xml version="1.0"?>
+
<page id="GIRepository.object_info_get_vfunc"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIVFuncInfo*</api:type>
+ </api:returns>
+ <api:name>g_object_info_get_vfunc</api:name>
+ <api:arg>
+ <api:type>GIObjectInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gint</api:type>
+ <api:name>n</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_object_info_get_vfunc</title>
-<p>Obtain an object type virtual function at index @n.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIVFuncInfo* g_object_info_get_vfunc (GIObjectInfo* info,
+ gint n);
+</code></synopsis>
+<p>Obtain an object type virtual function at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of virtual function to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_flags.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_flags.page
index eecc6931..5e41efef 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_flags.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_flags.page
@@ -1,12 +1,39 @@
<?xml version="1.0"?>
+
<page id="GIRepository.property_info_get_flags"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GParamFlags</api:type>
+ </api:returns>
+ <api:name>g_property_info_get_flags</api:name>
+ <api:arg>
+ <api:type>GIPropertyInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_property_info_get_flags</title>
+<synopsis><code mime="text/x-csrc">
+GParamFlags g_property_info_get_flags (GIPropertyInfo* info);
+</code></synopsis>
<p>Obtain the flags for this property info. See <link xref="GParamFags">GParamFags</link> for
-more information about possible flag values.</p></page>
+more information about possible flag values.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.PropertyInfo">GIRepository.PropertyInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the flags</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_ownership_transfer.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_ownership_transfer.page
index fc24387f..990754fb 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_ownership_transfer.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_ownership_transfer.page
@@ -1,12 +1,39 @@
<?xml version="1.0"?>
+
<page id="GIRepository.property_info_get_ownership_transfer"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GITransfer</api:type>
+ </api:returns>
+ <api:name>g_property_info_get_ownership_transfer</api:name>
+ <api:arg>
+ <api:type>GIPropertyInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_property_info_get_ownership_transfer</title>
-<p>Obtain the ownership transfer for this property. See <link xref="GITransfer">GITransfer</link> for more
-information about transfer values.</p></page>
+<synopsis><code mime="text/x-csrc">
+GITransfer g_property_info_get_ownership_transfer (GIPropertyInfo* info);
+</code></synopsis>
+<p>Obtain the ownership transfer for this property. See <link xref="GIRepository.Transfer">GIRepository.Transfer</link> for more
+information about transfer values.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.PropertyInfo">GIRepository.PropertyInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the transfer</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_type.page
index 4f49dbe6..e069cdad 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_type.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.property_info_get_type"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GITypeInfo*</api:type>
+ </api:returns>
+ <api:name>g_property_info_get_type</api:name>
+ <api:arg>
+ <api:type>GIPropertyInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_property_info_get_type</title>
-<p>Obtain the type information for the property @info.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GITypeInfo* g_property_info_get_type (GIPropertyInfo* info);
+</code></synopsis>
+<p>Obtain the type information for the property @info.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.PropertyInfo">GIRepository.PropertyInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>, free it with</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_g_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_g_type.page
index 30098eb7..419336b2 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_g_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_g_type.page
@@ -1,14 +1,41 @@
<?xml version="1.0"?>
+
<page id="GIRepository.registered_type_info_get_g_type"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GType</api:type>
+ </api:returns>
+ <api:name>g_registered_type_info_get_g_type</api:name>
+ <api:arg>
+ <api:type>GIRegisteredTypeInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_registered_type_info_get_g_type</title>
+<synopsis><code mime="text/x-csrc">
+GType g_registered_type_info_get_g_type (GIRegisteredTypeInfo* info);
+</code></synopsis>
<p>Obtain the <link xref="GType">GType</link> for this registered type or G_TYPE_NONE which a special meaning.
It means that either there is no type information associated with this @info or
that the shared library which provides the type_init function for this
-@info cannot be called.</p></page>
+@info cannot be called.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.RegisteredTypeInfo">GIRepository.RegisteredTypeInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GType">GType</link>.</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_type_init.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_type_init.page
index fe71e6b7..b82f0a0f 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_type_init.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_type_init.page
@@ -1,14 +1,41 @@
<?xml version="1.0"?>
+
<page id="GIRepository.registered_type_info_get_type_init"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gchar*</api:type>
+ </api:returns>
+ <api:name>g_registered_type_info_get_type_init</api:name>
+ <api:arg>
+ <api:type>GIRegisteredTypeInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_registered_type_info_get_type_init</title>
+<synopsis><code mime="text/x-csrc">
+gchar* g_registered_type_info_get_type_init (GIRegisteredTypeInfo* info);
+</code></synopsis>
<p>Obtain the type init function for @info. The type init function is the
function which will register the GType within the GObject type system.
Usually this is not called by langauge bindings or applications, use
-g_registered_type_info_get_g_type() directly instead.</p><p>passing into g_module_symbol().</p></page>
+g_registered_type_info_get_g_type() directly instead.</p><p>passing into g_module_symbol().</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.RegisteredTypeInfo">GIRepository.RegisteredTypeInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the symbol name of the type init function, suitable for</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_type_name.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_type_name.page
index a651f7c4..a1765091 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_type_name.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_type_name.page
@@ -1,12 +1,39 @@
<?xml version="1.0"?>
+
<page id="GIRepository.registered_type_info_get_type_name"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gchar*</api:type>
+ </api:returns>
+ <api:name>g_registered_type_info_get_type_name</api:name>
+ <api:arg>
+ <api:type>GIRegisteredTypeInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_registered_type_info_get_type_name</title>
+<synopsis><code mime="text/x-csrc">
+gchar* g_registered_type_info_get_type_name (GIRegisteredTypeInfo* info);
+</code></synopsis>
<p>Obtain the type name of the struct within the GObject type system.
-This type can be passed to g_type_name() to get a <link xref="GType">GType</link>.</p></page>
+This type can be passed to g_type_name() to get a <link xref="GType">GType</link>.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.RegisteredTypeInfo">GIRepository.RegisteredTypeInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the type name</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_get_class_closure.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_get_class_closure.page
index 05a465ac..29534f23 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_get_class_closure.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_get_class_closure.page
@@ -1,13 +1,40 @@
<?xml version="1.0"?>
+
<page id="GIRepository.signal_info_get_class_closure"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIVFuncInfo*</api:type>
+ </api:returns>
+ <api:name>g_signal_info_get_class_closure</api:name>
+ <api:arg>
+ <api:type>GISignalInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_signal_info_get_class_closure</title>
+<synopsis><code mime="text/x-csrc">
+GIVFuncInfo* g_signal_info_get_class_closure (GISignalInfo* info);
+</code></synopsis>
<p>Obtain the class closure for this signal if one is set. The class
closure is a virtual function on the type that the signal belongs to.
-If the signal lacks a closure %NULL will be returned.</p></page>
+If the signal lacks a closure %NULL will be returned.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.SignalInfo">GIRepository.SignalInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the class closure or %NULL</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_get_flags.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_get_flags.page
index 763e4bf9..bbd3180b 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_get_flags.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_get_flags.page
@@ -1,12 +1,39 @@
<?xml version="1.0"?>
+
<page id="GIRepository.signal_info_get_flags"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GSignalFlags</api:type>
+ </api:returns>
+ <api:name>g_signal_info_get_flags</api:name>
+ <api:arg>
+ <api:type>GISignalInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_signal_info_get_flags</title>
+<synopsis><code mime="text/x-csrc">
+GSignalFlags g_signal_info_get_flags (GISignalInfo* info);
+</code></synopsis>
<p>Obtain the flags for this signal info. See <link xref="GSignalFlags">GSignalFlags</link> for
-more information about possible flag values.</p></page>
+more information about possible flag values.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.SignalInfo">GIRepository.SignalInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the flags</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_true_stops_emit.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_true_stops_emit.page
index 02cc1b87..e986f96c 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_true_stops_emit.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_true_stops_emit.page
@@ -1,12 +1,39 @@
<?xml version="1.0"?>
+
<page id="GIRepository.signal_info_true_stops_emit"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gboolean</api:type>
+ </api:returns>
+ <api:name>g_signal_info_true_stops_emit</api:name>
+ <api:arg>
+ <api:type>GISignalInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_signal_info_true_stops_emit</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_signal_info_true_stops_emit (GISignalInfo* info);
+</code></synopsis>
<p>Obtain if the returning true in the signal handler will
-stop the emission of the signal.</p></page>
+stop the emission of the signal.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.SignalInfo">GIRepository.SignalInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if returning true stops the signal emission</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_find_method.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_find_method.page
index 9c446c55..5d7da64c 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_find_method.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_find_method.page
@@ -1,11 +1,47 @@
<?xml version="1.0"?>
+
<page id="GIRepository.struct_info_find_method"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIFunctionInfo*</api:type>
+ </api:returns>
+ <api:name>g_struct_info_find_method</api:name>
+ <api:arg>
+ <api:type>GIStructInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gchar*</api:type>
+ <api:name>name</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_struct_info_find_method</title>
-<p>Obtain the type information for method named @name.</p><p>when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIFunctionInfo* g_struct_info_find_method (GIStructInfo* info,
+ gchar* name);
+</code></synopsis>
+<p>Obtain the type information for method named @name.</p><p>when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>a method name</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>, free it with g_base_info_unref()</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_alignment.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_alignment.page
index 7cb4a806..412b9c27 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_alignment.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_alignment.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.struct_info_get_alignment"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gsize</api:type>
+ </api:returns>
+ <api:name>g_struct_info_get_alignment</api:name>
+ <api:arg>
+ <api:type>GIStructInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_struct_info_get_alignment</title>
-<p>Obtain the required alignment of the structure.</p></page>
+<synopsis><code mime="text/x-csrc">
+gsize g_struct_info_get_alignment (GIStructInfo* info);
+</code></synopsis>
+<p>Obtain the required alignment of the structure.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>required alignment in bytes</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_field.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_field.page
index 5da3e831..7baf0de6 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_field.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_field.page
@@ -1,11 +1,47 @@
<?xml version="1.0"?>
+
<page id="GIRepository.struct_info_get_field"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIFieldInfo*</api:type>
+ </api:returns>
+ <api:name>g_struct_info_get_field</api:name>
+ <api:arg>
+ <api:type>GIStructInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gint</api:type>
+ <api:name>n</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_struct_info_get_field</title>
-<p>Obtain the type information for field with specified index.</p><p>when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIFieldInfo* g_struct_info_get_field (GIStructInfo* info,
+ gint n);
+</code></synopsis>
+<p>Obtain the type information for field with specified index.</p><p>when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>a field index</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link>, free it with g_base_info_unref()</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_method.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_method.page
index 6bbdb1a4..2ef40a5f 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_method.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_method.page
@@ -1,11 +1,47 @@
<?xml version="1.0"?>
+
<page id="GIRepository.struct_info_get_method"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIFunctionInfo*</api:type>
+ </api:returns>
+ <api:name>g_struct_info_get_method</api:name>
+ <api:arg>
+ <api:type>GIStructInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gint</api:type>
+ <api:name>n</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_struct_info_get_method</title>
-<p>Obtain the type information for method with specified index.</p><p>when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIFunctionInfo* g_struct_info_get_method (GIStructInfo* info,
+ gint n);
+</code></synopsis>
+<p>Obtain the type information for method with specified index.</p><p>when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>a method index</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>, free it with g_base_info_unref()</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_n_fields.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_n_fields.page
index 210f747d..ae21e5dc 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_n_fields.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_n_fields.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.struct_info_get_n_fields"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gint</api:type>
+ </api:returns>
+ <api:name>g_struct_info_get_n_fields</api:name>
+ <api:arg>
+ <api:type>GIStructInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_struct_info_get_n_fields</title>
-<p>Obtain the number of fields this structure has.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_struct_info_get_n_fields (GIStructInfo* info);
+</code></synopsis>
+<p>Obtain the number of fields this structure has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of fields</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_n_methods.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_n_methods.page
index 2e1e8739..00ab1074 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_n_methods.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_n_methods.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.struct_info_get_n_methods"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gint</api:type>
+ </api:returns>
+ <api:name>g_struct_info_get_n_methods</api:name>
+ <api:arg>
+ <api:type>GIStructInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_struct_info_get_n_methods</title>
-<p>Obtain the number of methods this structure has.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_struct_info_get_n_methods (GIStructInfo* info);
+</code></synopsis>
+<p>Obtain the number of methods this structure has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of methods</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_size.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_size.page
index 738ce9a1..170bd82e 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_size.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_size.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.struct_info_get_size"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gsize</api:type>
+ </api:returns>
+ <api:name>g_struct_info_get_size</api:name>
+ <api:arg>
+ <api:type>GIStructInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_struct_info_get_size</title>
-<p>Obtain the total size of the structure.</p></page>
+<synopsis><code mime="text/x-csrc">
+gsize g_struct_info_get_size (GIStructInfo* info);
+</code></synopsis>
+<p>Obtain the total size of the structure.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>size of the structure in bytes</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_is_foreign.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_is_foreign.page
index 2b266ef3..4e28d2bb 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_is_foreign.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_is_foreign.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.struct_info_is_foreign"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gboolean</api:type>
+ </api:returns>
+ <api:name>g_struct_info_is_foreign</api:name>
+ <api:arg>
+ <api:type>GIStructInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_struct_info_is_foreign</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_struct_info_is_foreign (GIStructInfo* info);
+</code></synopsis>
+
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_is_gtype_struct.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_is_gtype_struct.page
index 3555b8e2..7a42b85c 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_is_gtype_struct.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_is_gtype_struct.page
@@ -1,13 +1,40 @@
<?xml version="1.0"?>
+
<page id="GIRepository.struct_info_is_gtype_struct"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gboolean</api:type>
+ </api:returns>
+ <api:name>g_struct_info_is_gtype_struct</api:name>
+ <api:arg>
+ <api:type>GIStructInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_struct_info_is_gtype_struct</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_struct_info_is_gtype_struct (GIStructInfo* info);
+</code></synopsis>
<p>Return true if this structure represents the "class structure" for some
<link xref="GObject">GObject</link> or <link xref="GInterface">GInterface</link>. This function is mainly useful to hide this kind of structure
-from generated public APIs.</p></page>
+from generated public APIs.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if this is a class struct, %FALSE otherwise</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_fixed_size.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_fixed_size.page
index 8598d54d..def200be 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_fixed_size.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_fixed_size.page
@@ -1,12 +1,39 @@
<?xml version="1.0"?>
+
<page id="GIRepository.type_info_get_array_fixed_size"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gint</api:type>
+ </api:returns>
+ <api:name>g_type_info_get_array_fixed_size</api:name>
+ <api:arg>
+ <api:type>GITypeInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_type_info_get_array_fixed_size</title>
+<synopsis><code mime="text/x-csrc">
+gint g_type_info_get_array_fixed_size (GITypeInfo* info);
+</code></synopsis>
<p>Obtain the fixed array size of the type. The type tag must be a
-<link xref="GI_TYPE_TAG_ARRAY">GI_TYPE_TAG_ARRAY</link> or -1 will returned.</p></page>
+<link xref="GI_TYPE_TAG_ARRAY">GI_TYPE_TAG_ARRAY</link> or -1 will returned.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the size or -1 if it's not an array</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_length.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_length.page
index b091016b..bcd94a74 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_length.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_length.page
@@ -1,12 +1,39 @@
<?xml version="1.0"?>
+
<page id="GIRepository.type_info_get_array_length"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gint</api:type>
+ </api:returns>
+ <api:name>g_type_info_get_array_length</api:name>
+ <api:arg>
+ <api:type>GITypeInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_type_info_get_array_length</title>
+<synopsis><code mime="text/x-csrc">
+gint g_type_info_get_array_length (GITypeInfo* info);
+</code></synopsis>
<p>Obtain the array length of the type. The type tag must be a
-<link xref="GI_TYPE_TAG_ARRAY">GI_TYPE_TAG_ARRAY</link> or -1 will returned.</p></page>
+<link xref="GI_TYPE_TAG_ARRAY">GI_TYPE_TAG_ARRAY</link> or -1 will returned.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the array length, or -1 if the type is not an array</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_type.page
index 17f87f21..29e33110 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_type.page
@@ -1,13 +1,40 @@
<?xml version="1.0"?>
+
<page id="GIRepository.type_info_get_array_type"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIArrayType</api:type>
+ </api:returns>
+ <api:name>g_type_info_get_array_type</api:name>
+ <api:arg>
+ <api:type>GITypeInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_type_info_get_array_type</title>
-<p>Obtain the array type for this type. See <link xref="GIArrayType">GIArrayType</link> for a list of
+<synopsis><code mime="text/x-csrc">
+GIArrayType g_type_info_get_array_type (GITypeInfo* info);
+</code></synopsis>
+<p>Obtain the array type for this type. See <link xref="GIRepository.ArrayType">GIRepository.ArrayType</link> for a list of
possible values. If the type tag of this type is not array, -1 will be
-returned.</p></page>
+returned.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the array type or -1</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_interface.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_interface.page
index b12793b2..69d95e3f 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_interface.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_interface.page
@@ -1,14 +1,41 @@
<?xml version="1.0"?>
+
<page id="GIRepository.type_info_get_interface"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIBaseInfo*</api:type>
+ </api:returns>
+ <api:name>g_type_info_get_interface</api:name>
+ <api:arg>
+ <api:type>GITypeInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_type_info_get_interface</title>
+<synopsis><code mime="text/x-csrc">
+GIBaseInfo* g_type_info_get_interface (GITypeInfo* info);
+</code></synopsis>
<p>For types which have <link xref="GI_TYPE_TAG_INTERFACE">GI_TYPE_TAG_INTERFACE</link> such as GObjects and boxed values,
this function returns full information about the referenced type. You can then
-inspect the type of the returned <link xref="GIBaseInfo">GIBaseInfo</link> to further query whether it is
-a concrete GObject, a GInterface, a structure, etc. using g_base_info_get_type().</p><p>g_base_info_unref() when done.</p></page>
+inspect the type of the returned <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> to further query whether it is
+a concrete GObject, a GInterface, a structure, etc. using g_base_info_get_type().</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link>, or %NULL. Free it with</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_param_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_param_type.page
index e657da53..1e174ed4 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_param_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_param_type.page
@@ -1,11 +1,47 @@
<?xml version="1.0"?>
+
<page id="GIRepository.type_info_get_param_type"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GITypeInfo*</api:type>
+ </api:returns>
+ <api:name>g_type_info_get_param_type</api:name>
+ <api:arg>
+ <api:type>GITypeInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gint</api:type>
+ <api:name>n</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_type_info_get_param_type</title>
-<p>Obtain the parameter type @n.</p></page>
+<synopsis><code mime="text/x-csrc">
+GITypeInfo* g_type_info_get_param_type (GITypeInfo* info,
+ gint n);
+</code></synopsis>
+<p>Obtain the parameter type @n.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of the parameter</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the param type info</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_tag.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_tag.page
index 6d5b4003..aaa367f0 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_tag.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_tag.page
@@ -1,12 +1,39 @@
<?xml version="1.0"?>
+
<page id="GIRepository.type_info_get_tag"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GITypeTag</api:type>
+ </api:returns>
+ <api:name>g_type_info_get_tag</api:name>
+ <api:arg>
+ <api:type>GITypeInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_type_info_get_tag</title>
-<p>Obtain the type tag for the type. See <link xref="GITypeTag">GITypeTag</link> for a list
-of type tags.</p></page>
+<synopsis><code mime="text/x-csrc">
+GITypeTag g_type_info_get_tag (GITypeInfo* info);
+</code></synopsis>
+<p>Obtain the type tag for the type. See <link xref="GIRepository.TypeTag">GIRepository.TypeTag</link> for a list
+of type tags.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the type tag</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_is_pointer.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_is_pointer.page
index 89b3e45c..00129c25 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_is_pointer.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_is_pointer.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.type_info_is_pointer"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gboolean</api:type>
+ </api:returns>
+ <api:name>g_type_info_is_pointer</api:name>
+ <api:arg>
+ <api:type>GITypeInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_type_info_is_pointer</title>
-<p>Obtain if the type is passed as a reference.</p></page>
+<synopsis><code mime="text/x-csrc">
+gboolean g_type_info_is_pointer (GITypeInfo* info);
+</code></synopsis>
+<p>Obtain if the type is passed as a reference.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if it is a pointer</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_is_zero_terminated.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_is_zero_terminated.page
index c0d8afcc..674f446f 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_is_zero_terminated.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_is_zero_terminated.page
@@ -1,12 +1,39 @@
<?xml version="1.0"?>
+
<page id="GIRepository.type_info_is_zero_terminated"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gboolean</api:type>
+ </api:returns>
+ <api:name>g_type_info_is_zero_terminated</api:name>
+ <api:arg>
+ <api:type>GITypeInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_type_info_is_zero_terminated</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_type_info_is_zero_terminated (GITypeInfo* info);
+</code></synopsis>
<p>Obtain if the last element of the array is %NULL. The type tag must be a
-<link xref="GI_TYPE_TAG_ARRAY">GI_TYPE_TAG_ARRAY</link> or %FALSE will returned.</p></page>
+<link xref="GI_TYPE_TAG_ARRAY">GI_TYPE_TAG_ARRAY</link> or %FALSE will returned.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if zero terminated</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_tag_to_string.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_tag_to_string.page
index 82877848..03dc316c 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_tag_to_string.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_tag_to_string.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.type_tag_to_string"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gchar*</api:type>
+ </api:returns>
+ <api:name>g_type_tag_to_string</api:name>
+ <api:arg>
+ <api:type>GITypeTag</api:type>
+ <api:name>type</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_type_tag_to_string</title>
-<p>Obtain a string representation of @type</p></page>
+<synopsis><code mime="text/x-csrc">
+gchar* g_type_tag_to_string (GITypeTag type);
+</code></synopsis>
+<p>Obtain a string representation of @type</p>
+
+<table>
+<tr>
+<td><p>type :</p></td>
+<td><p>the type_tag</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the string</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_find_method.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_find_method.page
index 991ae89c..3d88c323 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_find_method.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_find_method.page
@@ -1,11 +1,47 @@
<?xml version="1.0"?>
+
<page id="GIRepository.union_info_find_method"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIFunctionInfo*</api:type>
+ </api:returns>
+ <api:name>g_union_info_find_method</api:name>
+ <api:arg>
+ <api:type>GIUnionInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gchar*</api:type>
+ <api:name>name</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_union_info_find_method</title>
-<p>Obtain the type information for method named @name.</p><p>when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIFunctionInfo* g_union_info_find_method (GIUnionInfo* info,
+ gchar* name);
+</code></synopsis>
+<p>Obtain the type information for method named @name.</p><p>when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>a method name</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>, free it with g_base_info_unref()</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_alignment.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_alignment.page
index 25fc4d88..c88852ab 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_alignment.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_alignment.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.union_info_get_alignment"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gsize</api:type>
+ </api:returns>
+ <api:name>g_union_info_get_alignment</api:name>
+ <api:arg>
+ <api:type>GIUnionInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_union_info_get_alignment</title>
-<p>Obtain the required alignment of the union.</p></page>
+<synopsis><code mime="text/x-csrc">
+gsize g_union_info_get_alignment (GIUnionInfo* info);
+</code></synopsis>
+<p>Obtain the required alignment of the union.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>required alignment in bytes</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator.page
index 974a1cba..9cc0106a 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator.page
@@ -1,13 +1,49 @@
<?xml version="1.0"?>
+
<page id="GIRepository.union_info_get_discriminator"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIConstantInfo*</api:type>
+ </api:returns>
+ <api:name>g_union_info_get_discriminator</api:name>
+ <api:arg>
+ <api:type>GIUnionInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gint</api:type>
+ <api:name>n</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_union_info_get_discriminator</title>
+<synopsis><code mime="text/x-csrc">
+GIConstantInfo* g_union_info_get_discriminator (GIUnionInfo* info,
+ gint n);
+</code></synopsis>
<p>Obtain discriminator value assigned for n-th union field, i.e. n-th
union field is the active one if discriminator contains this
-constant.</p><p>when done.</p></page>
+constant.</p><p>when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>a union field index</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link>, free it with g_base_info_unref()</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator_offset.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator_offset.page
index 9fa8c0e0..7d4b75f3 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator_offset.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator_offset.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.union_info_get_discriminator_offset"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gint</api:type>
+ </api:returns>
+ <api:name>g_union_info_get_discriminator_offset</api:name>
+ <api:arg>
+ <api:type>GIUnionInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_union_info_get_discriminator_offset</title>
+<synopsis><code mime="text/x-csrc">
+gint g_union_info_get_discriminator_offset (GIUnionInfo* info);
+</code></synopsis>
+
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator_type.page
index 2e31022b..f51155c1 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator_type.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.union_info_get_discriminator_type"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GITypeInfo*</api:type>
+ </api:returns>
+ <api:name>g_union_info_get_discriminator_type</api:name>
+ <api:arg>
+ <api:type>GIUnionInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_union_info_get_discriminator_type</title>
-<p>Obtain the type information of the union discriminator.</p><p>when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GITypeInfo* g_union_info_get_discriminator_type (GIUnionInfo* info);
+</code></synopsis>
+<p>Obtain the type information of the union discriminator.</p><p>when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>, free it with g_base_info_unref()</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_field.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_field.page
index 77ff25a5..a9a03d09 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_field.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_field.page
@@ -1,11 +1,47 @@
<?xml version="1.0"?>
+
<page id="GIRepository.union_info_get_field"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIFieldInfo*</api:type>
+ </api:returns>
+ <api:name>g_union_info_get_field</api:name>
+ <api:arg>
+ <api:type>GIUnionInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gint</api:type>
+ <api:name>n</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_union_info_get_field</title>
-<p>Obtain the type information for field with specified index.</p><p>when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIFieldInfo* g_union_info_get_field (GIUnionInfo* info,
+ gint n);
+</code></synopsis>
+<p>Obtain the type information for field with specified index.</p><p>when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>a field index</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link>, free it with g_base_info_unref()</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_method.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_method.page
index bb541325..8c08e549 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_method.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_method.page
@@ -1,11 +1,47 @@
<?xml version="1.0"?>
+
<page id="GIRepository.union_info_get_method"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIFunctionInfo*</api:type>
+ </api:returns>
+ <api:name>g_union_info_get_method</api:name>
+ <api:arg>
+ <api:type>GIUnionInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>gint</api:type>
+ <api:name>n</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_union_info_get_method</title>
-<p>Obtain the type information for method with specified index.</p><p>when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIFunctionInfo* g_union_info_get_method (GIUnionInfo* info,
+ gint n);
+</code></synopsis>
+<p>Obtain the type information for method with specified index.</p><p>when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>a method index</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>, free it with g_base_info_unref()</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_n_fields.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_n_fields.page
index 10e14728..e3cd6d41 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_n_fields.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_n_fields.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.union_info_get_n_fields"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gint</api:type>
+ </api:returns>
+ <api:name>g_union_info_get_n_fields</api:name>
+ <api:arg>
+ <api:type>GIUnionInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_union_info_get_n_fields</title>
-<p>Obtain the number of fields this union has.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_union_info_get_n_fields (GIUnionInfo* info);
+</code></synopsis>
+<p>Obtain the number of fields this union has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of fields</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_n_methods.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_n_methods.page
index 3c4b319e..ec10c17b 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_n_methods.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_n_methods.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.union_info_get_n_methods"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gint</api:type>
+ </api:returns>
+ <api:name>g_union_info_get_n_methods</api:name>
+ <api:arg>
+ <api:type>GIUnionInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_union_info_get_n_methods</title>
-<p>Obtain the number of methods this union has.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_union_info_get_n_methods (GIUnionInfo* info);
+</code></synopsis>
+<p>Obtain the number of methods this union has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of methods</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_size.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_size.page
index 3644d37b..e5aa879d 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_size.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_size.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.union_info_get_size"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gsize</api:type>
+ </api:returns>
+ <api:name>g_union_info_get_size</api:name>
+ <api:arg>
+ <api:type>GIUnionInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_union_info_get_size</title>
-<p>Obtain the total size of the union.</p></page>
+<synopsis><code mime="text/x-csrc">
+gsize g_union_info_get_size (GIUnionInfo* info);
+</code></synopsis>
+<p>Obtain the total size of the union.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>size of the union in bytes</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_is_discriminated.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_is_discriminated.page
index 934cd89e..5c46a467 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_is_discriminated.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_is_discriminated.page
@@ -1,11 +1,38 @@
<?xml version="1.0"?>
+
<page id="GIRepository.union_info_is_discriminated"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gboolean</api:type>
+ </api:returns>
+ <api:name>g_union_info_is_discriminated</api:name>
+ <api:arg>
+ <api:type>GIUnionInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_union_info_is_discriminated</title>
-<p>Return true if this union contains discriminator field.</p></page>
+<synopsis><code mime="text/x-csrc">
+gboolean g_union_info_is_discriminated (GIUnionInfo* info);
+</code></synopsis>
+<p>Return true if this union contains discriminator field.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if this is a discriminated union, %FALSE otherwise</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.value_info_get_value.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.value_info_get_value.page
index 2c63b170..637db67b 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.value_info_get_value.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.value_info_get_value.page
@@ -1,12 +1,39 @@
<?xml version="1.0"?>
+
<page id="GIRepository.value_info_get_value"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gint64</api:type>
+ </api:returns>
+ <api:name>g_value_info_get_value</api:name>
+ <api:arg>
+ <api:type>GIValueInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_value_info_get_value</title>
-<p>Obtain the enumeration value of the <link xref="GIValueInfo">GIValueInfo</link>.</p><p>as a 32-bit signed or unsigned value. The use of gint64 as the
-return type is to allow both.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint64 g_value_info_get_value (GIValueInfo* info);
+</code></synopsis>
+<p>Obtain the enumeration value of the <link xref="GIRepository.ValueInfo">GIRepository.ValueInfo</link>.</p><p>as a 32-bit signed or unsigned value. The use of gint64 as the
+return type is to allow both.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ValueInfo">GIRepository.ValueInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the enumeration value. This will always be representable</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_address.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_address.page
index e0a94e3f..750128ed 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_address.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_address.page
@@ -1,12 +1,48 @@
<?xml version="1.0"?>
+
<page id="GIRepository.vfunc_info_get_address"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gpointer</api:type>
+ </api:returns>
+ <api:name>g_vfunc_info_get_address</api:name>
+ <api:arg>
+ <api:type>GIVFuncInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>GType</api:type>
+ <api:name>implementor_gtype</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_vfunc_info_get_address</title>
+<synopsis><code mime="text/x-csrc">
+gpointer g_vfunc_info_get_address (GIVFuncInfo* info,
+ GType implementor_gtype);
+</code></synopsis>
<p>This method will look up where inside the type struct of @implementor_gtype
-is the implementation for @info.</p></page>
+is the implementation for @info.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link></p></td>
+</tr>
+<tr>
+<td><p>implementor_gtype :</p></td>
+<td><p><link xref="GType">GType</link> implementing this virtual function</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>address to a function or %NULL if an error happened</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_flags.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_flags.page
index 46b3ad20..d6eafd9b 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_flags.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_flags.page
@@ -1,12 +1,39 @@
<?xml version="1.0"?>
+
<page id="GIRepository.vfunc_info_get_flags"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIVFuncInfoFlags</api:type>
+ </api:returns>
+ <api:name>g_vfunc_info_get_flags</api:name>
+ <api:arg>
+ <api:type>GIVFuncInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_vfunc_info_get_flags</title>
-<p>Obtain the flags for this virtual function info. See <link xref="GIVFuncInfoFlags">GIVFuncInfoFlags</link> for
-more information about possible flag values.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIVFuncInfoFlags g_vfunc_info_get_flags (GIVFuncInfo* info);
+</code></synopsis>
+<p>Obtain the flags for this virtual function info. See <link xref="GIRepository.VFuncInfoFlags">GIRepository.VFuncInfoFlags</link> for
+more information about possible flag values.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the flags</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_invoker.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_invoker.page
index 117e9e29..d0550f30 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_invoker.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_invoker.page
@@ -1,12 +1,39 @@
<?xml version="1.0"?>
+
<page id="GIRepository.vfunc_info_get_invoker"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GIFunctionInfo*</api:type>
+ </api:returns>
+ <api:name>g_vfunc_info_get_invoker</api:name>
+ <api:arg>
+ <api:type>GIVFuncInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_vfunc_info_get_invoker</title>
+<synopsis><code mime="text/x-csrc">
+GIFunctionInfo* g_vfunc_info_get_invoker (GIVFuncInfo* info);
+</code></synopsis>
<p>If this virtual function has an associated invoker method, this
-method will return it. An invoker method is a C entry point.</p><p>Not all virtuals will have invokers.</p><p>g_base_info_unref() when done.</p></page>
+method will return it. An invoker method is a C entry point.</p><p>Not all virtuals will have invokers.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link> or %NULL. Free it with</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_offset.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_offset.page
index f5bc5f4e..f6423d8f 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_offset.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_offset.page
@@ -1,12 +1,39 @@
<?xml version="1.0"?>
+
<page id="GIRepository.vfunc_info_get_offset"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gint</api:type>
+ </api:returns>
+ <api:name>g_vfunc_info_get_offset</api:name>
+ <api:arg>
+ <api:type>GIVFuncInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_vfunc_info_get_offset</title>
+<synopsis><code mime="text/x-csrc">
+gint g_vfunc_info_get_offset (GIVFuncInfo* info);
+</code></synopsis>
<p>Obtain the offset of the function pointer in the class struct. The value
-0xFFFF indicates that the struct offset is unknown.</p></page>
+0xFFFF indicates that the struct offset is unknown.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the struct offset or 0xFFFF if it's unknown</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_signal.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_signal.page
index 4a454563..2ae55cd1 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_signal.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_signal.page
@@ -1,13 +1,40 @@
<?xml version="1.0"?>
+
<page id="GIRepository.vfunc_info_get_signal"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>GISignalInfo*</api:type>
+ </api:returns>
+ <api:name>g_vfunc_info_get_signal</api:name>
+ <api:arg>
+ <api:type>GIVFuncInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_vfunc_info_get_signal</title>
+<synopsis><code mime="text/x-csrc">
+GISignalInfo* g_vfunc_info_get_signal (GIVFuncInfo* info);
+</code></synopsis>
<p>Obtain the signal for the virtual function if one is set.
The signal comes from the object or interface to which
-this virtual function belongs.</p></page>
+this virtual function belongs.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the signal or %NULL if none set</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_invoke.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_invoke.page
index 3df88419..b12d431b 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_invoke.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_invoke.page
@@ -1,13 +1,94 @@
<?xml version="1.0"?>
+
<page id="GIRepository.vfunc_info_invoke"
type="topic"
style="function"
xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
<link type="guide" xref="index" group="function"/>
+ <api:function>
+ <api:returns>
+ <api:type>gboolean</api:type>
+ </api:returns>
+ <api:name>g_vfunc_info_invoke</api:name>
+ <api:arg>
+ <api:type>GIVFuncInfo*</api:type>
+ <api:name>info</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>GType</api:type>
+ <api:name>implementor</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>GIArgument*</api:type>
+ <api:name>in_args</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>int</api:type>
+ <api:name>n_in_args</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>GIArgument*</api:type>
+ <api:name>out_args</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>int</api:type>
+ <api:name>n_out_args</api:name>
+ </api:arg>
+ <api:arg>
+ <api:type>GIArgument*</api:type>
+ <api:name>return_value</api:name>
+ </api:arg>
+ </api:function>
</info>
<title>g_vfunc_info_invoke</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_vfunc_info_invoke (GIVFuncInfo* info,
+ GType implementor,
+ GIArgument* in_args,
+ int n_in_args,
+ GIArgument* out_args,
+ int n_out_args,
+ GIArgument* return_value);
+</code></synopsis>
<p>Invokes the function described in @info with the given
arguments. Note that inout parameters must appear in both
-argument lists.</p><p>error occurred.</p></page>
+argument lists.</p><p>error occurred.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link> describing the virtual function to invoke</p></td>
+</tr>
+<tr>
+<td><p>implementor :</p></td>
+<td><p><link xref="GType">GType</link> of the type that implements this virtual function</p></td>
+</tr>
+<tr>
+<td><p>in_args :</p></td>
+<td><p>an array of <link xref="GIArgument">GIArgument</link>&lt;!-- --&gt;s, one for each in parameter of @info. If there are no in parameter, @in_args can be %NULL</p></td>
+</tr>
+<tr>
+<td><p>n_in_args :</p></td>
+<td><p>the length of the @in_args array</p></td>
+</tr>
+<tr>
+<td><p>out_args :</p></td>
+<td><p>an array of <link xref="GIArgument">GIArgument</link>&lt;!-- --&gt;s, one for each out parameter of @info. If there are no out parameters, @out_args may be %NULL</p></td>
+</tr>
+<tr>
+<td><p>n_out_args :</p></td>
+<td><p>the length of the @out_args array</p></td>
+</tr>
+<tr>
+<td><p>return_value :</p></td>
+<td><p>return location for the return value of the function. If the function returns void, @return_value may be %NULL</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if the function has been invoked, %FALSE if an</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/index.page b/tests/doctool/GIRepository-2.0-C-expected/index.page
index badacf05..c1ce06a6 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/index.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/index.page
@@ -7,13 +7,13 @@
<info>
</info>
<title>GIRepository Documentation</title>
- <links type="topic" ui:expanded="yes" groups="class">
+ <links type="topic" ui:expanded="yes" groups="class" style="linklist">
<title>Classes</title>
</links>
- <links type="topic" ui:expanded="yes" groups="function">
+ <links type="topic" ui:expanded="yes" groups="function" style="linklist">
<title>Functions</title>
</links>
- <links type="topic" ui:expanded="yes" groups="#first #default #last">
+ <links type="topic" ui:expanded="yes" groups="#first #default #last" style="linklist">
<title>Other</title>
</links>
</page>