[gobject-introspection] doctool: Fix use of <dl> tag in templates
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection] doctool: Fix use of <dl> tag in templates
- Date: Fri, 15 Feb 2013 04:38:55 +0000 (UTC)
commit 3b64a2e808ae25b437c30bec237ada89dc4bcfb3
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Thu Feb 14 22:47:10 2013 -0500
doctool: Fix use of <dl> tag in templates
This isn't legal Mallard
giscanner/doctemplates/C/function.tmpl | 16 +++--
giscanner/doctemplates/Gjs/enum.tmpl | 10 ++-
giscanner/doctemplates/Gjs/function.tmpl | 16 +++--
giscanner/doctemplates/Gjs/signal.tmpl | 34 +++++++----
giscanner/doctemplates/Gjs/vfunc.tmpl | 16 +++--
giscanner/doctemplates/Python/enum.tmpl | 10 ++-
giscanner/doctemplates/Python/function.tmpl | 16 +++--
giscanner/doctemplates/Python/signal.tmpl | 33 ++++++----
giscanner/doctemplates/Python/vfunc.tmpl | 16 +++--
.../Regress.AnnotationObject-attribute-signal.page | 22 ++++---
...ess.AnnotationObject-doc-empty-arg-parsing.page | 16 +++--
.../Regress.AnnotationObject-list-signal.page | 16 +++--
.../Regress.AnnotationObject-string-signal.page | 16 +++--
.../Regress.AnnotationObject.allow_none.page | 22 ++++---
.../Regress.AnnotationObject.calleeowns.page | 22 ++++---
.../Regress.AnnotationObject.calleesowns.page | 28 ++++++---
.../Regress.AnnotationObject.compute_sum.page | 22 ++++---
.../Regress.AnnotationObject.compute_sum_n.page | 28 ++++++---
.../Regress.AnnotationObject.compute_sum_nz.page | 28 ++++++---
.../Regress.AnnotationObject.create_object.page | 16 +++--
.../Regress.AnnotationObject.do_not_use.page | 16 +++--
.../Regress.AnnotationObject.extra_annos.page | 16 +++--
.../Regress.AnnotationObject.foreach.page | 28 ++++++---
.../Regress.AnnotationObject.get_hash.page | 16 +++--
.../Regress.AnnotationObject.get_objects.page | 16 +++--
.../Regress.AnnotationObject.get_strings.page | 16 +++--
.../Regress.AnnotationObject.hidden_self.page | 16 +++--
.../Regress.AnnotationObject.in.page | 22 ++++---
.../Regress.AnnotationObject.inout.page | 22 ++++---
.../Regress.AnnotationObject.inout2.page | 22 ++++---
.../Regress.AnnotationObject.inout3.page | 22 ++++---
.../Regress.AnnotationObject.method.page | 16 +++--
.../Regress.AnnotationObject.notrans.page | 16 +++--
.../Regress.AnnotationObject.out.page | 22 ++++---
.../Regress.AnnotationObject.parse_args.page | 28 ++++++---
.../Regress.AnnotationObject.set_data.page | 28 ++++++---
.../Regress.AnnotationObject.set_data2.page | 28 ++++++---
.../Regress.AnnotationObject.set_data3.page | 28 ++++++---
.../Regress.AnnotationObject.string_out.page | 22 ++++---
.../Regress.AnnotationObject.use_buffer.page | 22 ++++---
.../Regress.AnnotationObject.watch.page | 28 ++++++---
.../Regress.AnnotationObject.watch_full.page | 34 +++++++----
.../Regress.AnnotationObject.with_voidp.page | 22 ++++---
.../Regress.FooBRect.add.page | 22 ++++---
.../Regress.FooBRect.new.page | 22 ++++---
.../Regress.FooBoxed.method.page | 16 +++--
.../Regress.FooBoxed.new.page | 10 ++-
.../Regress.FooBuffer.some_method.page | 16 +++--
.../Regress.FooDBusData.method.page | 16 +++--
.../Regress.FooForeignStruct.copy.page | 16 +++--
.../Regress.FooForeignStruct.new.page | 10 ++-
.../Regress.FooInterface-do_regress_foo.page | 22 ++++---
.../Regress.FooInterface.do_regress_foo.page | 22 ++++---
.../Regress.FooInterface.static_method.page | 16 +++--
.../Regress.FooObject-read_fn.page | 28 ++++++---
.../Regress.FooObject-signal.page | 22 ++++---
.../Regress.FooObject-virtual_method.page | 22 ++++---
.../Regress.FooObject.a_global_method.page | 16 +++--
.../Regress.FooObject.append_new_stack_layer.page | 22 ++++---
.../Regress.FooObject.dup_name.page | 16 +++--
.../Regress.FooObject.external_type.page | 16 +++--
.../Regress.FooObject.get_default.page | 10 ++-
.../Regress.FooObject.get_name.page | 16 +++--
.../Regress.FooObject.handle_glyph.page | 22 ++++---
.../Regress.FooObject.is_it_time_yet.page | 22 ++++---
.../Regress.FooObject.new.page | 10 ++-
.../Regress.FooObject.new_as_super.page | 10 ++-
.../Regress.FooObject.new_cookie.page | 22 ++++---
.../Regress.FooObject.read.page | 28 ++++++---
.../Regress.FooObject.skipped_method.page | 16 +++--
.../Regress.FooObject.static_meth.page | 10 ++-
.../Regress.FooObject.take_all.page | 28 ++++++---
.../Regress.FooObject.various.page | 28 ++++++---
.../Regress.FooObject.virtual_method.page | 22 ++++---
.../Regress.FooRectangle.add.page | 22 ++++---
.../Regress.FooRectangle.new.page | 34 +++++++----
.../Regress.FooSubInterface-destroy-event.page | 10 ++-
.../Regress.FooSubInterface-destroy_event.page | 16 +++--
.../Regress.FooSubInterface-do_bar.page | 16 +++--
.../Regress.FooSubInterface-do_baz.page | 28 ++++++---
.../Regress.FooSubInterface.do_bar.page | 16 +++--
.../Regress.FooSubInterface.do_baz.page | 28 ++++++---
.../Regress.FooSubobject.new.page | 10 ++-
.../Regress.TestBoxed.copy.page | 16 +++--
.../Regress.TestBoxed.equals.page | 22 ++++---
.../Regress.TestBoxed.new.page | 10 ++-
...ess.TestBoxed.new_alternative_constructor1.page | 16 +++--
...ess.TestBoxed.new_alternative_constructor2.page | 22 ++++---
...ess.TestBoxed.new_alternative_constructor3.page | 16 +++--
.../Regress.TestBoxedB.copy.page | 16 +++--
.../Regress.TestBoxedB.new.page | 22 ++++---
.../Regress.TestBoxedC.new.page | 10 ++-
.../Regress.TestBoxedD.copy.page | 16 +++--
.../Regress.TestBoxedD.free.page | 16 +++--
.../Regress.TestBoxedD.get_magic.page | 16 +++--
.../Regress.TestBoxedD.new.page | 22 ++++---
.../Regress.TestFloating.new.page | 10 ++-
.../Regress.TestFundamentalObject.ref.page | 16 +++--
.../Regress.TestFundamentalObject.unref.page | 16 +++--
.../Regress.TestFundamentalSubObject.new.page | 16 +++--
.../Regress.TestInheritDrawable.do_foo.page | 22 ++++---
...ess.TestInheritDrawable.do_foo_maybe_throw.page | 22 ++++---
.../Regress.TestInheritDrawable.get_origin.page | 28 ++++++---
.../Regress.TestInheritDrawable.get_size.page | 28 ++++++---
.../Regress.TestObj-all.page | 10 ++-
.../Regress.TestObj-allow_none_vfunc.page | 22 ++++---
.../Regress.TestObj-cleanup.page | 10 ++-
.../Regress.TestObj-first.page | 10 ++-
.../Regress.TestObj-matrix.page | 22 ++++---
.../Regress.TestObj-sig-with-array-prop.page | 16 +++--
.../Regress.TestObj-sig-with-foreign-struct.page | 16 +++--
.../Regress.TestObj-sig-with-hash-prop.page | 16 +++--
.../Regress.TestObj-sig-with-int64-prop.page | 16 +++--
.../Regress.TestObj-sig-with-intarray-ret.page | 16 +++--
.../Regress.TestObj-sig-with-obj.page | 16 +++--
.../Regress.TestObj-sig-with-strv.page | 16 +++--
.../Regress.TestObj-sig-with-uint64-prop.page | 16 +++--
...Regress.TestObj-test-with-static-scope-arg.page | 16 +++--
.../Regress.TestObj-test.page | 10 ++-
.../Regress.TestObj.constructor.page | 10 ++-
.../Regress.TestObj.do_matrix.page | 22 ++++---
...gress.TestObj.emit_sig_with_foreign_struct.page | 16 +++--
.../Regress.TestObj.emit_sig_with_int64.page | 16 +++--
.../Regress.TestObj.emit_sig_with_obj.page | 16 +++--
.../Regress.TestObj.emit_sig_with_uint64.page | 16 +++--
.../Regress.TestObj.forced_method.page | 16 +++--
.../Regress.TestObj.instance_method.page | 16 +++--
.../Regress.TestObj.instance_method_callback.page | 22 ++++---
.../Regress.TestObj.new.page | 16 +++--
.../Regress.TestObj.new_callback.page | 28 ++++++---
.../Regress.TestObj.new_from_file.page | 16 +++--
.../Regress.TestObj.null_out.page | 16 +++--
.../Regress.TestObj.set_bare.page | 22 ++++---
.../Regress.TestObj.skip_inout_param.page | 58 ++++++++++++------
.../Regress.TestObj.skip_out_param.page | 58 ++++++++++++------
.../Regress.TestObj.skip_param.page | 58 ++++++++++++------
.../Regress.TestObj.skip_return_val.page | 58 ++++++++++++------
.../Regress.TestObj.skip_return_val_no_out.page | 22 ++++---
.../Regress.TestObj.static_method.page | 16 +++--
.../Regress.TestObj.static_method_callback.page | 16 +++--
.../Regress.TestObj.torture_signature_0.page | 52 ++++++++++------
.../Regress.TestObj.torture_signature_1.page | 52 ++++++++++------
.../Regress.TestSimpleBoxedA.const_return.page | 10 ++-
.../Regress.TestSimpleBoxedA.copy.page | 16 +++--
.../Regress.TestSimpleBoxedA.equals.page | 22 ++++---
.../Regress.TestSimpleBoxedB.copy.page | 16 +++--
.../Regress.TestStructA.clone.page | 22 ++++---
.../Regress.TestStructA.parse.page | 22 ++++---
.../Regress.TestStructB.clone.page | 22 ++++---
.../Regress.TestStructFixedArray.frob.page | 16 +++--
.../Regress.TestSubObj.instance_method.page | 16 +++--
.../Regress.TestSubObj.new.page | 10 ++-
.../Regress.TestSubObj.unset_bare.page | 16 +++--
.../Regress.TestWi8021x.get_testbool.page | 16 +++--
.../Regress.TestWi8021x.new.page | 10 ++-
.../Regress.TestWi8021x.set_testbool.page | 22 ++++---
.../Regress.TestWi8021x.static_method.page | 16 +++--
.../Regress.aliased_caller_alloc.page | 16 +++--
.../Regress.annotation_attribute_func.page | 22 ++++---
.../Regress.annotation_custom_destroy.page | 28 ++++++---
.../Regress.annotation_get_source_file.page | 10 ++-
.../Regress.annotation_init.page | 22 ++++---
...ress.annotation_invalid_regress_annotation.page | 16 +++--
.../Regress.annotation_ptr_array.page | 16 +++--
.../Regress.annotation_return_array.page | 16 +++--
.../Regress.annotation_return_filename.page | 10 ++-
.../Regress.annotation_set_source_file.page | 16 +++--
...s.annotation_space_after_comment_bug631690.page | 10 ++-
.../Regress.annotation_string_array_length.page | 22 ++++---
.../Regress.annotation_string_zero_terminated.page | 10 ++-
...ress.annotation_string_zero_terminated_out.page | 16 +++--
.../Regress.annotation_test_parsing_bug630862.page | 10 ++-
.../Regress.annotation_transfer_floating.page | 10 ++-
.../Regress.annotation_versioned.page | 10 ++-
.../Regress.atest_error_quark.page | 10 ++-
.../Regress.foo_async_ready_callback.page | 28 ++++++---
.../Regress.foo_destroy_notify_callback.page | 28 ++++++---
.../Regress-1.0-C-expected/Regress.foo_init.page | 10 ++-
.../Regress.foo_method_external_references.page | 34 +++++++----
.../Regress.foo_not_a_constructor_new.page | 10 ++-
.../Regress.foo_skip_me.page | 16 +++--
.../Regress.foo_some_variant.page | 22 ++++---
.../Regress.foo_some_variant_ptr.page | 22 ++++---
.../Regress.foo_test_array.page | 10 ++-
.../Regress.foo_test_const_char_param.page | 16 +++--
.../Regress.foo_test_const_char_retval.page | 10 ++-
.../Regress.foo_test_const_struct_param.page | 16 +++--
.../Regress.foo_test_const_struct_retval.page | 10 ++-
.../Regress.foo_test_string_array.page | 16 +++--
.../Regress.foo_test_string_array_with_g.page | 16 +++--
.../Regress.foo_test_unsigned_qualifier.page | 16 +++--
.../Regress.foo_test_unsigned_type.page | 16 +++--
.../Regress.foo_test_varargs_callback.page | 22 ++++---
.../Regress.foo_test_varargs_callback2.page | 16 +++--
.../Regress.foo_test_varargs_callback3.page | 22 ++++---
.../Regress.func_obj_null_in.page | 16 +++--
.../Regress.global_get_flags_out.page | 16 +++--
.../Regress.has_parameter_named_attrs.page | 22 ++++---
.../Regress.introspectable_via_alias.page | 16 +++--
.../Regress.not_introspectable_via_alias.page | 16 +++--
...ess.random_function_with_skipped_structure.page | 28 ++++++---
.../Regress.set_abort_on_error.page | 16 +++--
.../Regress.test_array_callback.page | 16 +++--
.../Regress.test_array_fixed_out_objects.page | 16 +++--
.../Regress.test_array_fixed_size_int_in.page | 16 +++--
.../Regress.test_array_fixed_size_int_out.page | 16 +++--
.../Regress.test_array_fixed_size_int_return.page | 10 ++-
.../Regress.test_array_gint16_in.page | 22 ++++---
.../Regress.test_array_gint32_in.page | 22 ++++---
.../Regress.test_array_gint64_in.page | 22 ++++---
.../Regress.test_array_gint8_in.page | 22 ++++---
.../Regress.test_array_gtype_in.page | 22 ++++---
.../Regress.test_array_int_full_out.page | 16 +++--
.../Regress.test_array_int_in.page | 22 ++++---
.../Regress.test_array_int_inout.page | 22 ++++---
.../Regress.test_array_int_none_out.page | 16 +++--
.../Regress.test_array_int_null_in.page | 22 ++++---
.../Regress.test_array_int_null_out.page | 22 ++++---
.../Regress.test_array_int_out.page | 22 ++++---
.../Regress.test_async_ready_callback.page | 16 +++--
.../Regress.test_boolean.page | 16 +++--
.../Regress.test_boolean_false.page | 16 +++--
.../Regress.test_boolean_true.page | 16 +++--
.../Regress.test_cairo_context_full_return.page | 10 ++-
.../Regress.test_cairo_context_none_in.page | 16 +++--
.../Regress.test_cairo_surface_full_out.page | 16 +++--
.../Regress.test_cairo_surface_full_return.page | 10 ++-
.../Regress.test_cairo_surface_none_in.page | 16 +++--
.../Regress.test_cairo_surface_none_return.page | 10 ++-
.../Regress.test_callback.page | 16 +++--
.../Regress.test_callback_async.page | 22 ++++---
.../Regress.test_callback_destroy_notify.page | 28 ++++++---
....test_callback_destroy_notify_no_user_data.page | 22 ++++---
.../Regress.test_callback_thaw_async.page | 10 ++-
.../Regress.test_callback_thaw_notifications.page | 10 ++-
.../Regress.test_callback_user_data.page | 22 ++++---
.../Regress.test_closure.page | 16 +++--
.../Regress.test_closure_one_arg.page | 22 ++++---
.../Regress.test_closure_variant.page | 22 ++++---
.../Regress.test_date_in_gvalue.page | 10 ++-
.../Regress.test_def_error_quark.page | 10 ++-
.../Regress.test_double.page | 16 +++--
.../Regress.test_filename_return.page | 10 ++-
.../Regress-1.0-C-expected/Regress.test_float.page | 16 +++--
.../Regress.test_garray_container_return.page | 10 ++-
.../Regress.test_garray_full_return.page | 10 ++-
.../Regress.test_gerror_callback.page | 16 +++--
.../Regress.test_ghash_container_return.page | 10 ++-
.../Regress.test_ghash_everything_return.page | 10 ++-
.../Regress.test_ghash_gvalue_in.page | 16 +++--
.../Regress.test_ghash_gvalue_return.page | 10 ++-
...egress.test_ghash_nested_everything_return.page | 10 ++-
...gress.test_ghash_nested_everything_return2.page | 10 ++-
.../Regress.test_ghash_nothing_in.page | 16 +++--
.../Regress.test_ghash_nothing_in2.page | 16 +++--
.../Regress.test_ghash_nothing_return.page | 10 ++-
.../Regress.test_ghash_nothing_return2.page | 10 ++-
.../Regress.test_ghash_null_in.page | 16 +++--
.../Regress.test_ghash_null_out.page | 16 +++--
.../Regress.test_ghash_null_return.page | 10 ++-
.../Regress.test_glist_container_return.page | 10 ++-
.../Regress.test_glist_everything_return.page | 10 ++-
.../Regress.test_glist_nothing_in.page | 16 +++--
.../Regress.test_glist_nothing_in2.page | 16 +++--
.../Regress.test_glist_nothing_return.page | 10 ++-
.../Regress.test_glist_nothing_return2.page | 10 ++-
.../Regress.test_glist_null_in.page | 16 +++--
.../Regress.test_glist_null_out.page | 16 +++--
.../Regress.test_gslist_container_return.page | 10 ++-
.../Regress.test_gslist_everything_return.page | 10 ++-
.../Regress.test_gslist_nothing_in.page | 16 +++--
.../Regress.test_gslist_nothing_in2.page | 16 +++--
.../Regress.test_gslist_nothing_return.page | 10 ++-
.../Regress.test_gslist_nothing_return2.page | 10 ++-
.../Regress.test_gslist_null_in.page | 16 +++--
.../Regress.test_gslist_null_out.page | 16 +++--
.../Regress-1.0-C-expected/Regress.test_gtype.page | 16 +++--
.../Regress.test_gvariant_as.page | 10 ++-
.../Regress.test_gvariant_asv.page | 10 ++-
.../Regress.test_gvariant_i.page | 10 ++-
.../Regress.test_gvariant_s.page | 10 ++-
.../Regress.test_gvariant_v.page | 10 ++-
.../Regress.test_hash_table_callback.page | 22 ++++---
.../Regress-1.0-C-expected/Regress.test_int.page | 16 +++--
.../Regress-1.0-C-expected/Regress.test_int16.page | 16 +++--
.../Regress-1.0-C-expected/Regress.test_int32.page | 16 +++--
.../Regress-1.0-C-expected/Regress.test_int64.page | 16 +++--
.../Regress-1.0-C-expected/Regress.test_int8.page | 16 +++--
.../Regress.test_int_out_utf8.page | 22 ++++---
.../Regress.test_int_value_arg.page | 16 +++--
.../Regress-1.0-C-expected/Regress.test_long.page | 16 +++--
.../Regress.test_multi_callback.page | 16 +++--
.../Regress.test_multi_double_args.page | 28 ++++++---
.../Regress.test_multiline_doc_comments.page | 10 ++-
.../Regress.test_nested_parameter.page | 16 +++--
.../Regress.test_null_gerror_callback.page | 16 +++--
.../Regress.test_owned_gerror_callback.page | 16 +++--
.../Regress-1.0-C-expected/Regress.test_short.page | 16 +++--
.../Regress.test_simple_callback.page | 16 +++--
.../Regress-1.0-C-expected/Regress.test_size.page | 16 +++--
.../Regress.test_skip_unannotated_callback.page | 16 +++--
.../Regress-1.0-C-expected/Regress.test_ssize.page | 16 +++--
.../Regress.test_strv_in.page | 16 +++--
.../Regress.test_strv_in_gvalue.page | 10 ++-
.../Regress.test_strv_out.page | 10 ++-
.../Regress.test_strv_out_c.page | 10 ++-
.../Regress.test_strv_out_container.page | 10 ++-
.../Regress.test_strv_outarg.page | 16 +++--
.../Regress-1.0-C-expected/Regress.test_timet.page | 16 +++--
.../Regress.test_torture_signature_0.page | 46 +++++++++-----
.../Regress.test_torture_signature_1.page | 46 +++++++++-----
.../Regress.test_torture_signature_2.page | 64 +++++++++++++-------
.../Regress-1.0-C-expected/Regress.test_uint.page | 16 +++--
.../Regress.test_uint16.page | 16 +++--
.../Regress.test_uint32.page | 16 +++--
.../Regress.test_uint64.page | 16 +++--
.../Regress-1.0-C-expected/Regress.test_uint8.page | 16 +++--
.../Regress-1.0-C-expected/Regress.test_ulong.page | 16 +++--
.../Regress.test_unichar.page | 16 +++--
.../Regress.test_unsigned_enum_param.page | 16 +++--
.../Regress.test_ushort.page | 16 +++--
.../Regress.test_utf8_const_in.page | 16 +++--
.../Regress.test_utf8_const_return.page | 10 ++-
.../Regress.test_utf8_inout.page | 16 +++--
.../Regress.test_utf8_nonconst_return.page | 10 ++-
.../Regress.test_utf8_null_in.page | 16 +++--
.../Regress.test_utf8_null_out.page | 16 +++--
.../Regress.test_utf8_out.page | 16 +++--
.../Regress.test_utf8_out_nonconst_return.page | 16 +++--
.../Regress.test_utf8_out_out.page | 22 ++++---
.../Regress.test_value_get_fundamental_object.page | 16 +++--
.../Regress.test_value_return.page | 16 +++--
.../Regress.test_value_set_fundamental_object.page | 22 ++++---
.../Regress.test_versioning.page | 10 ++-
.../Regress.ATestError.page | 22 ++++---
.../Regress.AnnotationObject-attribute-signal.page | 40 ++++++++----
...ess.AnnotationObject-doc-empty-arg-parsing.page | 28 ++++++---
.../Regress.AnnotationObject-list-signal.page | 28 ++++++---
.../Regress.AnnotationObject-string-signal.page | 28 ++++++---
.../Regress.AnnotationObject.allow_none.page | 16 +++--
.../Regress.AnnotationObject.calleeowns.page | 10 ++-
.../Regress.AnnotationObject.calleesowns.page | 10 ++-
.../Regress.AnnotationObject.compute_sum.page | 10 ++-
.../Regress.AnnotationObject.compute_sum_n.page | 10 ++-
.../Regress.AnnotationObject.compute_sum_nz.page | 10 ++-
.../Regress.AnnotationObject.create_object.page | 10 ++-
.../Regress.AnnotationObject.do_not_use.page | 10 ++-
.../Regress.AnnotationObject.extra_annos.page | 4 +-
.../Regress.AnnotationObject.foreach.page | 10 ++-
.../Regress.AnnotationObject.get_hash.page | 10 ++-
.../Regress.AnnotationObject.get_objects.page | 10 ++-
.../Regress.AnnotationObject.get_strings.page | 10 ++-
.../Regress.AnnotationObject.hidden_self.page | 4 +-
.../Regress.AnnotationObject.in.page | 16 +++--
.../Regress.AnnotationObject.inout.page | 16 +++--
.../Regress.AnnotationObject.inout2.page | 16 +++--
.../Regress.AnnotationObject.inout3.page | 16 +++--
.../Regress.AnnotationObject.method.page | 10 ++-
.../Regress.AnnotationObject.notrans.page | 10 ++-
.../Regress.AnnotationObject.out.page | 10 ++-
.../Regress.AnnotationObject.parse_args.page | 10 ++-
.../Regress.AnnotationObject.set_data.page | 10 ++-
.../Regress.AnnotationObject.set_data2.page | 10 ++-
.../Regress.AnnotationObject.set_data3.page | 10 ++-
.../Regress.AnnotationObject.string_out.page | 10 ++-
.../Regress.AnnotationObject.use_buffer.page | 10 ++-
.../Regress.AnnotationObject.watch_full.page | 10 ++-
.../Regress.AnnotationObject.with_voidp.page | 10 ++-
.../Regress.FooASingle.page | 10 ++-
.../Regress.FooAddressType.page | 22 ++++---
.../Regress.FooBRect.add.page | 10 ++-
.../Regress.FooBRect.new.page | 22 ++++---
.../Regress.FooBoxed.method.page | 4 +-
.../Regress.FooBoxed.new.page | 10 ++-
.../Regress.FooBuffer.some_method.page | 4 +-
.../Regress.FooDBusData.method.page | 4 +-
.../Regress.FooEnumFullname.page | 22 ++++---
.../Regress.FooEnumNoType.page | 28 ++++++---
.../Regress.FooEnumType.page | 22 ++++---
.../Regress-1.0-Gjs-expected/Regress.FooError.page | 22 ++++---
.../Regress.FooForeignStruct.copy.page | 10 ++-
.../Regress.FooForeignStruct.new.page | 10 ++-
.../Regress.FooInterface-do_regress_foo.page | 10 ++-
.../Regress.FooInterface.do_regress_foo.page | 10 ++-
.../Regress.FooInterface.static_method.page | 10 ++-
.../Regress.FooObject-read_fn.page | 16 +++--
.../Regress.FooObject-signal.page | 40 ++++++++----
.../Regress.FooObject-virtual_method.page | 16 +++--
.../Regress.FooObject.a_global_method.page | 10 ++-
.../Regress.FooObject.append_new_stack_layer.page | 16 +++--
.../Regress.FooObject.dup_name.page | 10 ++-
.../Regress.FooObject.external_type.page | 10 ++-
.../Regress.FooObject.get_default.page | 10 ++-
.../Regress.FooObject.get_name.page | 10 ++-
.../Regress.FooObject.handle_glyph.page | 10 ++-
.../Regress.FooObject.is_it_time_yet.page | 10 ++-
.../Regress.FooObject.new.page | 10 ++-
.../Regress.FooObject.new_as_super.page | 10 ++-
.../Regress.FooObject.read.page | 16 +++--
.../Regress.FooObject.static_meth.page | 10 ++-
.../Regress.FooObject.various.page | 16 +++--
.../Regress.FooObject.virtual_method.page | 16 +++--
.../Regress.FooRectangle.add.page | 10 ++-
.../Regress.FooStackLayer.page | 58 ++++++++++++------
.../Regress.FooSubInterface-destroy-event.page | 22 ++++---
.../Regress.FooSubInterface-destroy_event.page | 4 +-
.../Regress.FooSubInterface-do_bar.page | 4 +-
.../Regress.FooSubInterface-do_baz.page | 10 ++-
.../Regress.FooSubInterface.do_bar.page | 4 +-
.../Regress.FooSubInterface.do_baz.page | 10 ++-
.../Regress.FooSubobject.new.page | 10 ++-
.../Regress.TestABCError.page | 22 ++++---
.../Regress.TestBoxed.copy.page | 10 ++-
.../Regress.TestBoxed.equals.page | 16 +++--
.../Regress.TestBoxed.new.page | 10 ++-
...ess.TestBoxed.new_alternative_constructor1.page | 16 +++--
...ess.TestBoxed.new_alternative_constructor2.page | 22 ++++---
...ess.TestBoxed.new_alternative_constructor3.page | 16 +++--
.../Regress.TestBoxedB.copy.page | 10 ++-
.../Regress.TestBoxedB.new.page | 22 ++++---
.../Regress.TestBoxedC.new.page | 10 ++-
.../Regress.TestBoxedD.copy.page | 10 ++-
.../Regress.TestBoxedD.free.page | 4 +-
.../Regress.TestBoxedD.get_magic.page | 10 ++-
.../Regress.TestBoxedD.new.page | 22 ++++---
.../Regress.TestDEFError.page | 22 ++++---
.../Regress-1.0-Gjs-expected/Regress.TestEnum.page | 28 ++++++---
.../Regress.TestEnumNoGEnum.page | 22 ++++---
.../Regress.TestEnumUnsigned.page | 16 +++--
.../Regress.TestError.page | 22 ++++---
.../Regress.TestFloating.new.page | 10 ++-
.../Regress.TestFundamentalObject.ref.page | 10 ++-
.../Regress.TestFundamentalObject.unref.page | 4 +-
.../Regress.TestFundamentalSubObject.new.page | 16 +++--
.../Regress.TestInheritDrawable.do_foo.page | 10 ++-
...ess.TestInheritDrawable.do_foo_maybe_throw.page | 10 ++-
.../Regress.TestInheritDrawable.get_origin.page | 4 +-
.../Regress.TestInheritDrawable.get_size.page | 4 +-
.../Regress.TestObj-all.page | 22 ++++---
.../Regress.TestObj-allow_none_vfunc.page | 10 ++-
.../Regress.TestObj-cleanup.page | 22 ++++---
.../Regress.TestObj-first.page | 22 ++++---
.../Regress.TestObj-matrix.page | 16 +++--
.../Regress.TestObj-sig-with-array-prop.page | 28 ++++++---
.../Regress.TestObj-sig-with-foreign-struct.page | 28 ++++++---
.../Regress.TestObj-sig-with-hash-prop.page | 28 ++++++---
.../Regress.TestObj-sig-with-int64-prop.page | 34 +++++++----
.../Regress.TestObj-sig-with-intarray-ret.page | 28 ++++++---
.../Regress.TestObj-sig-with-obj.page | 28 ++++++---
.../Regress.TestObj-sig-with-strv.page | 28 ++++++---
.../Regress.TestObj-sig-with-uint64-prop.page | 34 +++++++----
...Regress.TestObj-test-with-static-scope-arg.page | 28 ++++++---
.../Regress.TestObj-test.page | 22 ++++---
.../Regress.TestObj.constructor.page | 10 ++-
.../Regress.TestObj.do_matrix.page | 16 +++--
...gress.TestObj.emit_sig_with_foreign_struct.page | 4 +-
.../Regress.TestObj.emit_sig_with_int64.page | 4 +-
.../Regress.TestObj.emit_sig_with_obj.page | 4 +-
.../Regress.TestObj.emit_sig_with_uint64.page | 4 +-
.../Regress.TestObj.forced_method.page | 4 +-
.../Regress.TestObj.instance_method.page | 10 ++-
.../Regress.TestObj.instance_method_callback.page | 10 ++-
.../Regress.TestObj.new.page | 16 +++--
.../Regress.TestObj.new_callback.page | 16 +++--
.../Regress.TestObj.new_from_file.page | 16 +++--
.../Regress.TestObj.null_out.page | 4 +-
.../Regress.TestObj.set_bare.page | 10 ++-
.../Regress.TestObj.skip_inout_param.page | 40 ++++++++----
.../Regress.TestObj.skip_out_param.page | 40 ++++++++----
.../Regress.TestObj.skip_param.page | 40 ++++++++----
.../Regress.TestObj.skip_return_val.page | 40 ++++++++----
.../Regress.TestObj.skip_return_val_no_out.page | 16 +++--
.../Regress.TestObj.static_method.page | 16 +++--
.../Regress.TestObj.static_method_callback.page | 10 ++-
.../Regress.TestObj.torture_signature_0.page | 22 ++++---
.../Regress.TestObj.torture_signature_1.page | 28 ++++++---
.../Regress.TestOtherError.page | 22 ++++---
.../Regress.TestSimpleBoxedA.const_return.page | 10 ++-
.../Regress.TestSimpleBoxedA.copy.page | 10 ++-
.../Regress.TestSimpleBoxedA.equals.page | 16 +++--
.../Regress.TestSimpleBoxedB.copy.page | 10 ++-
.../Regress.TestStructA.clone.page | 4 +-
.../Regress.TestStructA.parse.page | 10 ++-
.../Regress.TestStructB.clone.page | 4 +-
.../Regress.TestStructFixedArray.frob.page | 4 +-
.../Regress.TestSubObj.instance_method.page | 10 ++-
.../Regress.TestSubObj.new.page | 10 ++-
.../Regress.TestSubObj.unset_bare.page | 4 +-
.../Regress.TestWi8021x.get_testbool.page | 10 ++-
.../Regress.TestWi8021x.new.page | 10 ++-
.../Regress.TestWi8021x.set_testbool.page | 10 ++-
.../Regress.TestWi8021x.static_method.page | 16 +++--
.../Regress.aliased_caller_alloc.page | 4 +-
.../Regress.annotation_attribute_func.page | 22 ++++---
.../Regress.annotation_custom_destroy.page | 10 ++-
.../Regress.annotation_get_source_file.page | 10 ++-
.../Regress.annotation_init.page | 10 ++-
...ress.annotation_invalid_regress_annotation.page | 10 ++-
.../Regress.annotation_ptr_array.page | 10 ++-
.../Regress.annotation_return_array.page | 10 ++-
.../Regress.annotation_return_filename.page | 10 ++-
.../Regress.annotation_set_source_file.page | 10 ++-
...s.annotation_space_after_comment_bug631690.page | 4 +-
.../Regress.annotation_string_array_length.page | 10 ++-
.../Regress.annotation_string_zero_terminated.page | 10 ++-
...ress.annotation_string_zero_terminated_out.page | 10 ++-
.../Regress.annotation_test_parsing_bug630862.page | 10 ++-
.../Regress.annotation_transfer_floating.page | 10 ++-
.../Regress.annotation_versioned.page | 4 +-
.../Regress.atest_error_quark.page | 10 ++-
.../Regress.foo_async_ready_callback.page | 16 +++--
.../Regress.foo_destroy_notify_callback.page | 10 ++-
.../Regress-1.0-Gjs-expected/Regress.foo_init.page | 10 ++-
.../Regress.foo_method_external_references.page | 28 ++++++---
.../Regress.foo_not_a_constructor_new.page | 10 ++-
.../Regress.foo_test_array.page | 10 ++-
.../Regress.foo_test_const_char_param.page | 10 ++-
.../Regress.foo_test_const_char_retval.page | 10 ++-
.../Regress.foo_test_const_struct_param.page | 10 ++-
.../Regress.foo_test_const_struct_retval.page | 10 ++-
.../Regress.foo_test_string_array.page | 10 ++-
.../Regress.foo_test_string_array_with_g.page | 10 ++-
.../Regress.foo_test_unsigned_qualifier.page | 10 ++-
.../Regress.foo_test_unsigned_type.page | 10 ++-
.../Regress.func_obj_null_in.page | 10 ++-
.../Regress.global_get_flags_out.page | 4 +-
.../Regress.has_parameter_named_attrs.page | 16 +++--
.../Regress.introspectable_via_alias.page | 10 ++-
.../Regress.set_abort_on_error.page | 10 ++-
.../Regress.test_array_callback.page | 16 +++--
.../Regress.test_array_fixed_out_objects.page | 4 +-
.../Regress.test_array_fixed_size_int_in.page | 16 +++--
.../Regress.test_array_fixed_size_int_out.page | 4 +-
.../Regress.test_array_fixed_size_int_return.page | 10 ++-
.../Regress.test_array_gint16_in.page | 16 +++--
.../Regress.test_array_gint32_in.page | 16 +++--
.../Regress.test_array_gint64_in.page | 16 +++--
.../Regress.test_array_gint8_in.page | 16 +++--
.../Regress.test_array_gtype_in.page | 16 +++--
.../Regress.test_array_int_full_out.page | 10 ++-
.../Regress.test_array_int_in.page | 16 +++--
.../Regress.test_array_int_inout.page | 10 ++-
.../Regress.test_array_int_none_out.page | 10 ++-
.../Regress.test_array_int_null_in.page | 10 ++-
.../Regress.test_array_int_null_out.page | 4 +-
.../Regress.test_array_int_out.page | 4 +-
.../Regress.test_async_ready_callback.page | 10 ++-
.../Regress.test_boolean.page | 16 +++--
.../Regress.test_boolean_false.page | 16 +++--
.../Regress.test_boolean_true.page | 16 +++--
.../Regress.test_cairo_context_full_return.page | 10 ++-
.../Regress.test_cairo_context_none_in.page | 10 ++-
.../Regress.test_cairo_surface_full_out.page | 4 +-
.../Regress.test_cairo_surface_full_return.page | 10 ++-
.../Regress.test_cairo_surface_none_in.page | 10 ++-
.../Regress.test_cairo_surface_none_return.page | 10 ++-
.../Regress.test_callback.page | 16 +++--
.../Regress.test_callback_async.page | 10 ++-
.../Regress.test_callback_destroy_notify.page | 16 +++--
....test_callback_destroy_notify_no_user_data.page | 16 +++--
.../Regress.test_callback_thaw_async.page | 10 ++-
.../Regress.test_callback_thaw_notifications.page | 10 ++-
.../Regress.test_callback_user_data.page | 16 +++--
.../Regress.test_closure.page | 16 +++--
.../Regress.test_closure_one_arg.page | 22 ++++---
.../Regress.test_closure_variant.page | 22 ++++---
.../Regress.test_date_in_gvalue.page | 10 ++-
.../Regress.test_def_error_quark.page | 10 ++-
.../Regress.test_double.page | 16 +++--
.../Regress.test_filename_return.page | 10 ++-
.../Regress.test_float.page | 16 +++--
.../Regress.test_garray_container_return.page | 10 ++-
.../Regress.test_garray_full_return.page | 10 ++-
.../Regress.test_gerror_callback.page | 10 ++-
.../Regress.test_ghash_container_return.page | 10 ++-
.../Regress.test_ghash_everything_return.page | 10 ++-
.../Regress.test_ghash_gvalue_in.page | 10 ++-
.../Regress.test_ghash_gvalue_return.page | 10 ++-
...egress.test_ghash_nested_everything_return.page | 10 ++-
...gress.test_ghash_nested_everything_return2.page | 10 ++-
.../Regress.test_ghash_nothing_in.page | 10 ++-
.../Regress.test_ghash_nothing_in2.page | 10 ++-
.../Regress.test_ghash_nothing_return.page | 10 ++-
.../Regress.test_ghash_nothing_return2.page | 10 ++-
.../Regress.test_ghash_null_in.page | 10 ++-
.../Regress.test_ghash_null_out.page | 4 +-
.../Regress.test_ghash_null_return.page | 10 ++-
.../Regress.test_glist_container_return.page | 10 ++-
.../Regress.test_glist_everything_return.page | 10 ++-
.../Regress.test_glist_nothing_in.page | 10 ++-
.../Regress.test_glist_nothing_in2.page | 10 ++-
.../Regress.test_glist_nothing_return.page | 10 ++-
.../Regress.test_glist_nothing_return2.page | 10 ++-
.../Regress.test_glist_null_in.page | 10 ++-
.../Regress.test_glist_null_out.page | 4 +-
.../Regress.test_gslist_container_return.page | 10 ++-
.../Regress.test_gslist_everything_return.page | 10 ++-
.../Regress.test_gslist_nothing_in.page | 10 ++-
.../Regress.test_gslist_nothing_in2.page | 10 ++-
.../Regress.test_gslist_nothing_return.page | 10 ++-
.../Regress.test_gslist_nothing_return2.page | 10 ++-
.../Regress.test_gslist_null_in.page | 10 ++-
.../Regress.test_gslist_null_out.page | 4 +-
.../Regress.test_gtype.page | 16 +++--
.../Regress.test_gvariant_as.page | 10 ++-
.../Regress.test_gvariant_asv.page | 10 ++-
.../Regress.test_gvariant_i.page | 10 ++-
.../Regress.test_gvariant_s.page | 10 ++-
.../Regress.test_gvariant_v.page | 10 ++-
.../Regress.test_hash_table_callback.page | 16 +++--
.../Regress-1.0-Gjs-expected/Regress.test_int.page | 16 +++--
.../Regress.test_int16.page | 16 +++--
.../Regress.test_int32.page | 16 +++--
.../Regress.test_int64.page | 16 +++--
.../Regress.test_int8.page | 16 +++--
.../Regress.test_int_out_utf8.page | 10 ++-
.../Regress.test_int_value_arg.page | 16 +++--
.../Regress.test_long.page | 16 +++--
.../Regress.test_multi_callback.page | 16 +++--
.../Regress.test_multi_double_args.page | 10 ++-
.../Regress.test_multiline_doc_comments.page | 4 +-
.../Regress.test_nested_parameter.page | 10 ++-
.../Regress.test_null_gerror_callback.page | 10 ++-
.../Regress.test_owned_gerror_callback.page | 10 ++-
.../Regress.test_short.page | 16 +++--
.../Regress.test_simple_callback.page | 10 ++-
.../Regress.test_size.page | 16 +++--
.../Regress.test_ssize.page | 16 +++--
.../Regress.test_strv_in.page | 16 +++--
.../Regress.test_strv_in_gvalue.page | 10 ++-
.../Regress.test_strv_out.page | 10 ++-
.../Regress.test_strv_out_c.page | 10 ++-
.../Regress.test_strv_out_container.page | 10 ++-
.../Regress.test_strv_outarg.page | 4 +-
.../Regress.test_timet.page | 16 +++--
.../Regress.test_torture_signature_0.page | 22 ++++---
.../Regress.test_torture_signature_1.page | 28 ++++++---
.../Regress.test_torture_signature_2.page | 28 ++++++---
.../Regress.test_uint.page | 16 +++--
.../Regress.test_uint16.page | 16 +++--
.../Regress.test_uint32.page | 16 +++--
.../Regress.test_uint64.page | 16 +++--
.../Regress.test_uint8.page | 16 +++--
.../Regress.test_ulong.page | 16 +++--
.../Regress.test_unichar.page | 16 +++--
.../Regress.test_unsigned_enum_param.page | 16 +++--
.../Regress.test_ushort.page | 16 +++--
.../Regress.test_utf8_const_in.page | 10 ++-
.../Regress.test_utf8_const_return.page | 10 ++-
.../Regress.test_utf8_inout.page | 10 ++-
.../Regress.test_utf8_nonconst_return.page | 10 ++-
.../Regress.test_utf8_null_in.page | 10 ++-
.../Regress.test_utf8_null_out.page | 4 +-
.../Regress.test_utf8_out.page | 4 +-
.../Regress.test_utf8_out_nonconst_return.page | 10 ++-
.../Regress.test_utf8_out_out.page | 4 +-
.../Regress.test_value_return.page | 16 +++--
.../Regress.test_versioning.page | 4 +-
.../Regress.ATestError.page | 22 ++++---
.../Regress.AnnotationObject-attribute-signal.page | 38 +++++++----
...ess.AnnotationObject-doc-empty-arg-parsing.page | 26 +++++---
.../Regress.AnnotationObject-list-signal.page | 26 +++++---
.../Regress.AnnotationObject-string-signal.page | 26 +++++---
.../Regress.AnnotationObject.allow_none.page | 22 ++++---
.../Regress.AnnotationObject.calleeowns.page | 22 ++++---
.../Regress.AnnotationObject.calleesowns.page | 28 ++++++---
.../Regress.AnnotationObject.compute_sum.page | 16 +++--
.../Regress.AnnotationObject.compute_sum_n.page | 22 ++++---
.../Regress.AnnotationObject.compute_sum_nz.page | 22 ++++---
.../Regress.AnnotationObject.create_object.page | 16 +++--
.../Regress.AnnotationObject.do_not_use.page | 16 +++--
.../Regress.AnnotationObject.extra_annos.page | 10 ++-
.../Regress.AnnotationObject.foreach.page | 22 ++++---
.../Regress.AnnotationObject.get_hash.page | 16 +++--
.../Regress.AnnotationObject.get_objects.page | 16 +++--
.../Regress.AnnotationObject.get_strings.page | 16 +++--
.../Regress.AnnotationObject.hidden_self.page | 10 ++-
.../Regress.AnnotationObject.in.page | 22 ++++---
.../Regress.AnnotationObject.inout.page | 22 ++++---
.../Regress.AnnotationObject.inout2.page | 22 ++++---
.../Regress.AnnotationObject.inout3.page | 22 ++++---
.../Regress.AnnotationObject.method.page | 16 +++--
.../Regress.AnnotationObject.notrans.page | 16 +++--
.../Regress.AnnotationObject.out.page | 22 ++++---
.../Regress.AnnotationObject.parse_args.page | 22 ++++---
.../Regress.AnnotationObject.set_data.page | 22 ++++---
.../Regress.AnnotationObject.set_data2.page | 22 ++++---
.../Regress.AnnotationObject.set_data3.page | 22 ++++---
.../Regress.AnnotationObject.string_out.page | 22 ++++---
.../Regress.AnnotationObject.use_buffer.page | 16 +++--
.../Regress.AnnotationObject.watch_full.page | 28 ++++++---
.../Regress.AnnotationObject.with_voidp.page | 16 +++--
.../Regress.FooASingle.page | 10 ++-
.../Regress.FooAddressType.page | 22 ++++---
.../Regress.FooBRect.add.page | 16 +++--
.../Regress.FooBoxed.method.page | 10 ++-
.../Regress.FooBuffer.some_method.page | 10 ++-
.../Regress.FooDBusData.method.page | 10 ++-
.../Regress.FooEnumFullname.page | 22 ++++---
.../Regress.FooEnumNoType.page | 28 ++++++---
.../Regress.FooEnumType.page | 22 ++++---
.../Regress.FooError.page | 22 ++++---
.../Regress.FooForeignStruct.copy.page | 16 +++--
.../Regress.FooInterface-do_regress_foo.page | 16 +++--
.../Regress.FooInterface.do_regress_foo.page | 16 +++--
.../Regress.FooInterface.static_method.page | 10 ++-
.../Regress.FooObject-read_fn.page | 22 ++++---
.../Regress.FooObject-signal.page | 38 +++++++----
.../Regress.FooObject-virtual_method.page | 22 ++++---
.../Regress.FooObject.a_global_method.page | 10 ++-
.../Regress.FooObject.append_new_stack_layer.page | 22 ++++---
.../Regress.FooObject.dup_name.page | 16 +++--
.../Regress.FooObject.external_type.page | 16 +++--
.../Regress.FooObject.get_default.page | 10 ++-
.../Regress.FooObject.get_name.page | 16 +++--
.../Regress.FooObject.handle_glyph.page | 16 +++--
.../Regress.FooObject.is_it_time_yet.page | 16 +++--
.../Regress.FooObject.read.page | 22 ++++---
.../Regress.FooObject.static_meth.page | 10 ++-
.../Regress.FooObject.various.page | 22 ++++---
.../Regress.FooObject.virtual_method.page | 22 ++++---
.../Regress.FooRectangle.add.page | 16 +++--
.../Regress.FooStackLayer.page | 58 ++++++++++++------
.../Regress.FooSubInterface-destroy-event.page | 20 ++++---
.../Regress.FooSubInterface-destroy_event.page | 10 ++-
.../Regress.FooSubInterface-do_bar.page | 10 ++-
.../Regress.FooSubInterface-do_baz.page | 22 ++++---
.../Regress.FooSubInterface.do_bar.page | 10 ++-
.../Regress.FooSubInterface.do_baz.page | 22 ++++---
.../Regress.TestABCError.page | 22 ++++---
.../Regress.TestBoxed.copy.page | 16 +++--
.../Regress.TestBoxed.equals.page | 22 ++++---
.../Regress.TestBoxedB.copy.page | 16 +++--
.../Regress.TestBoxedD.copy.page | 16 +++--
.../Regress.TestBoxedD.free.page | 10 ++-
.../Regress.TestBoxedD.get_magic.page | 16 +++--
.../Regress.TestDEFError.page | 22 ++++---
.../Regress.TestEnum.page | 28 ++++++---
.../Regress.TestEnumNoGEnum.page | 22 ++++---
.../Regress.TestEnumUnsigned.page | 16 +++--
.../Regress.TestError.page | 22 ++++---
.../Regress.TestFundamentalObject.ref.page | 16 +++--
.../Regress.TestFundamentalObject.unref.page | 10 ++-
.../Regress.TestInheritDrawable.do_foo.page | 16 +++--
...ess.TestInheritDrawable.do_foo_maybe_throw.page | 16 +++--
.../Regress.TestInheritDrawable.get_origin.page | 22 ++++---
.../Regress.TestInheritDrawable.get_size.page | 22 ++++---
.../Regress.TestObj-all.page | 20 ++++---
.../Regress.TestObj-allow_none_vfunc.page | 16 +++--
.../Regress.TestObj-cleanup.page | 20 ++++---
.../Regress.TestObj-first.page | 20 ++++---
.../Regress.TestObj-matrix.page | 22 ++++---
.../Regress.TestObj-sig-with-array-prop.page | 26 +++++---
.../Regress.TestObj-sig-with-foreign-struct.page | 26 +++++---
.../Regress.TestObj-sig-with-hash-prop.page | 26 +++++---
.../Regress.TestObj-sig-with-int64-prop.page | 32 ++++++----
.../Regress.TestObj-sig-with-intarray-ret.page | 26 +++++---
.../Regress.TestObj-sig-with-obj.page | 26 +++++---
.../Regress.TestObj-sig-with-strv.page | 26 +++++---
.../Regress.TestObj-sig-with-uint64-prop.page | 32 ++++++----
...Regress.TestObj-test-with-static-scope-arg.page | 26 +++++---
.../Regress.TestObj-test.page | 20 ++++---
.../Regress.TestObj.do_matrix.page | 22 ++++---
...gress.TestObj.emit_sig_with_foreign_struct.page | 10 ++-
.../Regress.TestObj.emit_sig_with_int64.page | 10 ++-
.../Regress.TestObj.emit_sig_with_obj.page | 10 ++-
.../Regress.TestObj.emit_sig_with_uint64.page | 10 ++-
.../Regress.TestObj.forced_method.page | 10 ++-
.../Regress.TestObj.instance_method.page | 16 +++--
.../Regress.TestObj.instance_method_callback.page | 16 +++--
.../Regress.TestObj.null_out.page | 10 ++-
.../Regress.TestObj.set_bare.page | 16 +++--
.../Regress.TestObj.skip_inout_param.page | 58 ++++++++++++------
.../Regress.TestObj.skip_out_param.page | 58 ++++++++++++------
.../Regress.TestObj.skip_param.page | 58 ++++++++++++------
.../Regress.TestObj.skip_return_val.page | 58 ++++++++++++------
.../Regress.TestObj.skip_return_val_no_out.page | 22 ++++---
.../Regress.TestObj.static_method.page | 16 +++--
.../Regress.TestObj.static_method_callback.page | 10 ++-
.../Regress.TestObj.torture_signature_0.page | 46 +++++++++-----
.../Regress.TestObj.torture_signature_1.page | 52 ++++++++++------
.../Regress.TestOtherError.page | 22 ++++---
.../Regress.TestSimpleBoxedA.const_return.page | 10 ++-
.../Regress.TestSimpleBoxedA.copy.page | 16 +++--
.../Regress.TestSimpleBoxedA.equals.page | 22 ++++---
.../Regress.TestSimpleBoxedB.copy.page | 16 +++--
.../Regress.TestStructA.clone.page | 16 +++--
.../Regress.TestStructA.parse.page | 16 +++--
.../Regress.TestStructB.clone.page | 16 +++--
.../Regress.TestStructFixedArray.frob.page | 10 ++-
.../Regress.TestSubObj.instance_method.page | 16 +++--
.../Regress.TestSubObj.unset_bare.page | 10 ++-
.../Regress.TestWi8021x.get_testbool.page | 16 +++--
.../Regress.TestWi8021x.set_testbool.page | 16 +++--
.../Regress.TestWi8021x.static_method.page | 16 +++--
.../Regress.aliased_caller_alloc.page | 10 ++-
.../Regress.annotation_attribute_func.page | 22 ++++---
.../Regress.annotation_custom_destroy.page | 22 ++++---
.../Regress.annotation_get_source_file.page | 10 ++-
.../Regress.annotation_init.page | 16 +++--
...ress.annotation_invalid_regress_annotation.page | 10 ++-
.../Regress.annotation_ptr_array.page | 10 ++-
.../Regress.annotation_return_array.page | 16 +++--
.../Regress.annotation_return_filename.page | 10 ++-
.../Regress.annotation_set_source_file.page | 10 ++-
...s.annotation_space_after_comment_bug631690.page | 4 +-
.../Regress.annotation_string_array_length.page | 16 +++--
.../Regress.annotation_string_zero_terminated.page | 10 ++-
...ress.annotation_string_zero_terminated_out.page | 10 ++-
.../Regress.annotation_test_parsing_bug630862.page | 10 ++-
.../Regress.annotation_transfer_floating.page | 10 ++-
.../Regress.annotation_versioned.page | 4 +-
.../Regress.atest_error_quark.page | 10 ++-
.../Regress.foo_async_ready_callback.page | 22 ++++---
.../Regress.foo_destroy_notify_callback.page | 22 ++++---
.../Regress.foo_init.page | 10 ++-
.../Regress.foo_method_external_references.page | 28 ++++++---
.../Regress.foo_not_a_constructor_new.page | 10 ++-
.../Regress.foo_test_array.page | 10 ++-
.../Regress.foo_test_const_char_param.page | 10 ++-
.../Regress.foo_test_const_char_retval.page | 10 ++-
.../Regress.foo_test_const_struct_param.page | 10 ++-
.../Regress.foo_test_const_struct_retval.page | 10 ++-
.../Regress.foo_test_string_array.page | 10 ++-
.../Regress.foo_test_string_array_with_g.page | 10 ++-
.../Regress.foo_test_unsigned_qualifier.page | 10 ++-
.../Regress.foo_test_unsigned_type.page | 10 ++-
.../Regress.func_obj_null_in.page | 10 ++-
.../Regress.global_get_flags_out.page | 10 ++-
.../Regress.has_parameter_named_attrs.page | 16 +++--
.../Regress.introspectable_via_alias.page | 10 ++-
.../Regress.set_abort_on_error.page | 10 ++-
.../Regress.test_array_callback.page | 16 +++--
.../Regress.test_array_fixed_out_objects.page | 10 ++-
.../Regress.test_array_fixed_size_int_in.page | 16 +++--
.../Regress.test_array_fixed_size_int_out.page | 10 ++-
.../Regress.test_array_fixed_size_int_return.page | 10 ++-
.../Regress.test_array_gint16_in.page | 22 ++++---
.../Regress.test_array_gint32_in.page | 22 ++++---
.../Regress.test_array_gint64_in.page | 22 ++++---
.../Regress.test_array_gint8_in.page | 22 ++++---
.../Regress.test_array_gtype_in.page | 22 ++++---
.../Regress.test_array_int_full_out.page | 16 +++--
.../Regress.test_array_int_in.page | 22 ++++---
.../Regress.test_array_int_inout.page | 16 +++--
.../Regress.test_array_int_none_out.page | 16 +++--
.../Regress.test_array_int_null_in.page | 16 +++--
.../Regress.test_array_int_null_out.page | 16 +++--
.../Regress.test_array_int_out.page | 16 +++--
.../Regress.test_async_ready_callback.page | 10 ++-
.../Regress.test_boolean.page | 16 +++--
.../Regress.test_boolean_false.page | 16 +++--
.../Regress.test_boolean_true.page | 16 +++--
.../Regress.test_cairo_context_full_return.page | 10 ++-
.../Regress.test_cairo_context_none_in.page | 10 ++-
.../Regress.test_cairo_surface_full_out.page | 10 ++-
.../Regress.test_cairo_surface_full_return.page | 10 ++-
.../Regress.test_cairo_surface_none_in.page | 10 ++-
.../Regress.test_cairo_surface_none_return.page | 10 ++-
.../Regress.test_callback.page | 16 +++--
.../Regress.test_callback_async.page | 16 +++--
.../Regress.test_callback_destroy_notify.page | 28 ++++++---
....test_callback_destroy_notify_no_user_data.page | 22 ++++---
.../Regress.test_callback_thaw_async.page | 10 ++-
.../Regress.test_callback_thaw_notifications.page | 10 ++-
.../Regress.test_callback_user_data.page | 22 ++++---
.../Regress.test_closure.page | 16 +++--
.../Regress.test_closure_one_arg.page | 22 ++++---
.../Regress.test_closure_variant.page | 22 ++++---
.../Regress.test_date_in_gvalue.page | 10 ++-
.../Regress.test_def_error_quark.page | 10 ++-
.../Regress.test_double.page | 16 +++--
.../Regress.test_filename_return.page | 10 ++-
.../Regress.test_float.page | 16 +++--
.../Regress.test_garray_container_return.page | 10 ++-
.../Regress.test_garray_full_return.page | 10 ++-
.../Regress.test_gerror_callback.page | 10 ++-
.../Regress.test_ghash_container_return.page | 10 ++-
.../Regress.test_ghash_everything_return.page | 10 ++-
.../Regress.test_ghash_gvalue_in.page | 10 ++-
.../Regress.test_ghash_gvalue_return.page | 10 ++-
...egress.test_ghash_nested_everything_return.page | 10 ++-
...gress.test_ghash_nested_everything_return2.page | 10 ++-
.../Regress.test_ghash_nothing_in.page | 10 ++-
.../Regress.test_ghash_nothing_in2.page | 10 ++-
.../Regress.test_ghash_nothing_return.page | 10 ++-
.../Regress.test_ghash_nothing_return2.page | 10 ++-
.../Regress.test_ghash_null_in.page | 10 ++-
.../Regress.test_ghash_null_out.page | 10 ++-
.../Regress.test_ghash_null_return.page | 10 ++-
.../Regress.test_glist_container_return.page | 10 ++-
.../Regress.test_glist_everything_return.page | 10 ++-
.../Regress.test_glist_nothing_in.page | 10 ++-
.../Regress.test_glist_nothing_in2.page | 10 ++-
.../Regress.test_glist_nothing_return.page | 10 ++-
.../Regress.test_glist_nothing_return2.page | 10 ++-
.../Regress.test_glist_null_in.page | 10 ++-
.../Regress.test_glist_null_out.page | 10 ++-
.../Regress.test_gslist_container_return.page | 10 ++-
.../Regress.test_gslist_everything_return.page | 10 ++-
.../Regress.test_gslist_nothing_in.page | 10 ++-
.../Regress.test_gslist_nothing_in2.page | 10 ++-
.../Regress.test_gslist_nothing_return.page | 10 ++-
.../Regress.test_gslist_nothing_return2.page | 10 ++-
.../Regress.test_gslist_null_in.page | 10 ++-
.../Regress.test_gslist_null_out.page | 10 ++-
.../Regress.test_gtype.page | 16 +++--
.../Regress.test_gvariant_as.page | 10 ++-
.../Regress.test_gvariant_asv.page | 10 ++-
.../Regress.test_gvariant_i.page | 10 ++-
.../Regress.test_gvariant_s.page | 10 ++-
.../Regress.test_gvariant_v.page | 10 ++-
.../Regress.test_hash_table_callback.page | 16 +++--
.../Regress.test_int.page | 16 +++--
.../Regress.test_int16.page | 16 +++--
.../Regress.test_int32.page | 16 +++--
.../Regress.test_int64.page | 16 +++--
.../Regress.test_int8.page | 16 +++--
.../Regress.test_int_out_utf8.page | 16 +++--
.../Regress.test_int_value_arg.page | 16 +++--
.../Regress.test_long.page | 16 +++--
.../Regress.test_multi_callback.page | 16 +++--
.../Regress.test_multi_double_args.page | 22 ++++---
.../Regress.test_multiline_doc_comments.page | 4 +-
.../Regress.test_nested_parameter.page | 10 ++-
.../Regress.test_null_gerror_callback.page | 10 ++-
.../Regress.test_owned_gerror_callback.page | 10 ++-
.../Regress.test_short.page | 16 +++--
.../Regress.test_simple_callback.page | 10 ++-
.../Regress.test_size.page | 16 +++--
.../Regress.test_ssize.page | 16 +++--
.../Regress.test_strv_in.page | 16 +++--
.../Regress.test_strv_in_gvalue.page | 10 ++-
.../Regress.test_strv_out.page | 10 ++-
.../Regress.test_strv_out_c.page | 10 ++-
.../Regress.test_strv_out_container.page | 10 ++-
.../Regress.test_strv_outarg.page | 10 ++-
.../Regress.test_timet.page | 16 +++--
.../Regress.test_torture_signature_0.page | 40 ++++++++----
.../Regress.test_torture_signature_1.page | 46 +++++++++-----
.../Regress.test_torture_signature_2.page | 58 ++++++++++++------
.../Regress.test_uint.page | 16 +++--
.../Regress.test_uint16.page | 16 +++--
.../Regress.test_uint32.page | 16 +++--
.../Regress.test_uint64.page | 16 +++--
.../Regress.test_uint8.page | 16 +++--
.../Regress.test_ulong.page | 16 +++--
.../Regress.test_unichar.page | 16 +++--
.../Regress.test_unsigned_enum_param.page | 16 +++--
.../Regress.test_ushort.page | 16 +++--
.../Regress.test_utf8_const_in.page | 10 ++-
.../Regress.test_utf8_const_return.page | 10 ++-
.../Regress.test_utf8_inout.page | 10 ++-
.../Regress.test_utf8_nonconst_return.page | 10 ++-
.../Regress.test_utf8_null_in.page | 10 ++-
.../Regress.test_utf8_null_out.page | 10 ++-
.../Regress.test_utf8_out.page | 10 ++-
.../Regress.test_utf8_out_nonconst_return.page | 16 +++--
.../Regress.test_utf8_out_out.page | 16 +++--
.../Regress.test_value_return.page | 16 +++--
.../Regress.test_versioning.page | 4 +-
961 files changed, 9586 insertions(+), 5775 deletions(-)
---
diff --git a/giscanner/doctemplates/C/function.tmpl b/giscanner/doctemplates/C/function.tmpl
index c551bc2..c2d393b 100644
--- a/giscanner/doctemplates/C/function.tmpl
+++ b/giscanner/doctemplates/C/function.tmpl
@@ -47,15 +47,19 @@ ${formatter.format_type(arg.type) | x} ${arg.argname}\
</%block>
<%block name="details">
% if formatter.get_parameters(node) or node.retval:
-<dl>
+<terms>
% for arg in formatter.get_parameters(node):
-<dt><p>${arg.argname} :</p></dt>
-<dd>${formatter.format(node, arg.doc)}</dd>
+<item>
+<title><code>${arg.argname}</code></title>
+${formatter.format(node, arg.doc)}
+</item>
% endfor
% if node.retval:
-<dt><p>Returns :</p></dt>
-<dd>${formatter.format(node, node.retval.doc)}</dd>
+<item>
+<title><code>Returns</code></title>
+${formatter.format(node, node.retval.doc)}
+</item>
% endif
-</dl>
+</terms>
% endif
</%block>
diff --git a/giscanner/doctemplates/Gjs/enum.tmpl b/giscanner/doctemplates/Gjs/enum.tmpl
index 2624c42..35cdd43 100644
--- a/giscanner/doctemplates/Gjs/enum.tmpl
+++ b/giscanner/doctemplates/Gjs/enum.tmpl
@@ -1,11 +1,13 @@
<%inherit file="/base.tmpl"/>
<%block name="details">
% if node.members:
-<dl>
+<terms>
% for member in node.members:
-<dt><p>${node.name}.${member.name.upper()} :</p></dt>
-<dd>${formatter.format(node, member.doc)}</dd>
+<item>
+<title><code>${node.name}.${member.name.upper()}</code></title>
+${formatter.format(node, member.doc)}
+</item>
% endfor
-</dl>
+</terms>
% endif
</%block>
diff --git a/giscanner/doctemplates/Gjs/function.tmpl b/giscanner/doctemplates/Gjs/function.tmpl
index db2c8ae..46c4627 100644
--- a/giscanner/doctemplates/Gjs/function.tmpl
+++ b/giscanner/doctemplates/Gjs/function.tmpl
@@ -34,15 +34,19 @@ ${', '.join('%s:%s' % (arg.argname, formatter.format_type(arg.type)) for arg in
</%block>
<%block name="details">
% if formatter.get_parameters(node) or node.retval:
-<dl>
+<terms>
% for arg in formatter.get_parameters(node):
-<dt><p>${arg.argname} :</p></dt>
-<dd>${formatter.format(node, arg.doc)}</dd>
+<item>
+<title><code>${arg.argname}</code></title>
+${formatter.format(node, arg.doc)}
+</item>
% endfor
% if node.retval and node.retval.type.ctype != 'void':
-<dt><p>Returns :</p></dt>
-<dd>${formatter.format(node, node.retval.doc)}</dd>
+<item>
+<title><code>Returns</code></title>
+${formatter.format(node, node.retval.doc)}
+</item>
% endif
-</dl>
+</terms>
% endif
</%block>
diff --git a/giscanner/doctemplates/Gjs/signal.tmpl b/giscanner/doctemplates/Gjs/signal.tmpl
index 8326480..994392c 100644
--- a/giscanner/doctemplates/Gjs/signal.tmpl
+++ b/giscanner/doctemplates/Gjs/signal.tmpl
@@ -13,23 +13,33 @@ user_param1, ...):${formatter.format_type(node.retval.type)};
</code></synopsis>
</%block>
<%block name="details">
-<dl>
-<dt><p>${formatter.to_underscores(node.parent.name).lower()} :</p></dt>
-<dd><p>instance of ${namespace.name}.${node.parent.name} that is emitting the signal</p></dd>
+<terms>
+<item>
+<title><code>${formatter.to_underscores(node.parent.name).lower()}</code></title>
+<p>instance of ${namespace.name}.${node.parent.name} that is emitting the signal</p>
+</item>
% for arg in formatter.get_parameters(node):
-<dt><p>${arg.argname} :</p></dt>
-<dd>${formatter.format(node, arg.doc)}</dd>
+<item>
+<title><code>${arg.argname}</code></title>
+${formatter.format(node, arg.doc)}
+</item>
% endfor
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
+<item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+</item>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
% if node.retval and \
node.retval.type.ctype != 'void' and \
node.retval.type.ctype is not None:
-<dt><p>Returns :</p></dt>
-<dd>${node.retval.type.ctype} ${formatter.format(node, node.retval.doc)}</dd>
+<item>
+<title><code>Returns</code></title>
+<p>${node.retval.type.ctype} ${formatter.format(node, node.retval.doc)}</p>
+</item>
% endif
-</dl>
+</terms>
</%block>
diff --git a/giscanner/doctemplates/Gjs/vfunc.tmpl b/giscanner/doctemplates/Gjs/vfunc.tmpl
index 1d132c7..1cbe511 100644
--- a/giscanner/doctemplates/Gjs/vfunc.tmpl
+++ b/giscanner/doctemplates/Gjs/vfunc.tmpl
@@ -9,15 +9,19 @@ ${', '.join('%s:%s' % (arg.argname, formatter.format_type(arg.type)) for arg in
</%block>
<%block name="details">
% if formatter.get_parameters(node) or node.retval:
-<dl>
+<terms>
% for arg in formatter.get_parameters(node):
-<dt><p>${arg.argname} :</p></dt>
-<dd>${formatter.format(node, arg.doc)}</dd>
+<item>
+<title><code>${arg.argname}</code></title>
+${formatter.format(node, arg.doc)}
+</item>
% endfor
% if node.retval and node.retval.type.ctype != 'void':
-<dt><p>Returns :</p></dt>
-<dd>${formatter.format(node, node.retval.doc)}</dd>
+<item>
+<title><code>Returns</code></title>
+${formatter.format(node, node.retval.doc)}
+</item>
% endif
-</dl>
+</terms>
% endif
</%block>
diff --git a/giscanner/doctemplates/Python/enum.tmpl b/giscanner/doctemplates/Python/enum.tmpl
index 2624c42..35cdd43 100644
--- a/giscanner/doctemplates/Python/enum.tmpl
+++ b/giscanner/doctemplates/Python/enum.tmpl
@@ -1,11 +1,13 @@
<%inherit file="/base.tmpl"/>
<%block name="details">
% if node.members:
-<dl>
+<terms>
% for member in node.members:
-<dt><p>${node.name}.${member.name.upper()} :</p></dt>
-<dd>${formatter.format(node, member.doc)}</dd>
+<item>
+<title><code>${node.name}.${member.name.upper()}</code></title>
+${formatter.format(node, member.doc)}
+</item>
% endfor
-</dl>
+</terms>
% endif
</%block>
diff --git a/giscanner/doctemplates/Python/function.tmpl b/giscanner/doctemplates/Python/function.tmpl
index 356619c..d1b57f4 100644
--- a/giscanner/doctemplates/Python/function.tmpl
+++ b/giscanner/doctemplates/Python/function.tmpl
@@ -39,15 +39,19 @@ ${', '.join((formatter.format_parameter_name(node, arg) for arg in formatter.get
</%block>
<%block name="details">
% if formatter.get_parameters(node) or node.retval:
-<dl>
+<terms>
% for ix, arg in enumerate(formatter.get_parameters(node)):
-<dt><p>${formatter.format_parameter_name(node, arg)} :</p></dt>
-<dd>${formatter.format(node, arg.doc)}</dd>
+<item>
+<title><code>${formatter.format_parameter_name(node, arg)}</code></title>
+${formatter.format(node, arg.doc)}
+</item>
% endfor
% if node.retval and node.retval.type.ctype != 'void':
-<dt><p>Returns :</p></dt>
-<dd>${formatter.format(node, node.retval.doc)}</dd>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
% endif
-</dl>
+</terms>
% endif
</%block>
diff --git a/giscanner/doctemplates/Python/signal.tmpl b/giscanner/doctemplates/Python/signal.tmpl
index 0df13f6..fa85041 100644
--- a/giscanner/doctemplates/Python/signal.tmpl
+++ b/giscanner/doctemplates/Python/signal.tmpl
@@ -13,23 +13,30 @@ user_param1, ...)
</code></synopsis>
</%block>
<%block name="details">
-<dl>
-<dt><p>${formatter.to_underscores(node.parent.name).lower()} :</p></dt>
-<dd><p>instance of ${namespace.name}.${node.parent.name} that is emitting the signal</p></dd>
+<terms>
+<item>
+<title><code>${formatter.to_underscores(node.parent.name).lower()}</code></title>
+<p>instance of ${namespace.name}.${node.parent.name} that is emitting the signal</p>
+</item>
% for arg in formatter.get_parameters(node):
-<dt><p>${arg.argname} :</p></dt>
-<dd>${formatter.format(node, arg.doc)}</dd>
+<item>
+<title><code>${arg.argname}</code></title>
+${formatter.format(node, arg.doc)}
+</item>
% endfor
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
% if node.retval and \
node.retval.type.ctype != 'void' and \
node.retval.type.ctype is not None:
-<dt><p>Returns :</p></dt>
-<dd>${node.retval.type.ctype} ${formatter.format(node, node.retval.doc)}</dd>
+<item>
+<title><code>Returns</code></title>
+<p>${node.retval.type.ctype} ${formatter.format(node, node.retval.doc)}</p>
+</item>
% endif
-</dl>
+</terms>
</%block>
-
diff --git a/giscanner/doctemplates/Python/vfunc.tmpl b/giscanner/doctemplates/Python/vfunc.tmpl
index c4716a5..98a3093 100644
--- a/giscanner/doctemplates/Python/vfunc.tmpl
+++ b/giscanner/doctemplates/Python/vfunc.tmpl
@@ -15,15 +15,19 @@ ${', '.join((arg.argname for arg in formatter.get_parameters(node)))}\
</%block>
<%block name="details">
% if formatter.get_parameters(node) or node.retval:
-<dl>
+<terms>
% for arg in formatter.get_parameters(node):
-<dt><p>${arg.argname} :</p></dt>
-<dd>${formatter.format(node, arg.doc)}</dd>
+<item>
+<title><code>${arg.argname}</code></title>
+${formatter.format(node, arg.doc)}
+</item>
% endfor
% if node.retval and node.retval.type.ctype != 'void':
-<dt><p>Returns :</p></dt>
-<dd>${formatter.format(node, node.retval.doc)}</dd>
+<item>
+<title><code>Returns</code></title>
+${formatter.format(node, node.retval.doc)}
+</item>
% endif
-</dl>
+</terms>
% endif
</%block>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-attribute-signal.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-attribute-signal.page
index 2e30a44..188ff22 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-attribute-signal.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-attribute-signal.page
@@ -24,14 +24,20 @@ gchar* attribute-signal (gchar* arg1,
-<dl>
-<dt><p>arg1 :</p></dt>
-<dd><p>a value</p></dd>
-<dt><p>arg2 :</p></dt>
-<dd><p>another value</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>the return value</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>arg1</code></title>
+<p>a value</p>
+</item>
+<item>
+<title><code>arg2</code></title>
+<p>another value</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>the return value</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page
index 8f7a9de..bc1d530 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page
@@ -23,12 +23,16 @@ void doc-empty-arg-parsing (gpointer arg1);
-<dl>
-<dt><p>arg1 :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>arg1</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-list-signal.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-list-signal.page
index f4e8868..cfd1303 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-list-signal.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-list-signal.page
@@ -24,12 +24,16 @@ known by GObject as it's only marked as G_TYPE_POINTER</p>
-<dl>
-<dt><p>list :</p></dt>
-<dd><p>a list of strings</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>list</code></title>
+<p>a list of strings</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-signal.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-signal.page
index 71dbe0c..d875e1c 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-signal.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-signal.page
@@ -25,12 +25,16 @@ it says it's pointer but it's actually a string.</p>
<p>Since 1.0</p>
-<dl>
-<dt><p>string :</p></dt>
-<dd><p>a string</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>string</code></title>
+<p>a string</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.allow_none.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.allow_none.page
index ea33c69..9d7e12e 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.allow_none.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.allow_none.page
@@ -37,14 +37,20 @@ GObject* regress_annotation_object_allow_none (RegressAnnotationObject* object,
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>somearg :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd><p><code>NULL</code> always</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>somearg</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+<p><code>NULL</code> always</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleeowns.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleeowns.page
index 27b6b8a..3db342e 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleeowns.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleeowns.page
@@ -37,14 +37,20 @@ gint regress_annotation_object_calleeowns (RegressAnnotationObject* object,
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>toown :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>an int</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>toown</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>an int</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleesowns.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleesowns.page
index 72e2e62..fb6d988 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleesowns.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleesowns.page
@@ -42,16 +42,24 @@ gint regress_annotation_object_calleesowns (RegressAnnotationObject* object,
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>toown1 :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>toown2 :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>an int</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>toown1</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>toown2</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>an int</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum.page
index 825b449..2f18ea2 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum.page
@@ -37,14 +37,20 @@ void regress_annotation_object_compute_sum (RegressAnnotationObject* object,
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>nums :</p></dt>
-<dd><p>Sequence of numbers</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>nums</code></title>
+<p>Sequence of numbers</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_n.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_n.page
index 11333b5..be0ab85 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_n.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_n.page
@@ -42,16 +42,24 @@ void regress_annotation_object_compute_sum_n (RegressAnnotationObject* object,
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>nums :</p></dt>
-<dd><p>Sequence of numbers that are zero-terminated</p></dd>
-<dt><p>n_nums :</p></dt>
-<dd><p>Length of number array</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>nums</code></title>
+<p>Sequence of numbers that are zero-terminated</p>
+</item>
+<item>
+<title><code>n_nums</code></title>
+<p>Length of number array</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_nz.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_nz.page
index 7017be8..29209f5 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_nz.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_nz.page
@@ -42,16 +42,24 @@ void regress_annotation_object_compute_sum_nz (RegressAnnotationObject* object,
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>a <link xref="Regress.AnnotationObject"/></p></dd>
-<dt><p>nums :</p></dt>
-<dd><p>Sequence of numbers that are zero-terminated</p></dd>
-<dt><p>n_nums :</p></dt>
-<dd><p>Length of number array</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>a <link xref="Regress.AnnotationObject"/></p>
+</item>
+<item>
+<title><code>nums</code></title>
+<p>Sequence of numbers that are zero-terminated</p>
+</item>
+<item>
+<title><code>n_nums</code></title>
+<p>Length of number array</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.create_object.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.create_object.page
index cde56f8..43f4ee6 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.create_object.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.create_object.page
@@ -32,12 +32,16 @@ GObject* regress_annotation_object_create_object (RegressAnnotationObject* objec
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>The object</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>The object</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.do_not_use.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.do_not_use.page
index 2c5eaad..7b160ab 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.do_not_use.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.do_not_use.page
@@ -32,12 +32,16 @@ GObject* regress_annotation_object_do_not_use (RegressAnnotationObject* object);
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p><code>NULL</code> always</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p><code>NULL</code> always</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.extra_annos.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.extra_annos.page
index b1aa7aa..61c6403 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.extra_annos.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.extra_annos.page
@@ -32,12 +32,16 @@ void regress_annotation_object_extra_annos (RegressAnnotationObject* object);
-<dl>
-<dt><p>object :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.foreach.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.foreach.page
index ba91139..18d5b1e 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.foreach.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.foreach.page
@@ -42,16 +42,24 @@ void regress_annotation_object_foreach (RegressAnnotationObject* object,
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>a <link xref="Regress.AnnotationObject"/></p></dd>
-<dt><p>func :</p></dt>
-<dd><p>Callback to invoke</p></dd>
-<dt><p>user_data :</p></dt>
-<dd><p>Callback user data</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>a <link xref="Regress.AnnotationObject"/></p>
+</item>
+<item>
+<title><code>func</code></title>
+<p>Callback to invoke</p>
+</item>
+<item>
+<title><code>user_data</code></title>
+<p>Callback user data</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_hash.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_hash.page
index 5a06e84..0560fa4 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_hash.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_hash.page
@@ -33,12 +33,16 @@ objects.</p>
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>hash table</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>hash table</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_objects.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_objects.page
index 2e36a38..3585b2b 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_objects.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_objects.page
@@ -34,12 +34,16 @@ intentionally similar example to gtk_container_get_children</p>
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>list of objects</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>list of objects</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_strings.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_strings.page
index be29a58..498157b 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_strings.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_strings.page
@@ -33,12 +33,16 @@ each string needs to be freed.</p>
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>list of strings</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>list of strings</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.hidden_self.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.hidden_self.page
index 8218f23..f3d3a4a 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.hidden_self.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.hidden_self.page
@@ -32,12 +32,16 @@ void regress_annotation_object_hidden_self (gpointer object);
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>A <link xref="Regress.AnnotationObject"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>A <link xref="Regress.AnnotationObject"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.in.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.in.page
index 2795957..568cd89 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.in.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.in.page
@@ -37,14 +37,20 @@ gint regress_annotation_object_in (RegressAnnotationObject* object,
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>inarg :</p></dt>
-<dd><p>This is an argument test</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>an int</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>inarg</code></title>
+<p>This is an argument test</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>an int</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout.page
index 09bc20d..eaaa27b 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout.page
@@ -37,14 +37,20 @@ gint regress_annotation_object_inout (RegressAnnotationObject* object,
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>inoutarg :</p></dt>
-<dd><p>This is an argument test</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>an int</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>inoutarg</code></title>
+<p>This is an argument test</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>an int</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout2.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout2.page
index 4a95ff0..94674e2 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout2.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout2.page
@@ -37,14 +37,20 @@ gint regress_annotation_object_inout2 (RegressAnnotationObject* object,
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>inoutarg :</p></dt>
-<dd><p>This is an argument test</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>an int</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>inoutarg</code></title>
+<p>This is an argument test</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>an int</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout3.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout3.page
index 1af8170..c693c95 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout3.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout3.page
@@ -37,14 +37,20 @@ gint regress_annotation_object_inout3 (RegressAnnotationObject* object,
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>inoutarg :</p></dt>
-<dd><p>This is an argument test</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>an int</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>inoutarg</code></title>
+<p>This is an argument test</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>an int</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.method.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.method.page
index 793cf37..f5f98d4 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.method.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.method.page
@@ -32,12 +32,16 @@ gint regress_annotation_object_method (RegressAnnotationObject* object);
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>an int</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>an int</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.notrans.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.notrans.page
index c8ba72c..ca0b307 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.notrans.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.notrans.page
@@ -32,12 +32,16 @@ GObject* regress_annotation_object_notrans (RegressAnnotationObject* object);
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>An object, not referenced</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>An object, not referenced</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.out.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.out.page
index ec90d82..c229c0e 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.out.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.out.page
@@ -37,14 +37,20 @@ gint regress_annotation_object_out (RegressAnnotationObject* object,
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>outarg :</p></dt>
-<dd><p>This is an argument test</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>an int</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>outarg</code></title>
+<p>This is an argument test</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>an int</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.parse_args.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.parse_args.page
index 5282ab5..7934ae6 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.parse_args.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.parse_args.page
@@ -42,16 +42,24 @@ void regress_annotation_object_parse_args (RegressAnnotationObject* object,
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>a <link xref="Regress.AnnotationObject"/></p></dd>
-<dt><p>argc :</p></dt>
-<dd><p>Length of the argument vector</p></dd>
-<dt><p>argv :</p></dt>
-<dd><p>Argument vector</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>a <link xref="Regress.AnnotationObject"/></p>
+</item>
+<item>
+<title><code>argc</code></title>
+<p>Length of the argument vector</p>
+</item>
+<item>
+<title><code>argv</code></title>
+<p>Argument vector</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data.page
index a52f0cc..6f5cf70 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data.page
@@ -42,16 +42,24 @@ void regress_annotation_object_set_data (RegressAnnotationObject* object,
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>a <link xref="Regress.AnnotationObject"/></p></dd>
-<dt><p>data :</p></dt>
-<dd><p>The data</p></dd>
-<dt><p>length :</p></dt>
-<dd><p>Length of the data</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>a <link xref="Regress.AnnotationObject"/></p>
+</item>
+<item>
+<title><code>data</code></title>
+<p>The data</p>
+</item>
+<item>
+<title><code>length</code></title>
+<p>Length of the data</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data2.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data2.page
index 8c2be28..7e6f2ed 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data2.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data2.page
@@ -42,16 +42,24 @@ void regress_annotation_object_set_data2 (RegressAnnotationObject* object,
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>a <link xref="Regress.AnnotationObject"/></p></dd>
-<dt><p>data :</p></dt>
-<dd><p>The data</p></dd>
-<dt><p>length :</p></dt>
-<dd><p>Length of the data</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>a <link xref="Regress.AnnotationObject"/></p>
+</item>
+<item>
+<title><code>data</code></title>
+<p>The data</p>
+</item>
+<item>
+<title><code>length</code></title>
+<p>Length of the data</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data3.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data3.page
index 989bb1d..d0a8761 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data3.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data3.page
@@ -43,16 +43,24 @@ type.</p>
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>a <link xref="Regress.AnnotationObject"/></p></dd>
-<dt><p>data :</p></dt>
-<dd><p>The data</p></dd>
-<dt><p>length :</p></dt>
-<dd><p>Length of the data</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>a <link xref="Regress.AnnotationObject"/></p>
+</item>
+<item>
+<title><code>data</code></title>
+<p>The data</p>
+</item>
+<item>
+<title><code>length</code></title>
+<p>Length of the data</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.string_out.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.string_out.page
index 8195d4a..81a5b07 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.string_out.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.string_out.page
@@ -37,14 +37,20 @@ gboolean regress_annotation_object_string_out (RegressAnnotationObject* object,
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>a <link xref="Regress.AnnotationObject"/></p></dd>
-<dt><p>str_out :</p></dt>
-<dd><p>string return value</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>some boolean</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>a <link xref="Regress.AnnotationObject"/></p>
+</item>
+<item>
+<title><code>str_out</code></title>
+<p>string return value</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>some boolean</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.use_buffer.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.use_buffer.page
index 8a8094b..06a2690 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.use_buffer.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.use_buffer.page
@@ -37,14 +37,20 @@ void regress_annotation_object_use_buffer (RegressAnnotationObject* object,
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>bytes :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>bytes</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch.page
index c669d91..b92ea0e 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch.page
@@ -43,16 +43,24 @@ void regress_annotation_object_watch (RegressAnnotationObject* object,
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>A <link xref="Regress.AnnotationObject"/></p></dd>
-<dt><p>func :</p></dt>
-<dd><p>The callback</p></dd>
-<dt><p>user_data :</p></dt>
-<dd><p>The callback data</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>A <link xref="Regress.AnnotationObject"/></p>
+</item>
+<item>
+<title><code>func</code></title>
+<p>The callback</p>
+</item>
+<item>
+<title><code>user_data</code></title>
+<p>The callback data</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page
index 90500cc..0ce3a59 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page
@@ -47,18 +47,28 @@ void regress_annotation_object_watch_full (RegressAnnotationObject* object,
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>A <link xref="Regress.AnnotationObject"/></p></dd>
-<dt><p>func :</p></dt>
-<dd><p>The callback</p></dd>
-<dt><p>user_data :</p></dt>
-<dd><p>The callback data</p></dd>
-<dt><p>destroy :</p></dt>
-<dd><p>Destroy notification</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>A <link xref="Regress.AnnotationObject"/></p>
+</item>
+<item>
+<title><code>func</code></title>
+<p>The callback</p>
+</item>
+<item>
+<title><code>user_data</code></title>
+<p>The callback data</p>
+</item>
+<item>
+<title><code>destroy</code></title>
+<p>Destroy notification</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.with_voidp.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.with_voidp.page
index 287a0d2..27f467e 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.with_voidp.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.with_voidp.page
@@ -37,14 +37,20 @@ void regress_annotation_object_with_voidp (RegressAnnotationObject* object,
-<dl>
-<dt><p>object :</p></dt>
-<dd></dd>
-<dt><p>data :</p></dt>
-<dd><p>Opaque pointer handle</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+
+</item>
+<item>
+<title><code>data</code></title>
+<p>Opaque pointer handle</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.add.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.add.page
index b518be0..8a29140 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.add.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.add.page
@@ -37,14 +37,20 @@ void regress_foo_brect_add (RegressFooBRect* b1,
-<dl>
-<dt><p>b1 :</p></dt>
-<dd></dd>
-<dt><p>b2 :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>b1</code></title>
+
+</item>
+<item>
+<title><code>b2</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.new.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.new.page
index 6b1b283..53d8a79 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.new.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.new.page
@@ -37,14 +37,20 @@ RegressFooBRect* regress_foo_brect_new (double x,
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>y :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>y</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.method.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.method.page
index 565e966..dc73690 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.method.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.method.page
@@ -32,12 +32,16 @@ void regress_foo_boxed_method (RegressFooBoxed* boxed);
-<dl>
-<dt><p>boxed :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>boxed</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.new.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.new.page
index bfaaeb8..d745c1e 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.new.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.new.page
@@ -28,10 +28,12 @@ RegressFooBoxed* regress_foo_boxed_new (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.some_method.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.some_method.page
index 937b679..19a2946 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.some_method.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.some_method.page
@@ -32,12 +32,16 @@ void regress_foo_buffer_some_method (RegressFooBuffer* buffer);
-<dl>
-<dt><p>buffer :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>buffer</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.method.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.method.page
index 1324acb..4b5177c 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.method.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.method.page
@@ -32,12 +32,16 @@ void regress_foo_dbus_data_method (RegressFooDBusData* dbusdata);
-<dl>
-<dt><p>dbusdata :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>dbusdata</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.copy.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.copy.page
index 836cfe8..b6ecbf7 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.copy.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.copy.page
@@ -32,12 +32,16 @@ RegressFooForeignStruct* regress_foo_foreign_struct_copy (RegressFooForeignStruc
-<dl>
-<dt><p>original :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>original</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.new.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.new.page
index 710c5ef..ef6cd40 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.new.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.new.page
@@ -28,10 +28,12 @@ RegressFooForeignStruct* regress_foo_foreign_struct_new (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface-do_regress_foo.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface-do_regress_foo.page
index 3a16ebc..29f95e9 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface-do_regress_foo.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface-do_regress_foo.page
@@ -23,14 +23,20 @@ void do_regress_foo (RegressFooInterface* self,
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.do_regress_foo.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.do_regress_foo.page
index f655d16..bfe7803 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.do_regress_foo.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.do_regress_foo.page
@@ -37,14 +37,20 @@ void regress_foo_interface_do_regress_foo (RegressFooInterface* iface,
-<dl>
-<dt><p>iface :</p></dt>
-<dd></dd>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>iface</code></title>
+
+</item>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.static_method.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.static_method.page
index 009383f..a4270fe 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.static_method.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.static_method.page
@@ -32,12 +32,16 @@ void regress_foo_interface_static_method (int x);
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-read_fn.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-read_fn.page
index 8efc5f1..b6d543d 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-read_fn.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-read_fn.page
@@ -24,16 +24,24 @@ void read_fn (RegressFooObject* object,
-<dl>
-<dt><p>object :</p></dt>
-<dd></dd>
-<dt><p>offset :</p></dt>
-<dd><p>offset</p></dd>
-<dt><p>length :</p></dt>
-<dd><p>length</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+
+</item>
+<item>
+<title><code>offset</code></title>
+<p>offset</p>
+</item>
+<item>
+<title><code>length</code></title>
+<p>length</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-signal.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-signal.page
index d745360..cbcb93f 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-signal.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-signal.page
@@ -24,14 +24,20 @@ gchar* signal (GObject object,
-<dl>
-<dt><p>object :</p></dt>
-<dd></dd>
-<dt><p>p0 :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+
+</item>
+<item>
+<title><code>p0</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-virtual_method.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-virtual_method.page
index 8dc89fd..12837f4 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-virtual_method.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-virtual_method.page
@@ -23,14 +23,20 @@ gboolean virtual_method (RegressFooObject* object,
-<dl>
-<dt><p>object :</p></dt>
-<dd></dd>
-<dt><p>first_param :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+
+</item>
+<item>
+<title><code>first_param</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.a_global_method.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.a_global_method.page
index 2f4e1b5..b63ba80 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.a_global_method.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.a_global_method.page
@@ -32,12 +32,16 @@ void regress_foo_object_a_global_method (UtilityObject* obj);
-<dl>
-<dt><p>obj :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.append_new_stack_layer.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.append_new_stack_layer.page
index fb0c658..606729c 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.append_new_stack_layer.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.append_new_stack_layer.page
@@ -37,14 +37,20 @@ RegressFooOtherObject* regress_foo_object_append_new_stack_layer (RegressFooObje
-<dl>
-<dt><p>obj :</p></dt>
-<dd></dd>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.dup_name.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.dup_name.page
index 3e0a8aa..373841e 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.dup_name.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.dup_name.page
@@ -32,12 +32,16 @@ char* regress_foo_object_dup_name (RegressFooObject* object);
-<dl>
-<dt><p>object :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.external_type.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.external_type.page
index 3d9138e..2937dbd 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.external_type.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.external_type.page
@@ -32,12 +32,16 @@ UtilityObject* regress_foo_object_external_type (RegressFooObject* object);
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>a <link xref="Regress.FooObject"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p><code>NULL</code> always</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>a <link xref="Regress.FooObject"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p><code>NULL</code> always</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_default.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_default.page
index 201db73..d2010a4 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_default.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_default.page
@@ -29,10 +29,12 @@ uses a C sugar return type.</p>
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>The global <link xref="Regress.FooSubobject"/></p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>The global <link xref="Regress.FooSubobject"/></p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_name.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_name.page
index d48725b..d94cdbf 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_name.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_name.page
@@ -32,12 +32,16 @@ const char* regress_foo_object_get_name (RegressFooObject* object);
-<dl>
-<dt><p>object :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.handle_glyph.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.handle_glyph.page
index 19f19fa..696748f 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.handle_glyph.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.handle_glyph.page
@@ -37,14 +37,20 @@ void regress_foo_object_handle_glyph (RegressFooObject* object,
-<dl>
-<dt><p>object :</p></dt>
-<dd></dd>
-<dt><p>glyph :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+
+</item>
+<item>
+<title><code>glyph</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.is_it_time_yet.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.is_it_time_yet.page
index 6aa3e82..b1f225e 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.is_it_time_yet.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.is_it_time_yet.page
@@ -37,14 +37,20 @@ void regress_foo_object_is_it_time_yet (RegressFooObject* object,
-<dl>
-<dt><p>object :</p></dt>
-<dd></dd>
-<dt><p>time :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+
+</item>
+<item>
+<title><code>time</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new.page
index b1d8ccb..99810f8 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new.page
@@ -28,10 +28,12 @@ RegressFooObject* regress_foo_object_new (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_as_super.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_as_super.page
index 7ab6a24..8c89bd5 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_as_super.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_as_super.page
@@ -28,10 +28,12 @@ GObject* regress_foo_object_new_as_super (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_cookie.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_cookie.page
index 5d4766a..83b9b8f 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_cookie.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_cookie.page
@@ -37,14 +37,20 @@ RegressFooObjectCookie regress_foo_object_new_cookie (RegressFooObject* object,
-<dl>
-<dt><p>object :</p></dt>
-<dd></dd>
-<dt><p>target :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+
+</item>
+<item>
+<title><code>target</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.read.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.read.page
index cff7711..df2703a 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.read.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.read.page
@@ -42,16 +42,24 @@ void regress_foo_object_read (RegressFooObject* object,
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>obj</p></dd>
-<dt><p>offset :</p></dt>
-<dd><p>offset</p></dd>
-<dt><p>length :</p></dt>
-<dd><p>length</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>obj</p>
+</item>
+<item>
+<title><code>offset</code></title>
+<p>offset</p>
+</item>
+<item>
+<title><code>length</code></title>
+<p>length</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.skipped_method.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.skipped_method.page
index f82a16b..9aff026 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.skipped_method.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.skipped_method.page
@@ -32,12 +32,16 @@ void regress_foo_object_skipped_method (RegressFooObject* object);
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>obj</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>obj</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.static_meth.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.static_meth.page
index 13e2427..5988a07 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.static_meth.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.static_meth.page
@@ -28,10 +28,12 @@ int regress_foo_object_static_meth (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page
index 3d842cf..bfd7d1c 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page
@@ -39,16 +39,24 @@ void regress_foo_object_take_all (RegressFooObject* object,
-<dl>
-<dt><p>object :</p></dt>
-<dd></dd>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>None :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+
+</item>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>None</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.various.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.various.page
index 82d3c18..9c9e4b5 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.various.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.various.page
@@ -42,16 +42,24 @@ void regress_foo_object_various (RegressFooObject* object,
-<dl>
-<dt><p>object :</p></dt>
-<dd></dd>
-<dt><p>data :</p></dt>
-<dd></dd>
-<dt><p>some_type :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+
+</item>
+<item>
+<title><code>data</code></title>
+
+</item>
+<item>
+<title><code>some_type</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.virtual_method.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.virtual_method.page
index 29a2c8c..a342c3a 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.virtual_method.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.virtual_method.page
@@ -37,14 +37,20 @@ gboolean regress_foo_object_virtual_method (RegressFooObject* object,
-<dl>
-<dt><p>object :</p></dt>
-<dd></dd>
-<dt><p>first_param :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+
+</item>
+<item>
+<title><code>first_param</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.add.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.add.page
index 483e04f..137f94c 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.add.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.add.page
@@ -37,14 +37,20 @@ void regress_foo_rectangle_add (RegressFooRectangle* r1,
-<dl>
-<dt><p>r1 :</p></dt>
-<dd><p>add to this rect</p></dd>
-<dt><p>r2 :</p></dt>
-<dd><p>source rectangle</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>r1</code></title>
+<p>add to this rect</p>
+</item>
+<item>
+<title><code>r2</code></title>
+<p>source rectangle</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.new.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.new.page
index 43d831e..11a38ea 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.new.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.new.page
@@ -48,18 +48,28 @@ it because it's not a boxed type.</p>
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>y :</p></dt>
-<dd></dd>
-<dt><p>width :</p></dt>
-<dd></dd>
-<dt><p>height :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>y</code></title>
+
+</item>
+<item>
+<title><code>width</code></title>
+
+</item>
+<item>
+<title><code>height</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy-event.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy-event.page
index 131747d..8ad16c8 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy-event.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy-event.page
@@ -23,10 +23,12 @@ void destroy-event (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy_event.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy_event.page
index 2995ee8..64855ff 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy_event.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy_event.page
@@ -22,12 +22,16 @@ void destroy_event (RegressFooSubInterface* self);
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_bar.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_bar.page
index aa72dd1..beb98d1 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_bar.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_bar.page
@@ -22,12 +22,16 @@ void do_bar (RegressFooSubInterface* self);
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_baz.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_baz.page
index 777e47b..1b1dc30 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_baz.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_baz.page
@@ -24,16 +24,24 @@ void do_baz (RegressFooSubInterface* self,
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>user_data :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>user_data</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_bar.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_bar.page
index f5d7541..22d4ef2 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_bar.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_bar.page
@@ -32,12 +32,16 @@ void regress_foo_sub_interface_do_bar (RegressFooSubInterface* self);
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_baz.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_baz.page
index d3fbac4..2517846 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_baz.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_baz.page
@@ -42,16 +42,24 @@ void regress_foo_sub_interface_do_baz (RegressFooSubInterface* self,
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>user_data :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>user_data</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.new.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.new.page
index 8636405..2b99532 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.new.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.new.page
@@ -28,10 +28,12 @@ RegressFooSubobject* regress_foo_subobject_new (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.copy.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.copy.page
index 5bd06bb..660dc89 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.copy.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.copy.page
@@ -32,12 +32,16 @@ RegressTestBoxed* regress_test_boxed_copy (RegressTestBoxed* boxed);
-<dl>
-<dt><p>boxed :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>boxed</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.equals.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.equals.page
index 073b44b..9759b50 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.equals.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.equals.page
@@ -37,14 +37,20 @@ gboolean regress_test_boxed_equals (RegressTestBoxed* boxed,
-<dl>
-<dt><p>boxed :</p></dt>
-<dd></dd>
-<dt><p>other :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>boxed</code></title>
+
+</item>
+<item>
+<title><code>other</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new.page
index ce4f17b..e2550d6 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new.page
@@ -28,10 +28,12 @@ RegressTestBoxed* regress_test_boxed_new (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor1.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor1.page
index 7d4292a..3f6df8a 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor1.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor1.page
@@ -32,12 +32,16 @@ RegressTestBoxed* regress_test_boxed_new_alternative_constructor1 (int i);
-<dl>
-<dt><p>i :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>i</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor2.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor2.page
index 5ec33cc..603792e 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor2.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor2.page
@@ -37,14 +37,20 @@ RegressTestBoxed* regress_test_boxed_new_alternative_constructor2 (int i,
-<dl>
-<dt><p>i :</p></dt>
-<dd></dd>
-<dt><p>j :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>i</code></title>
+
+</item>
+<item>
+<title><code>j</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor3.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor3.page
index 56b516e..a7f7b65 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor3.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor3.page
@@ -32,12 +32,16 @@ RegressTestBoxed* regress_test_boxed_new_alternative_constructor3 (char* s);
-<dl>
-<dt><p>s :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>s</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.copy.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.copy.page
index 9965112..c2b907b 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.copy.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.copy.page
@@ -32,12 +32,16 @@ RegressTestBoxedB* regress_test_boxed_b_copy (RegressTestBoxedB* boxed);
-<dl>
-<dt><p>boxed :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>boxed</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.new.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.new.page
index 5266692..72e4cb0 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.new.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.new.page
@@ -37,14 +37,20 @@ RegressTestBoxedB* regress_test_boxed_b_new (gint8 some_int8,
-<dl>
-<dt><p>some_int8 :</p></dt>
-<dd></dd>
-<dt><p>some_long :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>some_int8</code></title>
+
+</item>
+<item>
+<title><code>some_long</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.new.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.new.page
index 52ed348..cc9a47d 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.new.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.new.page
@@ -28,10 +28,12 @@ RegressTestBoxedC* regress_test_boxed_c_new (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.copy.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.copy.page
index fd21b48..c73df3c 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.copy.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.copy.page
@@ -32,12 +32,16 @@ RegressTestBoxedD* regress_test_boxed_d_copy (RegressTestBoxedD* boxed);
-<dl>
-<dt><p>boxed :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>boxed</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.free.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.free.page
index c98b5f7..110ec05 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.free.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.free.page
@@ -32,12 +32,16 @@ void regress_test_boxed_d_free (RegressTestBoxedD* boxed);
-<dl>
-<dt><p>boxed :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>boxed</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.get_magic.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.get_magic.page
index 240ad4f..832b77c 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.get_magic.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.get_magic.page
@@ -32,12 +32,16 @@ int regress_test_boxed_d_get_magic (RegressTestBoxedD* boxed);
-<dl>
-<dt><p>boxed :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>boxed</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.new.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.new.page
index 26ec2bb..d92e39a 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.new.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.new.page
@@ -37,14 +37,20 @@ RegressTestBoxedD* regress_test_boxed_d_new (const char* a_string,
-<dl>
-<dt><p>a_string :</p></dt>
-<dd></dd>
-<dt><p>a_int :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>a_string</code></title>
+
+</item>
+<item>
+<title><code>a_int</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.new.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.new.page
index 14316be..911873d 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.new.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.new.page
@@ -28,10 +28,12 @@ RegressTestFloating* regress_test_floating_new (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>A new floating <link xref="Regress.TestFloating"/></p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>A new floating <link xref="Regress.TestFloating"/></p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.ref.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.ref.page
index c4b6afa..71c0696 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.ref.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.ref.page
@@ -32,12 +32,16 @@ RegressTestFundamentalObject* regress_test_fundamental_object_ref (RegressTestFu
-<dl>
-<dt><p>fundamental_object :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>A new <link xref="Regress.TestFundamentalObject"/></p></dd>
-</dl>
+<terms>
+<item>
+<title><code>fundamental_object</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>A new <link xref="Regress.TestFundamentalObject"/></p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.unref.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.unref.page
index 776c6f6..7bdf0d8 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.unref.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.unref.page
@@ -32,12 +32,16 @@ void regress_test_fundamental_object_unref (RegressTestFundamentalObject* fundam
-<dl>
-<dt><p>fundamental_object :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>fundamental_object</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.new.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.new.page
index 26af86a..0c9085e 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.new.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.new.page
@@ -32,12 +32,16 @@ RegressTestFundamentalSubObject* regress_test_fundamental_sub_object_new (const
-<dl>
-<dt><p>data :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>data</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo.page
index 35caeed..b2f85d4 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo.page
@@ -37,14 +37,20 @@ void regress_test_inherit_drawable_do_foo (RegressTestInheritDrawable* drawable,
-<dl>
-<dt><p>drawable :</p></dt>
-<dd></dd>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>drawable</code></title>
+
+</item>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page
index cdd2732..e737f0f 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page
@@ -37,14 +37,20 @@ void regress_test_inherit_drawable_do_foo_maybe_throw (RegressTestInheritDrawabl
-<dl>
-<dt><p>drawable :</p></dt>
-<dd></dd>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>drawable</code></title>
+
+</item>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_origin.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_origin.page
index 11f3600..364f2a4 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_origin.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_origin.page
@@ -42,16 +42,24 @@ void regress_test_inherit_drawable_get_origin (RegressTestInheritDrawable* drawa
-<dl>
-<dt><p>drawable :</p></dt>
-<dd></dd>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>y :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>drawable</code></title>
+
+</item>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>y</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_size.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_size.page
index c3061a9..616dc66 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_size.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_size.page
@@ -42,16 +42,24 @@ void regress_test_inherit_drawable_get_size (RegressTestInheritDrawable* drawabl
-<dl>
-<dt><p>drawable :</p></dt>
-<dd></dd>
-<dt><p>width :</p></dt>
-<dd></dd>
-<dt><p>height :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>drawable</code></title>
+
+</item>
+<item>
+<title><code>width</code></title>
+
+</item>
+<item>
+<title><code>height</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-all.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-all.page
index 01b4560..7526a98 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-all.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-all.page
@@ -23,10 +23,12 @@ void all (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-allow_none_vfunc.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-allow_none_vfunc.page
index ad9d6c8..37c69f9 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-allow_none_vfunc.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-allow_none_vfunc.page
@@ -23,14 +23,20 @@ void allow_none_vfunc (RegressTestObj* obj,
-<dl>
-<dt><p>obj :</p></dt>
-<dd></dd>
-<dt><p>two :</p></dt>
-<dd><p>Another object</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+<item>
+<title><code>two</code></title>
+<p>Another object</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-cleanup.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-cleanup.page
index ecb33c4..0dc4c38 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-cleanup.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-cleanup.page
@@ -23,10 +23,12 @@ void cleanup (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-first.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-first.page
index ccdfb64..94c3659 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-first.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-first.page
@@ -23,10 +23,12 @@ void first (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-matrix.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-matrix.page
index b17c04d..fc86d85 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-matrix.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-matrix.page
@@ -25,14 +25,20 @@ case.</p>
-<dl>
-<dt><p>obj :</p></dt>
-<dd></dd>
-<dt><p>somestr :</p></dt>
-<dd><p>Meaningless string</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+<item>
+<title><code>somestr</code></title>
+<p>Meaningless string</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-prop.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-prop.page
index a9356cb..dd9c067 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-prop.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-prop.page
@@ -24,12 +24,16 @@ void sig-with-array-prop (guint* arr);
-<dl>
-<dt><p>arr :</p></dt>
-<dd><p>numbers</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>arr</code></title>
+<p>numbers</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-foreign-struct.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-foreign-struct.page
index afe8466..d4ef464 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-foreign-struct.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-foreign-struct.page
@@ -23,12 +23,16 @@ void sig-with-foreign-struct (cairo_t cr);
-<dl>
-<dt><p>cr :</p></dt>
-<dd><p>A cairo context.</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>cr</code></title>
+<p>A cairo context.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-hash-prop.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-hash-prop.page
index 2c7e3f9..9e7233f 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-hash-prop.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-hash-prop.page
@@ -24,12 +24,16 @@ void sig-with-hash-prop (<map> hash);
-<dl>
-<dt><p>hash :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>hash</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-int64-prop.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-int64-prop.page
index 6a771a1..34b59f1 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-int64-prop.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-int64-prop.page
@@ -24,12 +24,16 @@ the introspection client langage.</p>
-<dl>
-<dt><p>i :</p></dt>
-<dd><p>an integer</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>i</code></title>
+<p>an integer</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-intarray-ret.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-intarray-ret.page
index 135d052..c8ffee3 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-intarray-ret.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-intarray-ret.page
@@ -23,12 +23,16 @@ None sig-with-intarray-ret (gint i);
-<dl>
-<dt><p>i :</p></dt>
-<dd><p>an integer</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>i</code></title>
+<p>an integer</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-obj.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-obj.page
index 5aee822..94dfedb 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-obj.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-obj.page
@@ -24,12 +24,16 @@ Use with regress_test_obj_emit_sig_with_obj</p>
-<dl>
-<dt><p>obj :</p></dt>
-<dd><p>A newly created RegressTestObj</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+<p>A newly created RegressTestObj</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-strv.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-strv.page
index c5fd2dd..66c7ec1 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-strv.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-strv.page
@@ -23,12 +23,16 @@ void sig-with-strv (utf8* strs);
-<dl>
-<dt><p>strs :</p></dt>
-<dd><p>strings</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>strs</code></title>
+<p>strings</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-uint64-prop.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-uint64-prop.page
index 25d6d5e..35ed4a6 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-uint64-prop.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-uint64-prop.page
@@ -24,12 +24,16 @@ the introspection client langage.</p>
-<dl>
-<dt><p>i :</p></dt>
-<dd><p>an integer</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>i</code></title>
+<p>an integer</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test-with-static-scope-arg.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test-with-static-scope-arg.page
index f0df5f3..3febc0c 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test-with-static-scope-arg.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test-with-static-scope-arg.page
@@ -23,12 +23,16 @@ void test-with-static-scope-arg (RegressTestSimpleBoxedA object);
-<dl>
-<dt><p>object :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test.page
index 2932141..be5c6ad 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test.page
@@ -23,10 +23,12 @@ void test (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.constructor.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.constructor.page
index 5cdc38d..0674eb7 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.constructor.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.constructor.page
@@ -28,10 +28,12 @@ RegressTestObj* regress_constructor (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.do_matrix.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.do_matrix.page
index b54d35a..45a57e6 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.do_matrix.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.do_matrix.page
@@ -39,14 +39,20 @@ case.</p>
-<dl>
-<dt><p>obj :</p></dt>
-<dd><p>A <link xref="Regress.TestObj"/></p></dd>
-<dt><p>somestr :</p></dt>
-<dd><p>Meaningless string</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+<p>A <link xref="Regress.TestObj"/></p>
+</item>
+<item>
+<title><code>somestr</code></title>
+<p>Meaningless string</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_foreign_struct.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_foreign_struct.page
index 677f1fc..d003646 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_foreign_struct.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_foreign_struct.page
@@ -32,12 +32,16 @@ void regress_test_obj_emit_sig_with_foreign_struct (RegressTestObj* obj);
-<dl>
-<dt><p>obj :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_int64.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_int64.page
index 2dc8a1b..5ea844a 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_int64.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_int64.page
@@ -32,12 +32,16 @@ void regress_test_obj_emit_sig_with_int64 (RegressTestObj* obj);
-<dl>
-<dt><p>obj :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_obj.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_obj.page
index 9d598f9..693df71 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_obj.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_obj.page
@@ -32,12 +32,16 @@ void regress_test_obj_emit_sig_with_obj (RegressTestObj* obj);
-<dl>
-<dt><p>obj :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_uint64.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_uint64.page
index a3a89c1..4ce7bab 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_uint64.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_uint64.page
@@ -32,12 +32,16 @@ void regress_test_obj_emit_sig_with_uint64 (RegressTestObj* obj);
-<dl>
-<dt><p>obj :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.forced_method.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.forced_method.page
index 28fc691..09328dd 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.forced_method.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.forced_method.page
@@ -32,12 +32,16 @@ void regress_forced_method (RegressTestObj* obj);
-<dl>
-<dt><p>obj :</p></dt>
-<dd><p>A <link xref="Regress.TestObj"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+<p>A <link xref="Regress.TestObj"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method.page
index 2121ada..3b83028 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method.page
@@ -32,12 +32,16 @@ int regress_test_obj_instance_method (RegressTestObj* obj);
-<dl>
-<dt><p>obj :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_callback.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_callback.page
index 7ea1766..e4c2bd4 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_callback.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_callback.page
@@ -37,14 +37,20 @@ void regress_test_obj_instance_method_callback (RegressTestObj* obj,
-<dl>
-<dt><p>obj :</p></dt>
-<dd></dd>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new.page
index 1f5ca6d..a8fd4f0 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new.page
@@ -32,12 +32,16 @@ RegressTestObj* regress_test_obj_new (RegressTestObj* obj);
-<dl>
-<dt><p>obj :</p></dt>
-<dd><p>A <link xref="Regress.TestObj"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+<p>A <link xref="Regress.TestObj"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_callback.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_callback.page
index 44f469d..07e52ef 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_callback.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_callback.page
@@ -42,16 +42,24 @@ RegressTestObj* regress_test_obj_new_callback (RegressTestCallbackUserData callb
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>user_data :</p></dt>
-<dd></dd>
-<dt><p>notify :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>user_data</code></title>
+
+</item>
+<item>
+<title><code>notify</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_from_file.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_from_file.page
index 49f9c1f..bcfd048 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_from_file.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_from_file.page
@@ -32,12 +32,16 @@ RegressTestObj* regress_test_obj_new_from_file (const char* x);
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.null_out.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.null_out.page
index bd78434..637585b 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.null_out.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.null_out.page
@@ -32,12 +32,16 @@ void regress_test_obj_null_out (RegressTestObj** obj);
-<dl>
-<dt><p>obj :</p></dt>
-<dd><p>A <link xref="Regress.TestObj"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+<p>A <link xref="Regress.TestObj"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.set_bare.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.set_bare.page
index f1e9a13..4780264 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.set_bare.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.set_bare.page
@@ -37,14 +37,20 @@ void regress_test_obj_set_bare (RegressTestObj* obj,
-<dl>
-<dt><p>obj :</p></dt>
-<dd></dd>
-<dt><p>bare :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+<item>
+<title><code>bare</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_inout_param.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_inout_param.page
index f46ec16..bc2a21e 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_inout_param.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_inout_param.page
@@ -67,26 +67,44 @@ gboolean regress_test_obj_skip_inout_param (RegressTestObj* obj,
-<dl>
-<dt><p>obj :</p></dt>
-<dd><p>A <link xref="Regress.TestObj"/>.</p></dd>
-<dt><p>a :</p></dt>
-<dd><p>Parameter.</p></dd>
-<dt><p>out_b :</p></dt>
-<dd><p>Return value.</p></dd>
-<dt><p>c :</p></dt>
-<dd><p>Other parameter.</p></dd>
-<dt><p>inout_d :</p></dt>
-<dd><p>Will be incremented.</p></dd>
-<dt><p>out_sum :</p></dt>
-<dd><p>Return value.</p></dd>
-<dt><p>num1 :</p></dt>
-<dd><p>Number.</p></dd>
-<dt><p>num2 :</p></dt>
-<dd><p>Number.</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p><code>TRUE</code> if the call succeeds, <code>FALSE</code> if @error is set.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+<p>A <link xref="Regress.TestObj"/>.</p>
+</item>
+<item>
+<title><code>a</code></title>
+<p>Parameter.</p>
+</item>
+<item>
+<title><code>out_b</code></title>
+<p>Return value.</p>
+</item>
+<item>
+<title><code>c</code></title>
+<p>Other parameter.</p>
+</item>
+<item>
+<title><code>inout_d</code></title>
+<p>Will be incremented.</p>
+</item>
+<item>
+<title><code>out_sum</code></title>
+<p>Return value.</p>
+</item>
+<item>
+<title><code>num1</code></title>
+<p>Number.</p>
+</item>
+<item>
+<title><code>num2</code></title>
+<p>Number.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p><code>TRUE</code> if the call succeeds, <code>FALSE</code> if @error is set.</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_out_param.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_out_param.page
index 77e1de3..933af00 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_out_param.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_out_param.page
@@ -67,26 +67,44 @@ gboolean regress_test_obj_skip_out_param (RegressTestObj* obj,
-<dl>
-<dt><p>obj :</p></dt>
-<dd><p>A <link xref="Regress.TestObj"/>.</p></dd>
-<dt><p>a :</p></dt>
-<dd><p>Parameter.</p></dd>
-<dt><p>out_b :</p></dt>
-<dd><p>Return value.</p></dd>
-<dt><p>c :</p></dt>
-<dd><p>Other parameter.</p></dd>
-<dt><p>inout_d :</p></dt>
-<dd><p>Will be incremented.</p></dd>
-<dt><p>out_sum :</p></dt>
-<dd><p>Return value.</p></dd>
-<dt><p>num1 :</p></dt>
-<dd><p>Number.</p></dd>
-<dt><p>num2 :</p></dt>
-<dd><p>Number.</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p><code>TRUE</code> if the call succeeds, <code>FALSE</code> if @error is set.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+<p>A <link xref="Regress.TestObj"/>.</p>
+</item>
+<item>
+<title><code>a</code></title>
+<p>Parameter.</p>
+</item>
+<item>
+<title><code>out_b</code></title>
+<p>Return value.</p>
+</item>
+<item>
+<title><code>c</code></title>
+<p>Other parameter.</p>
+</item>
+<item>
+<title><code>inout_d</code></title>
+<p>Will be incremented.</p>
+</item>
+<item>
+<title><code>out_sum</code></title>
+<p>Return value.</p>
+</item>
+<item>
+<title><code>num1</code></title>
+<p>Number.</p>
+</item>
+<item>
+<title><code>num2</code></title>
+<p>Number.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p><code>TRUE</code> if the call succeeds, <code>FALSE</code> if @error is set.</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_param.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_param.page
index ef5893c..a0e4b32 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_param.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_param.page
@@ -67,26 +67,44 @@ gboolean regress_test_obj_skip_param (RegressTestObj* obj,
-<dl>
-<dt><p>obj :</p></dt>
-<dd><p>A <link xref="Regress.TestObj"/>.</p></dd>
-<dt><p>a :</p></dt>
-<dd><p>Parameter.</p></dd>
-<dt><p>out_b :</p></dt>
-<dd><p>Return value.</p></dd>
-<dt><p>c :</p></dt>
-<dd><p>Other parameter.</p></dd>
-<dt><p>inout_d :</p></dt>
-<dd><p>Will be incremented.</p></dd>
-<dt><p>out_sum :</p></dt>
-<dd><p>Return value.</p></dd>
-<dt><p>num1 :</p></dt>
-<dd><p>Number.</p></dd>
-<dt><p>num2 :</p></dt>
-<dd><p>Number.</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p><code>TRUE</code> if the call succeeds, <code>FALSE</code> if @error is set.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+<p>A <link xref="Regress.TestObj"/>.</p>
+</item>
+<item>
+<title><code>a</code></title>
+<p>Parameter.</p>
+</item>
+<item>
+<title><code>out_b</code></title>
+<p>Return value.</p>
+</item>
+<item>
+<title><code>c</code></title>
+<p>Other parameter.</p>
+</item>
+<item>
+<title><code>inout_d</code></title>
+<p>Will be incremented.</p>
+</item>
+<item>
+<title><code>out_sum</code></title>
+<p>Return value.</p>
+</item>
+<item>
+<title><code>num1</code></title>
+<p>Number.</p>
+</item>
+<item>
+<title><code>num2</code></title>
+<p>Number.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p><code>TRUE</code> if the call succeeds, <code>FALSE</code> if @error is set.</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val.page
index a463fe7..4347f1b 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val.page
@@ -67,26 +67,44 @@ gboolean regress_test_obj_skip_return_val (RegressTestObj* obj,
-<dl>
-<dt><p>obj :</p></dt>
-<dd><p>a <link xref="Regress.TestObj"/></p></dd>
-<dt><p>a :</p></dt>
-<dd><p>Parameter.</p></dd>
-<dt><p>out_b :</p></dt>
-<dd><p>A return value.</p></dd>
-<dt><p>c :</p></dt>
-<dd><p>Other parameter.</p></dd>
-<dt><p>inout_d :</p></dt>
-<dd><p>Will be incremented.</p></dd>
-<dt><p>out_sum :</p></dt>
-<dd><p>Return value.</p></dd>
-<dt><p>num1 :</p></dt>
-<dd><p>Number.</p></dd>
-<dt><p>num2 :</p></dt>
-<dd><p>Number.</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p><code>TRUE</code> if the call succeeds, <code>FALSE</code> if @error is set.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+<p>a <link xref="Regress.TestObj"/></p>
+</item>
+<item>
+<title><code>a</code></title>
+<p>Parameter.</p>
+</item>
+<item>
+<title><code>out_b</code></title>
+<p>A return value.</p>
+</item>
+<item>
+<title><code>c</code></title>
+<p>Other parameter.</p>
+</item>
+<item>
+<title><code>inout_d</code></title>
+<p>Will be incremented.</p>
+</item>
+<item>
+<title><code>out_sum</code></title>
+<p>Return value.</p>
+</item>
+<item>
+<title><code>num1</code></title>
+<p>Number.</p>
+</item>
+<item>
+<title><code>num2</code></title>
+<p>Number.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p><code>TRUE</code> if the call succeeds, <code>FALSE</code> if @error is set.</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val_no_out.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val_no_out.page
index 5ebe0f1..e931ab9 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val_no_out.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val_no_out.page
@@ -38,14 +38,20 @@ raise an error.</p>
-<dl>
-<dt><p>obj :</p></dt>
-<dd><p>a <link xref="Regress.TestObj"/></p></dd>
-<dt><p>a :</p></dt>
-<dd><p>Parameter.</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p><code>TRUE</code> if the call succeeds, <code>FALSE</code> if @error is set.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+<p>a <link xref="Regress.TestObj"/></p>
+</item>
+<item>
+<title><code>a</code></title>
+<p>Parameter.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p><code>TRUE</code> if the call succeeds, <code>FALSE</code> if @error is set.</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method.page
index c27d88b..7885b72 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method.page
@@ -32,12 +32,16 @@ double regress_test_obj_static_method (int x);
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method_callback.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method_callback.page
index 74583ad..552dc22 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method_callback.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method_callback.page
@@ -32,12 +32,16 @@ void regress_test_obj_static_method_callback (RegressTestCallback callback);
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_0.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_0.page
index 2ace5e1..748621b 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_0.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_0.page
@@ -62,24 +62,40 @@ void regress_test_obj_torture_signature_0 (RegressTestObj* obj,
-<dl>
-<dt><p>obj :</p></dt>
-<dd><p>A <link xref="Regress.TestObj"/></p></dd>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>y :</p></dt>
-<dd></dd>
-<dt><p>z :</p></dt>
-<dd></dd>
-<dt><p>foo :</p></dt>
-<dd></dd>
-<dt><p>q :</p></dt>
-<dd></dd>
-<dt><p>m :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+<p>A <link xref="Regress.TestObj"/></p>
+</item>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>y</code></title>
+
+</item>
+<item>
+<title><code>z</code></title>
+
+</item>
+<item>
+<title><code>foo</code></title>
+
+</item>
+<item>
+<title><code>q</code></title>
+
+</item>
+<item>
+<title><code>m</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_1.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_1.page
index aa31fb3..0cfc66d 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_1.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_1.page
@@ -62,24 +62,40 @@ gboolean regress_test_obj_torture_signature_1 (RegressTestObj* obj,
-<dl>
-<dt><p>obj :</p></dt>
-<dd><p>A <link xref="Regress.TestObj"/></p></dd>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>y :</p></dt>
-<dd></dd>
-<dt><p>z :</p></dt>
-<dd></dd>
-<dt><p>foo :</p></dt>
-<dd></dd>
-<dt><p>q :</p></dt>
-<dd></dd>
-<dt><p>m :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+<p>A <link xref="Regress.TestObj"/></p>
+</item>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>y</code></title>
+
+</item>
+<item>
+<title><code>z</code></title>
+
+</item>
+<item>
+<title><code>foo</code></title>
+
+</item>
+<item>
+<title><code>q</code></title>
+
+</item>
+<item>
+<title><code>m</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.const_return.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.const_return.page
index 39a3877..fda625d 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.const_return.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.const_return.page
@@ -28,10 +28,12 @@ const RegressTestSimpleBoxedA* regress_test_simple_boxed_a_const_return (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.copy.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.copy.page
index 827e39f..b91fe94 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.copy.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.copy.page
@@ -32,12 +32,16 @@ RegressTestSimpleBoxedA* regress_test_simple_boxed_a_copy (RegressTestSimpleBoxe
-<dl>
-<dt><p>a :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>a</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.equals.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.equals.page
index 4108bf9..7e7c16e 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.equals.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.equals.page
@@ -37,14 +37,20 @@ gboolean regress_test_simple_boxed_a_equals (RegressTestSimpleBoxedA* a,
-<dl>
-<dt><p>a :</p></dt>
-<dd></dd>
-<dt><p>other_a :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>a</code></title>
+
+</item>
+<item>
+<title><code>other_a</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.copy.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.copy.page
index 0846cbe..995aef6 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.copy.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.copy.page
@@ -32,12 +32,16 @@ RegressTestSimpleBoxedB* regress_test_simple_boxed_b_copy (RegressTestSimpleBoxe
-<dl>
-<dt><p>b :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>b</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.clone.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.clone.page
index 61f9430..e23b1fe 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.clone.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.clone.page
@@ -37,14 +37,20 @@ void regress_test_struct_a_clone (RegressTestStructA* a,
-<dl>
-<dt><p>a :</p></dt>
-<dd><p>the structure</p></dd>
-<dt><p>a_out :</p></dt>
-<dd><p>the cloned structure</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>a</code></title>
+<p>the structure</p>
+</item>
+<item>
+<title><code>a_out</code></title>
+<p>the cloned structure</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.parse.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.parse.page
index ef54d11..53adcbf 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.parse.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.parse.page
@@ -37,14 +37,20 @@ void regress_test_struct_a_parse (RegressTestStructA* a_out,
-<dl>
-<dt><p>a_out :</p></dt>
-<dd><p>the structure that is to be filled</p></dd>
-<dt><p>string :</p></dt>
-<dd><p>ignored</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>a_out</code></title>
+<p>the structure that is to be filled</p>
+</item>
+<item>
+<title><code>string</code></title>
+<p>ignored</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.clone.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.clone.page
index 4adde2a..03888f0 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.clone.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.clone.page
@@ -37,14 +37,20 @@ void regress_test_struct_b_clone (RegressTestStructB* b,
-<dl>
-<dt><p>b :</p></dt>
-<dd><p>the structure</p></dd>
-<dt><p>b_out :</p></dt>
-<dd><p>the cloned structure</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>b</code></title>
+<p>the structure</p>
+</item>
+<item>
+<title><code>b_out</code></title>
+<p>the cloned structure</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.frob.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.frob.page
index e3fb773..cb46a63 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.frob.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.frob.page
@@ -32,12 +32,16 @@ void regress_test_struct_fixed_array_frob (RegressTestStructFixedArray* str);
-<dl>
-<dt><p>str :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>str</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.instance_method.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.instance_method.page
index d32c0de..30b5642 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.instance_method.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.instance_method.page
@@ -32,12 +32,16 @@ int regress_test_sub_obj_instance_method (RegressTestSubObj* obj);
-<dl>
-<dt><p>obj :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.new.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.new.page
index f8ca0d4..3b96a33 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.new.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.new.page
@@ -28,10 +28,12 @@ RegressTestObj* regress_test_sub_obj_new (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.unset_bare.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.unset_bare.page
index a34a25c..ca95f17 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.unset_bare.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.unset_bare.page
@@ -32,12 +32,16 @@ void regress_test_sub_obj_unset_bare (RegressTestSubObj* obj);
-<dl>
-<dt><p>obj :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.get_testbool.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.get_testbool.page
index d54ed68..052090c 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.get_testbool.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.get_testbool.page
@@ -32,12 +32,16 @@ gboolean regress_test_wi_802_1x_get_testbool (RegressTestWi8021x* obj);
-<dl>
-<dt><p>obj :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.new.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.new.page
index 2c47b28..b6b025d 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.new.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.new.page
@@ -28,10 +28,12 @@ RegressTestWi8021x* regress_test_wi_802_1x_new (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.set_testbool.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.set_testbool.page
index a32a70a..8196f97 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.set_testbool.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.set_testbool.page
@@ -37,14 +37,20 @@ void regress_test_wi_802_1x_set_testbool (RegressTestWi8021x* obj,
-<dl>
-<dt><p>obj :</p></dt>
-<dd></dd>
-<dt><p>v :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+<item>
+<title><code>v</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.static_method.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.static_method.page
index cabdd48..6a42389 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.static_method.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.static_method.page
@@ -32,12 +32,16 @@ int regress_test_wi_802_1x_static_method (int x);
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.aliased_caller_alloc.page
b/tests/scanner/Regress-1.0-C-expected/Regress.aliased_caller_alloc.page
index 5f8b1ff..8d36267 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.aliased_caller_alloc.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.aliased_caller_alloc.page
@@ -32,12 +32,16 @@ void regress_aliased_caller_alloc (RegressAliasedTestBoxed* boxed);
-<dl>
-<dt><p>boxed :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>boxed</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_attribute_func.page
b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_attribute_func.page
index 0510282..ffc8022 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_attribute_func.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_attribute_func.page
@@ -37,14 +37,20 @@ gint regress_annotation_attribute_func (RegressAnnotationObject* object,
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>A <link xref="Regress.AnnotationObject"/>.</p></dd>
-<dt><p>data :</p></dt>
-<dd><p>Some data.</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>The return value.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>A <link xref="Regress.AnnotationObject"/>.</p>
+</item>
+<item>
+<title><code>data</code></title>
+<p>Some data.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>The return value.</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_custom_destroy.page
b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_custom_destroy.page
index 337b207..6573043 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_custom_destroy.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_custom_destroy.page
@@ -43,16 +43,24 @@ detection, and fixing it via regress_annotations.</p>
-<dl>
-<dt><p>callback :</p></dt>
-<dd><p>Destroy notification</p></dd>
-<dt><p>destroy :</p></dt>
-<dd></dd>
-<dt><p>data :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+<p>Destroy notification</p>
+</item>
+<item>
+<title><code>destroy</code></title>
+
+</item>
+<item>
+<title><code>data</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_get_source_file.page
b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_get_source_file.page
index 6a1c723..0424e3c 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_get_source_file.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_get_source_file.page
@@ -28,10 +28,12 @@ char* regress_annotation_get_source_file (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>Source file</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>Source file</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_init.page
b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_init.page
index 4b47160..cffa65b 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_init.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_init.page
@@ -37,14 +37,20 @@ void regress_annotation_init (int* argc,
-<dl>
-<dt><p>argc :</p></dt>
-<dd><p>The number of args.</p></dd>
-<dt><p>argv :</p></dt>
-<dd><p>The arguments.</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>argc</code></title>
+<p>The number of args.</p>
+</item>
+<item>
+<title><code>argv</code></title>
+<p>The arguments.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_invalid_regress_annotation.page
b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_invalid_regress_annotation.page
index 4c485ea..1c2256f 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_invalid_regress_annotation.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_invalid_regress_annotation.page
@@ -32,12 +32,16 @@ void regress_annotation_invalid_regress_annotation (int foo);
-<dl>
-<dt><p>foo :</p></dt>
-<dd><p>some text (e.g. example) or else</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>foo</code></title>
+<p>some text (e.g. example) or else</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_ptr_array.page
b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_ptr_array.page
index 496fcc5..79a3ab2 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_ptr_array.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_ptr_array.page
@@ -32,12 +32,16 @@ void regress_annotation_ptr_array (GValue* array);
-<dl>
-<dt><p>array :</p></dt>
-<dd><p>the array</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>array</code></title>
+<p>the array</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_array.page
b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_array.page
index 1a345a5..6e8b015 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_array.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_array.page
@@ -32,12 +32,16 @@ char** regress_annotation_return_array (int* length);
-<dl>
-<dt><p>length :</p></dt>
-<dd><p>Number of return values</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>The return value</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>length</code></title>
+<p>Number of return values</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>The return value</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_filename.page
b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_filename.page
index 968cfe1..d835b52 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_filename.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_filename.page
@@ -28,10 +28,12 @@ gchar* regress_annotation_return_filename (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>An annotated filename</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>An annotated filename</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_set_source_file.page
b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_set_source_file.page
index 663fd9d..ac54d22 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_set_source_file.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_set_source_file.page
@@ -32,12 +32,16 @@ void regress_annotation_set_source_file (char* fname);
-<dl>
-<dt><p>fname :</p></dt>
-<dd><p>Source file</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>fname</code></title>
+<p>Source file</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_space_after_comment_bug631690.page
b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_space_after_comment_bug631690.page
index a4d11d2..8238d38 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_space_after_comment_bug631690.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_space_after_comment_bug631690.page
@@ -28,10 +28,12 @@ void regress_annotation_space_after_comment_bug631690 (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_array_length.page
b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_array_length.page
index 520b473..89bc37e 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_array_length.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_array_length.page
@@ -37,14 +37,20 @@ void regress_annotation_string_array_length (guint n_properties,
-<dl>
-<dt><p>n_properties :</p></dt>
-<dd></dd>
-<dt><p>properties :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>n_properties</code></title>
+
+</item>
+<item>
+<title><code>properties</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated.page
b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated.page
index e90fa51..9ab21d3 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated.page
@@ -28,10 +28,12 @@ char** regress_annotation_string_zero_terminated (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>The return value</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>The return value</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated_out.page
b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated_out.page
index 34293f0..540e225 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated_out.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated_out.page
@@ -32,12 +32,16 @@ void regress_annotation_string_zero_terminated_out (char*** out);
-<dl>
-<dt><p>out :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>out</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_test_parsing_bug630862.page
b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_test_parsing_bug630862.page
index 7101371..368f740 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_test_parsing_bug630862.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_test_parsing_bug630862.page
@@ -28,10 +28,12 @@ GObject* regress_annotation_test_parsing_bug630862 (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>An object, note the colon:in here</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>An object, note the colon:in here</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_transfer_floating.page
b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_transfer_floating.page
index 1607c63..a9b1270 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_transfer_floating.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_transfer_floating.page
@@ -28,10 +28,12 @@ GObject* regress_annotation_transfer_floating (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>A floating object</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>A floating object</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_versioned.page
b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_versioned.page
index a3a0fb7..c50ca7b 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_versioned.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_versioned.page
@@ -29,10 +29,12 @@ void regress_annotation_versioned (void);
<p>Since 0.6</p>
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.atest_error_quark.page
b/tests/scanner/Regress-1.0-C-expected/Regress.atest_error_quark.page
index c5b4cb6..49c84ee 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.atest_error_quark.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.atest_error_quark.page
@@ -28,10 +28,12 @@ GQuark regress_atest_error_quark (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_async_ready_callback.page
b/tests/scanner/Regress-1.0-C-expected/Regress.foo_async_ready_callback.page
index f5ce697..be027cc 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_async_ready_callback.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_async_ready_callback.page
@@ -42,16 +42,24 @@ void regress_foo_async_ready_callback (GCancellable* cancellable,
-<dl>
-<dt><p>cancellable :</p></dt>
-<dd></dd>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>user_data :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>cancellable</code></title>
+
+</item>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>user_data</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_destroy_notify_callback.page
b/tests/scanner/Regress-1.0-C-expected/Regress.foo_destroy_notify_callback.page
index 6158bf2..ff381f0 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_destroy_notify_callback.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_destroy_notify_callback.page
@@ -42,16 +42,24 @@ void regress_foo_destroy_notify_callback (RegressFooCallback callback,
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>data :</p></dt>
-<dd></dd>
-<dt><p>destroy :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>data</code></title>
+
+</item>
+<item>
+<title><code>destroy</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_init.page
b/tests/scanner/Regress-1.0-C-expected/Regress.foo_init.page
index c3ed369..8190378 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_init.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_init.page
@@ -28,10 +28,12 @@ gint regress_foo_init (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_method_external_references.page
b/tests/scanner/Regress-1.0-C-expected/Regress.foo_method_external_references.page
index 07c9c6d..de8797c 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_method_external_references.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_method_external_references.page
@@ -47,18 +47,28 @@ void regress_foo_method_external_references (UtilityObject* object,
-<dl>
-<dt><p>object :</p></dt>
-<dd></dd>
-<dt><p>e :</p></dt>
-<dd></dd>
-<dt><p>f :</p></dt>
-<dd></dd>
-<dt><p>s :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+
+</item>
+<item>
+<title><code>e</code></title>
+
+</item>
+<item>
+<title><code>f</code></title>
+
+</item>
+<item>
+<title><code>s</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_not_a_constructor_new.page
b/tests/scanner/Regress-1.0-C-expected/Regress.foo_not_a_constructor_new.page
index d65bfa1..acbfa5e 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_not_a_constructor_new.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_not_a_constructor_new.page
@@ -29,10 +29,12 @@ a "Can't find matching type for constructor" warning.</p>
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_skip_me.page
b/tests/scanner/Regress-1.0-C-expected/Regress.foo_skip_me.page
index 8fb9d10..914e971 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_skip_me.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_skip_me.page
@@ -33,12 +33,16 @@ exposed to language bindings.</p>
-<dl>
-<dt><p>fs :</p></dt>
-<dd><p>a <link xref="Regress.FooSkippable"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>fs</code></title>
+<p>a <link xref="Regress.FooSkippable"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant.page
b/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant.page
index 0ed4e2f..d4a6fc3 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant.page
@@ -37,14 +37,20 @@ void regress_foo_some_variant (guint x,
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>args :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>args</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant_ptr.page
b/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant_ptr.page
index 3755024..461c877 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant_ptr.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant_ptr.page
@@ -37,14 +37,20 @@ void regress_foo_some_variant_ptr (guint x,
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>args :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>args</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_array.page
b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_array.page
index cf127cb..f6fcc31 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_array.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_array.page
@@ -28,10 +28,12 @@ GArray* regress_foo_test_array (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_param.page
b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_param.page
index 79c50cf..f98deeb 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_param.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_param.page
@@ -32,12 +32,16 @@ void regress_foo_test_const_char_param (const char* param);
-<dl>
-<dt><p>param :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>param</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_retval.page
b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_retval.page
index cb286e6..7d1f595 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_retval.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_retval.page
@@ -28,10 +28,12 @@ const char* regress_foo_test_const_char_retval (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_param.page
b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_param.page
index be33c5a..f72c8c1 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_param.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_param.page
@@ -32,12 +32,16 @@ void regress_foo_test_const_struct_param (const RegressFooStruct* param);
-<dl>
-<dt><p>param :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>param</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_retval.page
b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_retval.page
index 783b248..ee95d72 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_retval.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_retval.page
@@ -28,10 +28,12 @@ const RegressFooStruct* regress_foo_test_const_struct_retval (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array.page
b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array.page
index 83881f6..a342b01 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array.page
@@ -32,12 +32,16 @@ void regress_foo_test_string_array (char** array);
-<dl>
-<dt><p>array :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>array</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array_with_g.page
b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array_with_g.page
index c3c45b1..f5e81e3 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array_with_g.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array_with_g.page
@@ -32,12 +32,16 @@ void regress_foo_test_string_array_with_g (gchar** array);
-<dl>
-<dt><p>array :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>array</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_qualifier.page
b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_qualifier.page
index b3ded91..e797629 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_qualifier.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_qualifier.page
@@ -32,12 +32,16 @@ void regress_foo_test_unsigned_qualifier (unsigned int unsigned_param);
-<dl>
-<dt><p>unsigned_param :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>unsigned_param</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_type.page
b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_type.page
index 0610002..adcf6bc 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_type.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_type.page
@@ -32,12 +32,16 @@ void regress_foo_test_unsigned_type (unsigned unsigned_param);
-<dl>
-<dt><p>unsigned_param :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>unsigned_param</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback.page
b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback.page
index 9024a14..b3a9c3d 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback.page
@@ -37,14 +37,20 @@ void regress_foo_test_varargs_callback (gint i,
-<dl>
-<dt><p>i :</p></dt>
-<dd></dd>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>i</code></title>
+
+</item>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback2.page
b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback2.page
index f89f547..19cfec1 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback2.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback2.page
@@ -32,12 +32,16 @@ void regress_foo_test_varargs_callback2 (RegressFooVarargsCallback callback);
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback3.page
b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback3.page
index e34cfc7..f04a206 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback3.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback3.page
@@ -37,14 +37,20 @@ void regress_foo_test_varargs_callback3 (RegressFooVarargsCallback callback,
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>callback2 :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>callback2</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.func_obj_null_in.page
b/tests/scanner/Regress-1.0-C-expected/Regress.func_obj_null_in.page
index ebc6a7f..50691f3 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.func_obj_null_in.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.func_obj_null_in.page
@@ -32,12 +32,16 @@ void regress_func_obj_null_in (RegressTestObj* obj);
-<dl>
-<dt><p>obj :</p></dt>
-<dd><p>A <link xref="Regress.TestObj"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+<p>A <link xref="Regress.TestObj"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.global_get_flags_out.page
b/tests/scanner/Regress-1.0-C-expected/Regress.global_get_flags_out.page
index 407cb26..078b47c 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.global_get_flags_out.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.global_get_flags_out.page
@@ -32,12 +32,16 @@ void regress_global_get_flags_out (RegressTestFlags* v);
-<dl>
-<dt><p>v :</p></dt>
-<dd><p>A flags value</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>v</code></title>
+<p>A flags value</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.has_parameter_named_attrs.page
b/tests/scanner/Regress-1.0-C-expected/Regress.has_parameter_named_attrs.page
index 802f00f..725aed0 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.has_parameter_named_attrs.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.has_parameter_named_attrs.page
@@ -38,14 +38,20 @@ libgnome-keyring.</p>
-<dl>
-<dt><p>foo :</p></dt>
-<dd><p>some int</p></dd>
-<dt><p>attributes :</p></dt>
-<dd><p>list of attributes</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>foo</code></title>
+<p>some int</p>
+</item>
+<item>
+<title><code>attributes</code></title>
+<p>list of attributes</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.introspectable_via_alias.page
b/tests/scanner/Regress-1.0-C-expected/Regress.introspectable_via_alias.page
index d769d5b..8b28b1f 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.introspectable_via_alias.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.introspectable_via_alias.page
@@ -32,12 +32,16 @@ void regress_introspectable_via_alias (RegressPtrArrayAlias* data);
-<dl>
-<dt><p>data :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>data</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.not_introspectable_via_alias.page
b/tests/scanner/Regress-1.0-C-expected/Regress.not_introspectable_via_alias.page
index 263f7c8..afafef2 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.not_introspectable_via_alias.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.not_introspectable_via_alias.page
@@ -32,12 +32,16 @@ void regress_not_introspectable_via_alias (RegressVaListAlias ok);
-<dl>
-<dt><p>ok :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>ok</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.random_function_with_skipped_structure.page
b/tests/scanner/Regress-1.0-C-expected/Regress.random_function_with_skipped_structure.page
index 78ba1bc..8898215 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.random_function_with_skipped_structure.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.random_function_with_skipped_structure.page
@@ -42,16 +42,24 @@ void regress_random_function_with_skipped_structure (int x,
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>foo :</p></dt>
-<dd></dd>
-<dt><p>v :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>foo</code></title>
+
+</item>
+<item>
+<title><code>v</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.set_abort_on_error.page
b/tests/scanner/Regress-1.0-C-expected/Regress.set_abort_on_error.page
index 7ced795..08950c1 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.set_abort_on_error.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.set_abort_on_error.page
@@ -32,12 +32,16 @@ void regress_set_abort_on_error (gboolean abort_on_error);
-<dl>
-<dt><p>abort_on_error :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>abort_on_error</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_callback.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_callback.page
index c7a2b4a..3ed1fde 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_callback.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_callback.page
@@ -32,12 +32,16 @@ int regress_test_array_callback (RegressTestCallbackArray callback);
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_out_objects.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_out_objects.page
index 016a967..f084a5c 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_out_objects.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_out_objects.page
@@ -32,12 +32,16 @@ void regress_test_array_fixed_out_objects (RegressTestObj*** objs);
-<dl>
-<dt><p>objs :</p></dt>
-<dd><p>An array of <link xref="Regress.TestObj"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>objs</code></title>
+<p>An array of <link xref="Regress.TestObj"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_in.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_in.page
index 7b75672..a4b23fb 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_in.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_in.page
@@ -32,12 +32,16 @@ int regress_test_array_fixed_size_int_in (int* ints);
-<dl>
-<dt><p>ints :</p></dt>
-<dd><p>a list of 5 integers</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>the sum of the items in <code>ints</code></p></dd>
-</dl>
+<terms>
+<item>
+<title><code>ints</code></title>
+<p>a list of 5 integers</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>the sum of the items in <code>ints</code></p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_out.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_out.page
index 8d8dda5..9785207 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_out.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_out.page
@@ -32,12 +32,16 @@ void regress_test_array_fixed_size_int_out (int** ints);
-<dl>
-<dt><p>ints :</p></dt>
-<dd><p>a list of 5 integers ranging from 0 to 4</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>ints</code></title>
+<p>a list of 5 integers ranging from 0 to 4</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_return.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_return.page
index 6a67355..245e6f3 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_return.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_return.page
@@ -28,10 +28,12 @@ int* regress_test_array_fixed_size_int_return (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>a list of 5 integers ranging from 0 to 4</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>a list of 5 integers ranging from 0 to 4</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint16_in.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint16_in.page
index 087ea63..1c1392d 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint16_in.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint16_in.page
@@ -37,14 +37,20 @@ int regress_test_array_gint16_in (int n_ints,
-<dl>
-<dt><p>n_ints :</p></dt>
-<dd></dd>
-<dt><p>ints :</p></dt>
-<dd><p>List of ints</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>n_ints</code></title>
+
+</item>
+<item>
+<title><code>ints</code></title>
+<p>List of ints</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint32_in.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint32_in.page
index 88ef582..6a6ae2e 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint32_in.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint32_in.page
@@ -37,14 +37,20 @@ gint32 regress_test_array_gint32_in (int n_ints,
-<dl>
-<dt><p>n_ints :</p></dt>
-<dd></dd>
-<dt><p>ints :</p></dt>
-<dd><p>List of ints</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>n_ints</code></title>
+
+</item>
+<item>
+<title><code>ints</code></title>
+<p>List of ints</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint64_in.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint64_in.page
index 0dd47fc..553a919 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint64_in.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint64_in.page
@@ -37,14 +37,20 @@ gint64 regress_test_array_gint64_in (int n_ints,
-<dl>
-<dt><p>n_ints :</p></dt>
-<dd></dd>
-<dt><p>ints :</p></dt>
-<dd><p>List of ints</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>n_ints</code></title>
+
+</item>
+<item>
+<title><code>ints</code></title>
+<p>List of ints</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint8_in.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint8_in.page
index 32a5cb7..f705ba2 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint8_in.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint8_in.page
@@ -37,14 +37,20 @@ int regress_test_array_gint8_in (int n_ints,
-<dl>
-<dt><p>n_ints :</p></dt>
-<dd></dd>
-<dt><p>ints :</p></dt>
-<dd><p>List of ints</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>n_ints</code></title>
+
+</item>
+<item>
+<title><code>ints</code></title>
+<p>List of ints</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gtype_in.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gtype_in.page
index 178ccda..5695d38 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gtype_in.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gtype_in.page
@@ -37,14 +37,20 @@ char* regress_test_array_gtype_in (int n_types,
-<dl>
-<dt><p>n_types :</p></dt>
-<dd></dd>
-<dt><p>types :</p></dt>
-<dd><p>List of types</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>string representation of provided types</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>n_types</code></title>
+
+</item>
+<item>
+<title><code>types</code></title>
+<p>List of types</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>string representation of provided types</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_full_out.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_full_out.page
index 37413f2..18b06cb 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_full_out.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_full_out.page
@@ -32,12 +32,16 @@ int* regress_test_array_int_full_out (int* len);
-<dl>
-<dt><p>len :</p></dt>
-<dd><p>length of the returned array.</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>a new array of integers.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>len</code></title>
+<p>length of the returned array.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>a new array of integers.</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_in.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_in.page
index f9ba58c..f7629d1 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_in.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_in.page
@@ -37,14 +37,20 @@ int regress_test_array_int_in (int n_ints,
-<dl>
-<dt><p>n_ints :</p></dt>
-<dd></dd>
-<dt><p>ints :</p></dt>
-<dd><p>List of ints</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>n_ints</code></title>
+
+</item>
+<item>
+<title><code>ints</code></title>
+<p>List of ints</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_inout.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_inout.page
index b970df7..6aee8b1 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_inout.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_inout.page
@@ -37,14 +37,20 @@ void regress_test_array_int_inout (int* n_ints,
-<dl>
-<dt><p>n_ints :</p></dt>
-<dd><p>the length of <code>ints</code></p></dd>
-<dt><p>ints :</p></dt>
-<dd><p>a list of integers whose items will be increased by 1, except the first that will be dropped</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>n_ints</code></title>
+<p>the length of <code>ints</code></p>
+</item>
+<item>
+<title><code>ints</code></title>
+<p>a list of integers whose items will be increased by 1, except the first that will be dropped</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_none_out.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_none_out.page
index e341b8c..18c92f3 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_none_out.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_none_out.page
@@ -32,12 +32,16 @@ int* regress_test_array_int_none_out (int* len);
-<dl>
-<dt><p>len :</p></dt>
-<dd><p>length of the returned array.</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>a static array of integers.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>len</code></title>
+<p>length of the returned array.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>a static array of integers.</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_in.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_in.page
index 9afb1ff..17582dd 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_in.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_in.page
@@ -37,14 +37,20 @@ void regress_test_array_int_null_in (int* arr,
-<dl>
-<dt><p>arr :</p></dt>
-<dd></dd>
-<dt><p>len :</p></dt>
-<dd><p>length</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>arr</code></title>
+
+</item>
+<item>
+<title><code>len</code></title>
+<p>length</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_out.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_out.page
index 45ef84f..2494cab 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_out.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_out.page
@@ -37,14 +37,20 @@ void regress_test_array_int_null_out (int** arr,
-<dl>
-<dt><p>arr :</p></dt>
-<dd></dd>
-<dt><p>len :</p></dt>
-<dd><p>length</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>arr</code></title>
+
+</item>
+<item>
+<title><code>len</code></title>
+<p>length</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_out.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_out.page
index be18643..071f730 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_out.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_out.page
@@ -37,14 +37,20 @@ void regress_test_array_int_out (int* n_ints,
-<dl>
-<dt><p>n_ints :</p></dt>
-<dd><p>the length of <code>ints</code></p></dd>
-<dt><p>ints :</p></dt>
-<dd><p>a list of 5 integers, from 0 to 4 in consecutive order</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>n_ints</code></title>
+<p>the length of <code>ints</code></p>
+</item>
+<item>
+<title><code>ints</code></title>
+<p>a list of 5 integers, from 0 to 4 in consecutive order</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_async_ready_callback.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_async_ready_callback.page
index 6e3421a..f7c097d 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_async_ready_callback.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_async_ready_callback.page
@@ -32,12 +32,16 @@ void regress_test_async_ready_callback (GAsyncReadyCallback callback);
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean.page
index aada509..64bd1ff 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean.page
@@ -32,12 +32,16 @@ gboolean regress_test_boolean (gboolean in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_false.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_false.page
index 2c84d1c..3cf8dec 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_false.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_false.page
@@ -32,12 +32,16 @@ gboolean regress_test_boolean_false (gboolean in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_true.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_true.page
index 7d1a949..6fd9edc 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_true.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_true.page
@@ -32,12 +32,16 @@ gboolean regress_test_boolean_true (gboolean in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_full_return.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_full_return.page
index dfbc29a..2ce8656 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_full_return.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_full_return.page
@@ -28,10 +28,12 @@ cairo_t* regress_test_cairo_context_full_return (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_none_in.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_none_in.page
index 6310579..69284e7 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_none_in.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_none_in.page
@@ -32,12 +32,16 @@ void regress_test_cairo_context_none_in (cairo_t* context);
-<dl>
-<dt><p>context :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>context</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_out.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_out.page
index 4ea5516..86cfa29 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_out.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_out.page
@@ -32,12 +32,16 @@ void regress_test_cairo_surface_full_out (cairo_surface_t** surface);
-<dl>
-<dt><p>surface :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>surface</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_return.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_return.page
index 0b15ce0..f04fa4e 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_return.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_return.page
@@ -28,10 +28,12 @@ cairo_surface_t* regress_test_cairo_surface_full_return (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_in.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_in.page
index a1903ce..f69202f 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_in.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_in.page
@@ -32,12 +32,16 @@ void regress_test_cairo_surface_none_in (cairo_surface_t* surface);
-<dl>
-<dt><p>surface :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>surface</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_return.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_return.page
index e99ecb4..f583a47 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_return.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_return.page
@@ -28,10 +28,12 @@ cairo_surface_t* regress_test_cairo_surface_none_return (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback.page
index 99a668e..c9f0cad 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback.page
@@ -32,12 +32,16 @@ int regress_test_callback (RegressTestCallback callback);
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_async.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_async.page
index f2891ed..f0ee48c 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_async.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_async.page
@@ -37,14 +37,20 @@ void regress_test_callback_async (RegressTestCallbackUserData callback,
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>user_data :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>user_data</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify.page
index 6a36513..31e48e9 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify.page
@@ -43,16 +43,24 @@ is invoked.</p>
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>user_data :</p></dt>
-<dd></dd>
-<dt><p>notify :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>user_data</code></title>
+
+</item>
+<item>
+<title><code>notify</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify_no_user_data.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify_no_user_data.page
index 148fc31..367b51f 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify_no_user_data.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify_no_user_data.page
@@ -38,14 +38,20 @@ condition in bindings which needs to be tested.</p>
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>notify :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>notify</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_async.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_async.page
index a666a33..37d6ed5 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_async.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_async.page
@@ -28,10 +28,12 @@ int regress_test_callback_thaw_async (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_notifications.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_notifications.page
index 0a4ce3d..d9a30c7 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_notifications.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_notifications.page
@@ -30,10 +30,12 @@ corresponding destroy notfications.</p>
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>Sum of the return values of the invoked callbacks.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>Sum of the return values of the invoked callbacks.</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_user_data.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_user_data.page
index f577a5e..05f8482 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_user_data.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_user_data.page
@@ -38,14 +38,20 @@ call and can be released on return.</p>
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>user_data :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>user_data</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_closure.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure.page
index 41b5d50..0218d54 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_closure.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure.page
@@ -32,12 +32,16 @@ int regress_test_closure (GClosure* closure);
-<dl>
-<dt><p>closure :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>closure</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_one_arg.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_one_arg.page
index 971f21e..221eab6 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_one_arg.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_one_arg.page
@@ -37,14 +37,20 @@ int regress_test_closure_one_arg (GClosure* closure,
-<dl>
-<dt><p>closure :</p></dt>
-<dd></dd>
-<dt><p>arg :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>closure</code></title>
+
+</item>
+<item>
+<title><code>arg</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_variant.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_variant.page
index 1f5a56a..6479146 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_variant.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_variant.page
@@ -37,14 +37,20 @@ GVariant* regress_test_closure_variant (GClosure* closure,
-<dl>
-<dt><p>closure :</p></dt>
-<dd><p>GClosure which takes one GVariant and returns a GVariant</p></dd>
-<dt><p>arg :</p></dt>
-<dd><p>a GVariant passed as argument to <code>closure</code></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>the return value of <code>closure</code></p></dd>
-</dl>
+<terms>
+<item>
+<title><code>closure</code></title>
+<p>GClosure which takes one GVariant and returns a GVariant</p>
+</item>
+<item>
+<title><code>arg</code></title>
+<p>a GVariant passed as argument to <code>closure</code></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>the return value of <code>closure</code></p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_date_in_gvalue.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_date_in_gvalue.page
index e606feb..f2a5ec0 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_date_in_gvalue.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_date_in_gvalue.page
@@ -28,10 +28,12 @@ GValue* regress_test_date_in_gvalue (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_def_error_quark.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_def_error_quark.page
index 1fb55be..fbad938 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_def_error_quark.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_def_error_quark.page
@@ -28,10 +28,12 @@ GQuark regress_test_def_error_quark (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_double.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_double.page
index 7384ecd..a5e5523 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_double.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_double.page
@@ -32,12 +32,16 @@ gdouble regress_test_double (gdouble in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_filename_return.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_filename_return.page
index e490ac3..a5906fc 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_filename_return.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_filename_return.page
@@ -28,10 +28,12 @@ GSList* regress_test_filename_return (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>list of strings</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>list of strings</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_float.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_float.page
index f50930d..c6a1942 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_float.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_float.page
@@ -32,12 +32,16 @@ gfloat regress_test_float (gfloat in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_container_return.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_container_return.page
index 2363975..6332487 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_container_return.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_container_return.page
@@ -28,10 +28,12 @@ GPtrArray* regress_test_garray_container_return (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_full_return.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_full_return.page
index a433bfa..2faa31b 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_full_return.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_full_return.page
@@ -28,10 +28,12 @@ GPtrArray* regress_test_garray_full_return (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gerror_callback.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_gerror_callback.page
index 4aa5615..cbfdcb5 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gerror_callback.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gerror_callback.page
@@ -32,12 +32,16 @@ void regress_test_gerror_callback (RegressTestCallbackGError callback);
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_container_return.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_container_return.page
index fd29122..9e59ef1 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_container_return.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_container_return.page
@@ -28,10 +28,12 @@ GHashTable* regress_test_ghash_container_return (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_everything_return.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_everything_return.page
index 4ad5cb5..0d608f8 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_everything_return.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_everything_return.page
@@ -28,10 +28,12 @@ GHashTable* regress_test_ghash_everything_return (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_in.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_in.page
index 8708d8d..eb8ce9d 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_in.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_in.page
@@ -32,12 +32,16 @@ void regress_test_ghash_gvalue_in (GHashTable* hash);
-<dl>
-<dt><p>hash :</p></dt>
-<dd><p>the hash table returned by <link xref="Regress.test_ghash_gvalue_return"/>.</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>hash</code></title>
+<p>the hash table returned by <link xref="Regress.test_ghash_gvalue_return"/>.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_return.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_return.page
index 9868259..e4a5732 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_return.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_return.page
@@ -28,10 +28,12 @@ GHashTable* regress_test_ghash_gvalue_return (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return.page
index 8af4cbd..39eb096 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return.page
@@ -28,10 +28,12 @@ GHashTable* regress_test_ghash_nested_everything_return (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return2.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return2.page
index 8612e66..cb3b6aa 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return2.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return2.page
@@ -29,10 +29,12 @@ element-type annotation.</p>
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in.page
index 8a21bbf..d658960 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in.page
@@ -32,12 +32,16 @@ void regress_test_ghash_nothing_in (const GHashTable* in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in2.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in2.page
index 83f5c6e..9770002 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in2.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in2.page
@@ -32,12 +32,16 @@ void regress_test_ghash_nothing_in2 (GHashTable* in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return.page
index a0af756..c224824 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return.page
@@ -28,10 +28,12 @@ const GHashTable* regress_test_ghash_nothing_return (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return2.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return2.page
index 8a5c7b3..078906a 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return2.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return2.page
@@ -28,10 +28,12 @@ GHashTable* regress_test_ghash_nothing_return2 (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_in.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_in.page
index fa7c04e..303e6ee 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_in.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_in.page
@@ -32,12 +32,16 @@ void regress_test_ghash_null_in (const GHashTable* in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_out.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_out.page
index 666fdf0..7d191f0 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_out.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_out.page
@@ -32,12 +32,16 @@ void regress_test_ghash_null_out (const GHashTable** out);
-<dl>
-<dt><p>out :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>out</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_return.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_return.page
index d5c9154..3cb45a8 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_return.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_return.page
@@ -28,10 +28,12 @@ const GHashTable* regress_test_ghash_null_return (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_container_return.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_container_return.page
index 053fbd8..5944908 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_container_return.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_container_return.page
@@ -28,10 +28,12 @@ GList* regress_test_glist_container_return (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_everything_return.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_everything_return.page
index 05efc25..773cf55 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_everything_return.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_everything_return.page
@@ -28,10 +28,12 @@ GList* regress_test_glist_everything_return (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in.page
index cab2d96..66126de 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in.page
@@ -32,12 +32,16 @@ void regress_test_glist_nothing_in (const GList* in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in2.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in2.page
index ec30658..a2c0ae1 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in2.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in2.page
@@ -32,12 +32,16 @@ void regress_test_glist_nothing_in2 (GList* in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return.page
index a5d436f..f571415 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return.page
@@ -28,10 +28,12 @@ const GList* regress_test_glist_nothing_return (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return2.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return2.page
index 1af8f86..4369761 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return2.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return2.page
@@ -28,10 +28,12 @@ GList* regress_test_glist_nothing_return2 (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_in.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_in.page
index c691426..f90b127 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_in.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_in.page
@@ -32,12 +32,16 @@ void regress_test_glist_null_in (GSList* in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_out.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_out.page
index 11ae56f..44d6aba 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_out.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_out.page
@@ -32,12 +32,16 @@ void regress_test_glist_null_out (GSList** out_list);
-<dl>
-<dt><p>out_list :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>out_list</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_container_return.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_container_return.page
index 3f23814..ebead8c 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_container_return.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_container_return.page
@@ -28,10 +28,12 @@ GSList* regress_test_gslist_container_return (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_everything_return.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_everything_return.page
index 8f9319c..c303cb1 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_everything_return.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_everything_return.page
@@ -28,10 +28,12 @@ GSList* regress_test_gslist_everything_return (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in.page
index 22b3230..651e4f3 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in.page
@@ -32,12 +32,16 @@ void regress_test_gslist_nothing_in (const GSList* in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in2.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in2.page
index f4f3bfc..9e65273 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in2.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in2.page
@@ -32,12 +32,16 @@ void regress_test_gslist_nothing_in2 (GSList* in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return.page
index 8c68039..066e347 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return.page
@@ -28,10 +28,12 @@ const GSList* regress_test_gslist_nothing_return (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return2.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return2.page
index 38abfcf..8f7e343 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return2.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return2.page
@@ -28,10 +28,12 @@ GSList* regress_test_gslist_nothing_return2 (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_in.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_in.page
index 00bd670..52f6d6a 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_in.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_in.page
@@ -32,12 +32,16 @@ void regress_test_gslist_null_in (GSList* in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_out.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_out.page
index efa4df6..fe931a8 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_out.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_out.page
@@ -32,12 +32,16 @@ void regress_test_gslist_null_out (GSList** out_list);
-<dl>
-<dt><p>out_list :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>out_list</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gtype.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_gtype.page
index c99a531..fc75886 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gtype.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gtype.page
@@ -32,12 +32,16 @@ GType regress_test_gtype (GType in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_as.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_as.page
index f884014..e2be67d 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_as.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_as.page
@@ -28,10 +28,12 @@ GVariant* regress_test_gvariant_as (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>New variant</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>New variant</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_asv.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_asv.page
index c39a003..9d8e6b6 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_asv.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_asv.page
@@ -28,10 +28,12 @@ GVariant* regress_test_gvariant_asv (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>New variant</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>New variant</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_i.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_i.page
index 58f1b97..6a2b233 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_i.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_i.page
@@ -28,10 +28,12 @@ GVariant* regress_test_gvariant_i (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>New variant</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>New variant</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_s.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_s.page
index 051a307..a98c717 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_s.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_s.page
@@ -28,10 +28,12 @@ GVariant* regress_test_gvariant_s (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>New variant</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>New variant</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_v.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_v.page
index f1e8f7b..698f10f 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_v.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_v.page
@@ -28,10 +28,12 @@ GVariant* regress_test_gvariant_v (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>New variant</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>New variant</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_hash_table_callback.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_hash_table_callback.page
index abbdbbb..b86e360 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_hash_table_callback.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_hash_table_callback.page
@@ -37,14 +37,20 @@ void regress_test_hash_table_callback (GHashTable* data,
-<dl>
-<dt><p>data :</p></dt>
-<dd><p>GHashTable that gets passed to callback</p></dd>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>data</code></title>
+<p>GHashTable that gets passed to callback</p>
+</item>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_int.page
index 2e271a5..ff1ed37 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int.page
@@ -32,12 +32,16 @@ gint regress_test_int (gint in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int16.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_int16.page
index 6ee0059..770d8fb 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int16.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int16.page
@@ -32,12 +32,16 @@ gint16 regress_test_int16 (gint16 in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int32.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_int32.page
index 58ef340..c0f0061 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int32.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int32.page
@@ -32,12 +32,16 @@ gint32 regress_test_int32 (gint32 in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int64.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_int64.page
index bfe12d6..5002954 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int64.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int64.page
@@ -32,12 +32,16 @@ gint64 regress_test_int64 (gint64 in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int8.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_int8.page
index 0b4b43a..03275b1 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int8.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int8.page
@@ -32,12 +32,16 @@ gint8 regress_test_int8 (gint8 in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int_out_utf8.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_int_out_utf8.page
index ae8ecfc..400ff59 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int_out_utf8.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int_out_utf8.page
@@ -37,14 +37,20 @@ void regress_test_int_out_utf8 (int* length,
-<dl>
-<dt><p>length :</p></dt>
-<dd></dd>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>length</code></title>
+
+</item>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int_value_arg.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_int_value_arg.page
index 4fb211e..69f223c 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int_value_arg.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int_value_arg.page
@@ -32,12 +32,16 @@ int regress_test_int_value_arg (const GValue* v);
-<dl>
-<dt><p>v :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>v</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_long.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_long.page
index 638f066..8382839 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_long.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_long.page
@@ -32,12 +32,16 @@ glong regress_test_long (glong in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_callback.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_callback.page
index b0b16c5..68c571d 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_callback.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_callback.page
@@ -32,12 +32,16 @@ int regress_test_multi_callback (RegressTestCallback callback);
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_double_args.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_double_args.page
index 5dc68cb..33112e8 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_double_args.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_double_args.page
@@ -42,16 +42,24 @@ void regress_test_multi_double_args (gdouble in,
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>one :</p></dt>
-<dd></dd>
-<dt><p>two :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>one</code></title>
+
+</item>
+<item>
+<title><code>two</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_multiline_doc_comments.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_multiline_doc_comments.page
index 439f66a..b8755fb 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_multiline_doc_comments.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_multiline_doc_comments.page
@@ -28,10 +28,12 @@ void regress_test_multiline_doc_comments (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_nested_parameter.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_nested_parameter.page
index 30d6e07..d5c0f7a 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_nested_parameter.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_nested_parameter.page
@@ -57,12 +57,16 @@ rgb(20%, 30%, 0%)</literallayout></entry>
-<dl>
-<dt><p>a :</p></dt>
-<dd><p>An integer</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>a</code></title>
+<p>An integer</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_null_gerror_callback.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_null_gerror_callback.page
index 995b82b..8f10551 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_null_gerror_callback.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_null_gerror_callback.page
@@ -32,12 +32,16 @@ void regress_test_null_gerror_callback (RegressTestCallbackGError callback);
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_owned_gerror_callback.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_owned_gerror_callback.page
index 0bb38c9..668ead0 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_owned_gerror_callback.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_owned_gerror_callback.page
@@ -32,12 +32,16 @@ void regress_test_owned_gerror_callback (RegressTestCallbackOwnedGError callback
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_short.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_short.page
index 135cd70..9fd725e 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_short.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_short.page
@@ -32,12 +32,16 @@ gshort regress_test_short (gshort in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_simple_callback.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_simple_callback.page
index 8e84405..cc8cceb 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_simple_callback.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_simple_callback.page
@@ -32,12 +32,16 @@ void regress_test_simple_callback (RegressTestSimpleCallback callback);
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_size.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_size.page
index cf24fbe..cf00a65 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_size.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_size.page
@@ -32,12 +32,16 @@ gsize regress_test_size (gsize in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_skip_unannotated_callback.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_skip_unannotated_callback.page
index 9764aa9..b669803 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_skip_unannotated_callback.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_skip_unannotated_callback.page
@@ -33,12 +33,16 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685399</p>
-<dl>
-<dt><p>callback :</p></dt>
-<dd><p>No annotation here</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+<p>No annotation here</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ssize.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_ssize.page
index 232f21d..41c2764 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ssize.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ssize.page
@@ -32,12 +32,16 @@ gssize regress_test_ssize (gssize in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in.page
index c1d6ce4..07ad58f 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in.page
@@ -32,12 +32,16 @@ gboolean regress_test_strv_in (char** arr);
-<dl>
-<dt><p>arr :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>arr</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in_gvalue.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in_gvalue.page
index 0609b66..23447c0 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in_gvalue.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in_gvalue.page
@@ -28,10 +28,12 @@ GValue* regress_test_strv_in_gvalue (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out.page
index dba053f..081c364 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out.page
@@ -28,10 +28,12 @@ char** regress_test_strv_out (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_c.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_c.page
index 01e1c37..dd726a6 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_c.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_c.page
@@ -28,10 +28,12 @@ const char* const* regress_test_strv_out_c (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_container.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_container.page
index 71b89c3..f0fc23c 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_container.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_container.page
@@ -28,10 +28,12 @@ char** regress_test_strv_out_container (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_outarg.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_outarg.page
index aea2dac..d6e9db3 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_outarg.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_outarg.page
@@ -32,12 +32,16 @@ void regress_test_strv_outarg (char*** retp);
-<dl>
-<dt><p>retp :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>retp</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_timet.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_timet.page
index 2c31dcc..e8127d3 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_timet.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_timet.page
@@ -32,12 +32,16 @@ time_t regress_test_timet (time_t in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_0.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_0.page
index bcdbd35..298e4ca 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_0.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_0.page
@@ -57,22 +57,36 @@ void regress_test_torture_signature_0 (int x,
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>y :</p></dt>
-<dd></dd>
-<dt><p>z :</p></dt>
-<dd></dd>
-<dt><p>foo :</p></dt>
-<dd></dd>
-<dt><p>q :</p></dt>
-<dd></dd>
-<dt><p>m :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>y</code></title>
+
+</item>
+<item>
+<title><code>z</code></title>
+
+</item>
+<item>
+<title><code>foo</code></title>
+
+</item>
+<item>
+<title><code>q</code></title>
+
+</item>
+<item>
+<title><code>m</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_1.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_1.page
index af54f3f..beb5999 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_1.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_1.page
@@ -57,22 +57,36 @@ gboolean regress_test_torture_signature_1 (int x,
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>y :</p></dt>
-<dd></dd>
-<dt><p>z :</p></dt>
-<dd></dd>
-<dt><p>foo :</p></dt>
-<dd></dd>
-<dt><p>q :</p></dt>
-<dd></dd>
-<dt><p>m :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>y</code></title>
+
+</item>
+<item>
+<title><code>z</code></title>
+
+</item>
+<item>
+<title><code>foo</code></title>
+
+</item>
+<item>
+<title><code>q</code></title>
+
+</item>
+<item>
+<title><code>m</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_2.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_2.page
index 145c44f..bb742fe 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_2.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_2.page
@@ -72,28 +72,48 @@ void regress_test_torture_signature_2 (int x,
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>user_data :</p></dt>
-<dd></dd>
-<dt><p>notify :</p></dt>
-<dd></dd>
-<dt><p>y :</p></dt>
-<dd></dd>
-<dt><p>z :</p></dt>
-<dd></dd>
-<dt><p>foo :</p></dt>
-<dd></dd>
-<dt><p>q :</p></dt>
-<dd></dd>
-<dt><p>m :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>user_data</code></title>
+
+</item>
+<item>
+<title><code>notify</code></title>
+
+</item>
+<item>
+<title><code>y</code></title>
+
+</item>
+<item>
+<title><code>z</code></title>
+
+</item>
+<item>
+<title><code>foo</code></title>
+
+</item>
+<item>
+<title><code>q</code></title>
+
+</item>
+<item>
+<title><code>m</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint.page
index aeed54f..48901cc 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint.page
@@ -32,12 +32,16 @@ guint regress_test_uint (guint in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint16.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint16.page
index 280a15f..ecb3162 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint16.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint16.page
@@ -32,12 +32,16 @@ guint16 regress_test_uint16 (guint16 in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint32.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint32.page
index dd0ef86..bfaf042 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint32.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint32.page
@@ -32,12 +32,16 @@ guint32 regress_test_uint32 (guint32 in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint64.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint64.page
index b4a8d64..e7587cb 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint64.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint64.page
@@ -32,12 +32,16 @@ guint64 regress_test_uint64 (guint64 in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint8.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint8.page
index f482eb7..fc13715 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint8.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint8.page
@@ -32,12 +32,16 @@ guint8 regress_test_uint8 (guint8 in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ulong.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_ulong.page
index 479ebe0..32b331e 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ulong.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ulong.page
@@ -32,12 +32,16 @@ gulong regress_test_ulong (gulong in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_unichar.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_unichar.page
index ecafbe6..dc73530 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_unichar.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_unichar.page
@@ -32,12 +32,16 @@ gunichar regress_test_unichar (gunichar in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_unsigned_enum_param.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_unsigned_enum_param.page
index e5d5cb2..5fbc9aa 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_unsigned_enum_param.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_unsigned_enum_param.page
@@ -32,12 +32,16 @@ const gchar* regress_test_unsigned_enum_param (RegressTestEnumUnsigned e);
-<dl>
-<dt><p>e :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>e</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ushort.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_ushort.page
index 0e04b87..31ee272 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ushort.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ushort.page
@@ -32,12 +32,16 @@ gushort regress_test_ushort (gushort in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_in.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_in.page
index b4c5090..c21ee5b 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_in.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_in.page
@@ -32,12 +32,16 @@ void regress_test_utf8_const_in (const char* in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_return.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_return.page
index 77ef082..8e46b6c 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_return.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_return.page
@@ -28,10 +28,12 @@ const char* regress_test_utf8_const_return (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>UTF-8 string</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>UTF-8 string</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_inout.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_inout.page
index 259e232..5c51995 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_inout.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_inout.page
@@ -32,12 +32,16 @@ void regress_test_utf8_inout (char** inout);
-<dl>
-<dt><p>inout :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>inout</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_nonconst_return.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_nonconst_return.page
index 3b1ae5d..bacd87b 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_nonconst_return.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_nonconst_return.page
@@ -28,10 +28,12 @@ char* regress_test_utf8_nonconst_return (void);
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>UTF-8 string</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>UTF-8 string</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_in.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_in.page
index a864ae1..db9a526 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_in.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_in.page
@@ -32,12 +32,16 @@ void regress_test_utf8_null_in (char* in);
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_out.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_out.page
index ffd3147..14906be 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_out.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_out.page
@@ -32,12 +32,16 @@ void regress_test_utf8_null_out (char** char_out);
-<dl>
-<dt><p>char_out :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>char_out</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out.page
index d2743ea..75c69f5 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out.page
@@ -32,12 +32,16 @@ void regress_test_utf8_out (char** out);
-<dl>
-<dt><p>out :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>out</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_nonconst_return.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_nonconst_return.page
index f8356af..4aa425f 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_nonconst_return.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_nonconst_return.page
@@ -32,12 +32,16 @@ char* regress_test_utf8_out_nonconst_return (char** out);
-<dl>
-<dt><p>out :</p></dt>
-<dd><p>a copy of "second"</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>a copy of "first"</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>out</code></title>
+<p>a copy of "second"</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>a copy of "first"</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_out.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_out.page
index 87ce92f..d02e94c 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_out.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_out.page
@@ -37,14 +37,20 @@ void regress_test_utf8_out_out (char** out0,
-<dl>
-<dt><p>out0 :</p></dt>
-<dd><p>a copy of "first"</p></dd>
-<dt><p>out1 :</p></dt>
-<dd><p>a copy of "second"</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>out0</code></title>
+<p>a copy of "first"</p>
+</item>
+<item>
+<title><code>out1</code></title>
+<p>a copy of "second"</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_value_get_fundamental_object.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_get_fundamental_object.page
index ec758d8..139a202 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_value_get_fundamental_object.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_get_fundamental_object.page
@@ -32,12 +32,16 @@ RegressTestFundamentalObject* regress_test_value_get_fundamental_object (const G
-<dl>
-<dt><p>value :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>value</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_value_return.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_return.page
index bcdbed5..e33e73d 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_value_return.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_return.page
@@ -32,12 +32,16 @@ const GValue* regress_test_value_return (int i);
-<dl>
-<dt><p>i :</p></dt>
-<dd><p>an int</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>the int wrapped in a GValue.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>i</code></title>
+<p>an int</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>the int wrapped in a GValue.</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_value_set_fundamental_object.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_set_fundamental_object.page
index 101443e..6740c44 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_value_set_fundamental_object.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_set_fundamental_object.page
@@ -37,14 +37,20 @@ void regress_test_value_set_fundamental_object (GValue* value,
-<dl>
-<dt><p>value :</p></dt>
-<dd></dd>
-<dt><p>fundamental_object :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>value</code></title>
+
+</item>
+<item>
+<title><code>fundamental_object</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_versioning.page
b/tests/scanner/Regress-1.0-C-expected/Regress.test_versioning.page
index d426f0a..33e10ac 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_versioning.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_versioning.page
@@ -29,10 +29,12 @@ void regress_test_versioning (void);
<p>Since 1.32.1</p>
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.ATestError.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ATestError.page
index dff139f..119860d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.ATestError.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ATestError.page
@@ -19,14 +19,20 @@
-<dl>
-<dt><p>ATestError.CODE0 :</p></dt>
-<dd></dd>
-<dt><p>ATestError.CODE1 :</p></dt>
-<dd></dd>
-<dt><p>ATestError.CODE2 :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>ATestError.CODE0</code></title>
+
+</item>
+<item>
+<title><code>ATestError.CODE1</code></title>
+
+</item>
+<item>
+<title><code>ATestError.CODE2</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page
index 73f9cde..713f2fa 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page
@@ -23,20 +23,32 @@ function callback(annotation_object, arg1:String, arg2:String, user_param1, ...)
-<dl>
-<dt><p>annotation_object :</p></dt>
-<dd><p>instance of Regress.AnnotationObject that is emitting the signal</p></dd>
-<dt><p>arg1 :</p></dt>
-<dd><p>a value</p></dd>
-<dt><p>arg2 :</p></dt>
-<dd><p>another value</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-<dt><p>Returns :</p></dt>
-<dd>gchar* <p>the return value</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>annotation_object</code></title>
+<p>instance of Regress.AnnotationObject that is emitting the signal</p>
+</item>
+<item>
+<title><code>arg1</code></title>
+<p>a value</p>
+</item>
+<item>
+<title><code>arg2</code></title>
+<p>another value</p>
+</item>
+<item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+</item>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>gchar* <p>the return value</p></p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page
index 178ce23..68a6b8f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page
@@ -23,16 +23,24 @@ function callback(annotation_object, arg1:gpointer, user_param1, ...):void;
-<dl>
-<dt><p>annotation_object :</p></dt>
-<dd><p>instance of Regress.AnnotationObject that is emitting the signal</p></dd>
-<dt><p>arg1 :</p></dt>
-<dd></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>annotation_object</code></title>
+<p>instance of Regress.AnnotationObject that is emitting the signal</p>
+</item>
+<item>
+<title><code>arg1</code></title>
+
+</item>
+<item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+</item>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page
index b29e2a6..3464bf7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page
@@ -24,16 +24,24 @@ known by GObject as it's only marked as G_TYPE_POINTER</p>
-<dl>
-<dt><p>annotation_object :</p></dt>
-<dd><p>instance of Regress.AnnotationObject that is emitting the signal</p></dd>
-<dt><p>list :</p></dt>
-<dd><p>a list of strings</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>annotation_object</code></title>
+<p>instance of Regress.AnnotationObject that is emitting the signal</p>
+</item>
+<item>
+<title><code>list</code></title>
+<p>a list of strings</p>
+</item>
+<item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+</item>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page
index d8e9f6a..5312491 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page
@@ -25,16 +25,24 @@ it says it's pointer but it's actually a string.</p>
<p>Since 1.0</p>
-<dl>
-<dt><p>annotation_object :</p></dt>
-<dd><p>instance of Regress.AnnotationObject that is emitting the signal</p></dd>
-<dt><p>string :</p></dt>
-<dd><p>a string</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>annotation_object</code></title>
+<p>instance of Regress.AnnotationObject that is emitting the signal</p>
+</item>
+<item>
+<title><code>string</code></title>
+<p>a string</p>
+</item>
+<item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+</item>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page
index c54f0c3..d94ad83 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page
@@ -34,12 +34,16 @@ function allow_none(somearg:String):GObject.Object {
-<dl>
-<dt><p>somearg :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd><p><code>null</code> always</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>somearg</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+<p><code>null</code> always</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page
index a11fd19..d964b9c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page
@@ -30,10 +30,12 @@ function calleeowns():Number {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>an int</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>an int</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page
index df95d10..bcc26d8 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page
@@ -30,10 +30,12 @@ function calleesowns():Number {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>an int</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>an int</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page
index 5f93013..0dc19bc 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page
@@ -34,10 +34,12 @@ function compute_sum(nums:[Number]):void {
-<dl>
-<dt><p>nums :</p></dt>
-<dd><p>Sequence of numbers</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>nums</code></title>
+<p>Sequence of numbers</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page
index 24e2a80..a687001 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page
@@ -34,10 +34,12 @@ function compute_sum_n(nums:[Number]):void {
-<dl>
-<dt><p>nums :</p></dt>
-<dd><p>Sequence of numbers that are zero-terminated</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>nums</code></title>
+<p>Sequence of numbers that are zero-terminated</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page
index 02c501d..ed909ac 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page
@@ -34,10 +34,12 @@ function compute_sum_nz(nums:[Number]):void {
-<dl>
-<dt><p>nums :</p></dt>
-<dd><p>Sequence of numbers that are zero-terminated</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>nums</code></title>
+<p>Sequence of numbers that are zero-terminated</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page
index 4b2d104..6098722 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page
@@ -30,10 +30,12 @@ function create_object():GObject.Object {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>The object</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>The object</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page
index 87249cf..61915f4 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page
@@ -30,10 +30,12 @@ function do_not_use():GObject.Object {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p><code>null</code> always</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p><code>null</code> always</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.extra_annos.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.extra_annos.page
index ba06aea..58bf5ff 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.extra_annos.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.extra_annos.page
@@ -30,8 +30,8 @@ function extra_annos():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page
index 965297e..5d5c79d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page
@@ -34,10 +34,12 @@ function foreach(func:Regress.AnnotationForeachFunc):void {
-<dl>
-<dt><p>func :</p></dt>
-<dd><p>Callback to invoke</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>func</code></title>
+<p>Callback to invoke</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page
index dbff0ad..ff2aef1 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page
@@ -31,10 +31,12 @@ objects.</p>
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>hash table</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>hash table</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page
index 7245a0b..e339e08 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page
@@ -32,10 +32,12 @@ intentionally similar example to gtk_container_get_children</p>
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>list of objects</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>list of objects</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page
index 2b9dde1..9a3db5d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page
@@ -31,10 +31,12 @@ each string needs to be freed.</p>
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>list of strings</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>list of strings</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page
index a59a446..1abc401 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page
@@ -30,8 +30,8 @@ function hidden_self():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page
index f9c8cae..b5f2d65 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page
@@ -34,12 +34,16 @@ function in(inarg:Number):Number {
-<dl>
-<dt><p>inarg :</p></dt>
-<dd><p>This is an argument test</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>an int</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>inarg</code></title>
+<p>This is an argument test</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>an int</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page
index d2064f2..9b61536 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page
@@ -34,12 +34,16 @@ function inout(inoutarg:Number):Number {
-<dl>
-<dt><p>inoutarg :</p></dt>
-<dd><p>This is an argument test</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>an int</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>inoutarg</code></title>
+<p>This is an argument test</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>an int</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page
index a79e4d0..58cab9a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page
@@ -34,12 +34,16 @@ function inout2(inoutarg:Number):Number {
-<dl>
-<dt><p>inoutarg :</p></dt>
-<dd><p>This is an argument test</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>an int</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>inoutarg</code></title>
+<p>This is an argument test</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>an int</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page
index d421cbb..e21a9c6 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page
@@ -34,12 +34,16 @@ function inout3(inoutarg:Number):Number {
-<dl>
-<dt><p>inoutarg :</p></dt>
-<dd><p>This is an argument test</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>an int</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>inoutarg</code></title>
+<p>This is an argument test</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>an int</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page
index 93015f3..c771d76 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page
@@ -30,10 +30,12 @@ function method():Number {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>an int</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>an int</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page
index 94f5173..606e2b1 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page
@@ -30,10 +30,12 @@ function notrans():GObject.Object {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>An object, not referenced</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>An object, not referenced</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page
index 227eacc..d4bf6b1 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page
@@ -30,10 +30,12 @@ function out():Number {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>an int</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>an int</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page
index 6940eca..d1e428d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page
@@ -34,10 +34,12 @@ function parse_args(argv:[String]):void {
-<dl>
-<dt><p>argv :</p></dt>
-<dd><p>Argument vector</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>argv</code></title>
+<p>Argument vector</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page
index 6912c99..b1e4129 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page
@@ -34,10 +34,12 @@ function set_data(data:[guint8]):void {
-<dl>
-<dt><p>data :</p></dt>
-<dd><p>The data</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>data</code></title>
+<p>The data</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page
index 68185d5..402b162 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page
@@ -34,10 +34,12 @@ function set_data2(data:[gint8]):void {
-<dl>
-<dt><p>data :</p></dt>
-<dd><p>The data</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>data</code></title>
+<p>The data</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page
index 62dcf83..8c54d3b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page
@@ -35,10 +35,12 @@ type.</p>
-<dl>
-<dt><p>data :</p></dt>
-<dd><p>The data</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>data</code></title>
+<p>The data</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page
index 91f1252..5932129 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page
@@ -30,10 +30,12 @@ function string_out():Boolean {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>some boolean</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>some boolean</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page
index 1d61e1d..36a1815 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page
@@ -34,10 +34,12 @@ function use_buffer(bytes:guint8):void {
-<dl>
-<dt><p>bytes :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>bytes</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page
index 3fa6deb..c990409 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page
@@ -34,10 +34,12 @@ function watch_full(func:Regress.AnnotationForeachFunc):void {
-<dl>
-<dt><p>func :</p></dt>
-<dd><p>The callback</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>func</code></title>
+<p>The callback</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page
index 5b0e46a..8a77746 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page
@@ -34,10 +34,12 @@ function with_voidp(data:gpointer):void {
-<dl>
-<dt><p>data :</p></dt>
-<dd><p>Opaque pointer handle</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>data</code></title>
+<p>Opaque pointer handle</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooASingle.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooASingle.page
index 34f1ed7..b59e763 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooASingle.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooASingle.page
@@ -19,10 +19,12 @@
-<dl>
-<dt><p>FooASingle.FOO_SOME_SINGLE_ENUM :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>FooASingle.FOO_SOME_SINGLE_ENUM</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooAddressType.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooAddressType.page
index 2dafde0..e3f5293 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooAddressType.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooAddressType.page
@@ -19,14 +19,20 @@
-<dl>
-<dt><p>FooAddressType.INVALID :</p></dt>
-<dd></dd>
-<dt><p>FooAddressType.IPV4 :</p></dt>
-<dd></dd>
-<dt><p>FooAddressType.IPV6 :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>FooAddressType.INVALID</code></title>
+
+</item>
+<item>
+<title><code>FooAddressType.IPV4</code></title>
+
+</item>
+<item>
+<title><code>FooAddressType.IPV6</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page
index f46e101..975d512 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page
@@ -34,10 +34,12 @@ function add(b2:Regress.FooBRect):void {
-<dl>
-<dt><p>b2 :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>b2</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page
index 66972b0..9476671 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page
@@ -38,14 +38,20 @@ function new(x:Number, y:Number):Regress.FooBRect {
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>y :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>y</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page
index 447c991..270c809 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page
@@ -30,8 +30,8 @@ function method():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page
index edad8cd..8d86995 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page
@@ -30,10 +30,12 @@ function new():Regress.FooBoxed {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page
index 2a25e79..5903a76 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page
@@ -30,8 +30,8 @@ function some_method():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page
index bbcd055..0ba67e7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page
@@ -30,8 +30,8 @@ function method():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumFullname.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumFullname.page
index a46070d..443f25e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumFullname.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumFullname.page
@@ -19,14 +19,20 @@
-<dl>
-<dt><p>FooEnumFullname.ONE :</p></dt>
-<dd></dd>
-<dt><p>FooEnumFullname.TWO :</p></dt>
-<dd></dd>
-<dt><p>FooEnumFullname.THREE :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>FooEnumFullname.ONE</code></title>
+
+</item>
+<item>
+<title><code>FooEnumFullname.TWO</code></title>
+
+</item>
+<item>
+<title><code>FooEnumFullname.THREE</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumNoType.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumNoType.page
index 2313192..5957904 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumNoType.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumNoType.page
@@ -19,16 +19,24 @@
-<dl>
-<dt><p>FooEnumNoType.UN :</p></dt>
-<dd></dd>
-<dt><p>FooEnumNoType.DEUX :</p></dt>
-<dd></dd>
-<dt><p>FooEnumNoType.TROIS :</p></dt>
-<dd></dd>
-<dt><p>FooEnumNoType.NEUF :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>FooEnumNoType.UN</code></title>
+
+</item>
+<item>
+<title><code>FooEnumNoType.DEUX</code></title>
+
+</item>
+<item>
+<title><code>FooEnumNoType.TROIS</code></title>
+
+</item>
+<item>
+<title><code>FooEnumNoType.NEUF</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.page
index 37510f5..d052d4f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.page
@@ -19,14 +19,20 @@
-<dl>
-<dt><p>FooEnumType.ALPHA :</p></dt>
-<dd></dd>
-<dt><p>FooEnumType.BETA :</p></dt>
-<dd></dd>
-<dt><p>FooEnumType.DELTA :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>FooEnumType.ALPHA</code></title>
+
+</item>
+<item>
+<title><code>FooEnumType.BETA</code></title>
+
+</item>
+<item>
+<title><code>FooEnumType.DELTA</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.page
index 0877e7c..5577eeb 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.page
@@ -19,14 +19,20 @@
-<dl>
-<dt><p>FooError.GOOD :</p></dt>
-<dd></dd>
-<dt><p>FooError.BAD :</p></dt>
-<dd></dd>
-<dt><p>FooError.UGLY :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>FooError.GOOD</code></title>
+
+</item>
+<item>
+<title><code>FooError.BAD</code></title>
+
+</item>
+<item>
+<title><code>FooError.UGLY</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page
index 9a3af8c..97aff9a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page
@@ -30,10 +30,12 @@ function copy():Regress.FooForeignStruct {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page
index 3f9478a..7753c4a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page
@@ -30,10 +30,12 @@ function new():Regress.FooForeignStruct {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface-do_regress_foo.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface-do_regress_foo.page
index 0148788..b39c41f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface-do_regress_foo.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface-do_regress_foo.page
@@ -23,10 +23,12 @@ function vfunc_do_regress_foo(x:Number):void {
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.do_regress_foo.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.do_regress_foo.page
index 96cbe49..f992fca 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.do_regress_foo.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.do_regress_foo.page
@@ -34,10 +34,12 @@ function do_regress_foo(x:Number):void {
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.static_method.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.static_method.page
index ff89098..e79716c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.static_method.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.static_method.page
@@ -34,10 +34,12 @@ function static_method(x:Number):void {
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-read_fn.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-read_fn.page
index 9c7b8ee..72ee34e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-read_fn.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-read_fn.page
@@ -23,12 +23,16 @@ function vfunc_read_fn(offset:Number, length:Number):void {
-<dl>
-<dt><p>offset :</p></dt>
-<dd><p>offset</p></dd>
-<dt><p>length :</p></dt>
-<dd><p>length</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>offset</code></title>
+<p>offset</p>
+</item>
+<item>
+<title><code>length</code></title>
+<p>length</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page
index 96617ab..d41290f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page
@@ -23,20 +23,32 @@ function callback(foo_object, object:GObject.Object, p0:gpointer, user_param1, .
-<dl>
-<dt><p>foo_object :</p></dt>
-<dd><p>instance of Regress.FooObject that is emitting the signal</p></dd>
-<dt><p>object :</p></dt>
-<dd></dd>
-<dt><p>p0 :</p></dt>
-<dd></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-<dt><p>Returns :</p></dt>
-<dd>gchar* </dd>
-</dl>
+<terms>
+<item>
+<title><code>foo_object</code></title>
+<p>instance of Regress.FooObject that is emitting the signal</p>
+</item>
+<item>
+<title><code>object</code></title>
+
+</item>
+<item>
+<title><code>p0</code></title>
+
+</item>
+<item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+</item>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>gchar* </p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-virtual_method.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-virtual_method.page
index 0608ce1..aaf6bfa 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-virtual_method.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-virtual_method.page
@@ -23,12 +23,16 @@ function vfunc_virtual_method(first_param:Number):Boolean {
-<dl>
-<dt><p>first_param :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>first_param</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.a_global_method.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.a_global_method.page
index ddc25bc..5241c4f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.a_global_method.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.a_global_method.page
@@ -34,10 +34,12 @@ function a_global_method(obj:Utility.Object):void {
-<dl>
-<dt><p>obj :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page
index 6929812..8c70035 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page
@@ -34,12 +34,16 @@ function append_new_stack_layer(x:Number):Regress.FooOtherObject {
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page
index 078402a..baf2386 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page
@@ -30,10 +30,12 @@ function dup_name():String {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page
index 9b037de..7127617 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page
@@ -30,10 +30,12 @@ function external_type():Utility.Object {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p><code>null</code> always</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p><code>null</code> always</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_default.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_default.page
index 733048b..63027a5 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_default.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_default.page
@@ -31,10 +31,12 @@ uses a C sugar return type.</p>
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>The global <link xref="Regress.FooSubobject"/></p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>The global <link xref="Regress.FooSubobject"/></p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page
index 175cfd1..54b6f10 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page
@@ -30,10 +30,12 @@ function get_name():String {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page
index ecc5f33..4de3f71 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page
@@ -34,10 +34,12 @@ function handle_glyph(glyph:Utility.Glyph):void {
-<dl>
-<dt><p>glyph :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>glyph</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page
index cf8374c..5586b96 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page
@@ -34,10 +34,12 @@ function is_it_time_yet(time:Number):void {
-<dl>
-<dt><p>time :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>time</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page
index ed35761..0cc6155 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page
@@ -30,10 +30,12 @@ function new():Regress.FooObject {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page
index 295cb68..1245175 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page
@@ -30,10 +30,12 @@ function new_as_super():GObject.Object {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page
index a348b66..526a4fb 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page
@@ -38,12 +38,16 @@ function read(offset:Number, length:Number):void {
-<dl>
-<dt><p>offset :</p></dt>
-<dd><p>offset</p></dd>
-<dt><p>length :</p></dt>
-<dd><p>length</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>offset</code></title>
+<p>offset</p>
+</item>
+<item>
+<title><code>length</code></title>
+<p>length</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.static_meth.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.static_meth.page
index b9c4f20..3bec5bb 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.static_meth.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.static_meth.page
@@ -30,10 +30,12 @@ function static_meth():Number {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page
index cbe3744..6f861c7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page
@@ -38,12 +38,16 @@ function various(data:gpointer, some_type:GType):void {
-<dl>
-<dt><p>data :</p></dt>
-<dd></dd>
-<dt><p>some_type :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>data</code></title>
+
+</item>
+<item>
+<title><code>some_type</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page
index fede11b..980d4ef 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page
@@ -34,12 +34,16 @@ function virtual_method(first_param:Number):Boolean {
-<dl>
-<dt><p>first_param :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>first_param</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page
index 1fcc81b..18646a8 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page
@@ -34,10 +34,12 @@ function add(r2:Regress.FooRectangle):void {
-<dl>
-<dt><p>r2 :</p></dt>
-<dd><p>source rectangle</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>r2</code></title>
+<p>source rectangle</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStackLayer.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStackLayer.page
index 83ca6a1..bd7a445 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStackLayer.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStackLayer.page
@@ -19,26 +19,44 @@
-<dl>
-<dt><p>FooStackLayer.DESKTOP :</p></dt>
-<dd></dd>
-<dt><p>FooStackLayer.BOTTOM :</p></dt>
-<dd></dd>
-<dt><p>FooStackLayer.NORMAL :</p></dt>
-<dd></dd>
-<dt><p>FooStackLayer.TOP :</p></dt>
-<dd></dd>
-<dt><p>FooStackLayer.DOCK :</p></dt>
-<dd></dd>
-<dt><p>FooStackLayer.FULLSCREEN :</p></dt>
-<dd></dd>
-<dt><p>FooStackLayer.FOCUSED_WINDOW :</p></dt>
-<dd></dd>
-<dt><p>FooStackLayer.OVERRIDE_REDIRECT :</p></dt>
-<dd></dd>
-<dt><p>FooStackLayer.LAST :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>FooStackLayer.DESKTOP</code></title>
+
+</item>
+<item>
+<title><code>FooStackLayer.BOTTOM</code></title>
+
+</item>
+<item>
+<title><code>FooStackLayer.NORMAL</code></title>
+
+</item>
+<item>
+<title><code>FooStackLayer.TOP</code></title>
+
+</item>
+<item>
+<title><code>FooStackLayer.DOCK</code></title>
+
+</item>
+<item>
+<title><code>FooStackLayer.FULLSCREEN</code></title>
+
+</item>
+<item>
+<title><code>FooStackLayer.FOCUSED_WINDOW</code></title>
+
+</item>
+<item>
+<title><code>FooStackLayer.OVERRIDE_REDIRECT</code></title>
+
+</item>
+<item>
+<title><code>FooStackLayer.LAST</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page
index f73adeb..a444574 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page
@@ -23,14 +23,20 @@ function callback(foo_sub_interface, user_param1, ...):void;
-<dl>
-<dt><p>foo_sub_interface :</p></dt>
-<dd><p>instance of Regress.FooSubInterface that is emitting the signal</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>foo_sub_interface</code></title>
+<p>instance of Regress.FooSubInterface that is emitting the signal</p>
+</item>
+<item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+</item>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy_event.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy_event.page
index caa25fe..8df59ff 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy_event.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy_event.page
@@ -23,8 +23,8 @@ function vfunc_destroy_event():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_bar.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_bar.page
index f3dbed5..04a5551 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_bar.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_bar.page
@@ -23,8 +23,8 @@ function vfunc_do_bar():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_baz.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_baz.page
index 59e09b4..b3e4bd7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_baz.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_baz.page
@@ -23,10 +23,12 @@ function vfunc_do_baz(callback:GObject.Callback):void {
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page
index e31cf57..7db9c6b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page
@@ -30,8 +30,8 @@ function do_bar():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page
index e075186..00fc125 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page
@@ -34,10 +34,12 @@ function do_baz(callback:GObject.Callback):void {
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page
index a2a244f..b9991b8 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page
@@ -30,10 +30,12 @@ function new():Regress.FooSubobject {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.page
index fea8d58..6a044d7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.page
@@ -19,14 +19,20 @@
-<dl>
-<dt><p>TestABCError.CODE1 :</p></dt>
-<dd></dd>
-<dt><p>TestABCError.CODE2 :</p></dt>
-<dd></dd>
-<dt><p>TestABCError.CODE3 :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>TestABCError.CODE1</code></title>
+
+</item>
+<item>
+<title><code>TestABCError.CODE2</code></title>
+
+</item>
+<item>
+<title><code>TestABCError.CODE3</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page
index 59c0701..d7fe088 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page
@@ -30,10 +30,12 @@ function copy():Regress.TestBoxed {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page
index 4a4f394..82819c8 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page
@@ -34,12 +34,16 @@ function equals(other:Regress.TestBoxed):Boolean {
-<dl>
-<dt><p>other :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>other</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page
index 72921e7..9377348 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page
@@ -30,10 +30,12 @@ function new():Regress.TestBoxed {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page
index 72c866f..915a79b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page
@@ -34,12 +34,16 @@ function new_alternative_constructor1(i:Number):Regress.TestBoxed {
-<dl>
-<dt><p>i :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>i</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page
index e8e3cf9..7cdfd4f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page
@@ -38,14 +38,20 @@ function new_alternative_constructor2(i:Number, j:Number):Regress.TestBoxed {
-<dl>
-<dt><p>i :</p></dt>
-<dd></dd>
-<dt><p>j :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>i</code></title>
+
+</item>
+<item>
+<title><code>j</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page
index 1f51612..0362341 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page
@@ -34,12 +34,16 @@ function new_alternative_constructor3(s:String):Regress.TestBoxed {
-<dl>
-<dt><p>s :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>s</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page
index 6fb2b3b..c79a4d2 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page
@@ -30,10 +30,12 @@ function copy():Regress.TestBoxedB {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page
index dcf0105..687c90d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page
@@ -38,14 +38,20 @@ function new(some_int8:gint8, some_long:Number):Regress.TestBoxedB {
-<dl>
-<dt><p>some_int8 :</p></dt>
-<dd></dd>
-<dt><p>some_long :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>some_int8</code></title>
+
+</item>
+<item>
+<title><code>some_long</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page
index 2475bae..25dd557 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page
@@ -30,10 +30,12 @@ function new():Regress.TestBoxedC {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page
index 9b9e0ca..f30d472 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page
@@ -30,10 +30,12 @@ function copy():Regress.TestBoxedD {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page
index 1b96fd2..c6affa2 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page
@@ -30,8 +30,8 @@ function free():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page
index 8b7bf9a..6246564 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page
@@ -30,10 +30,12 @@ function get_magic():Number {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page
index 0568050..781cd99 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page
@@ -38,14 +38,20 @@ function new(a_string:String, a_int:Number):Regress.TestBoxedD {
-<dl>
-<dt><p>a_string :</p></dt>
-<dd></dd>
-<dt><p>a_int :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>a_string</code></title>
+
+</item>
+<item>
+<title><code>a_int</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestDEFError.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestDEFError.page
index b6f0eb8..6a92ba9 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestDEFError.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestDEFError.page
@@ -19,14 +19,20 @@
-<dl>
-<dt><p>TestDEFError.CODE0 :</p></dt>
-<dd></dd>
-<dt><p>TestDEFError.CODE1 :</p></dt>
-<dd></dd>
-<dt><p>TestDEFError.CODE2 :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>TestDEFError.CODE0</code></title>
+
+</item>
+<item>
+<title><code>TestDEFError.CODE1</code></title>
+
+</item>
+<item>
+<title><code>TestDEFError.CODE2</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page
index 3de1bbf..9009dcd 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page
@@ -19,16 +19,24 @@
-<dl>
-<dt><p>TestEnum.VALUE1 :</p></dt>
-<dd><p>value 1</p></dd>
-<dt><p>TestEnum.VALUE2 :</p></dt>
-<dd><p>value 2</p></dd>
-<dt><p>TestEnum.VALUE3 :</p></dt>
-<dd></dd>
-<dt><p>TestEnum.VALUE4 :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>TestEnum.VALUE1</code></title>
+<p>value 1</p>
+</item>
+<item>
+<title><code>TestEnum.VALUE2</code></title>
+<p>value 2</p>
+</item>
+<item>
+<title><code>TestEnum.VALUE3</code></title>
+
+</item>
+<item>
+<title><code>TestEnum.VALUE4</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumNoGEnum.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumNoGEnum.page
index 625c870..a0cd98c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumNoGEnum.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumNoGEnum.page
@@ -19,14 +19,20 @@
-<dl>
-<dt><p>TestEnumNoGEnum.EVALUE1 :</p></dt>
-<dd></dd>
-<dt><p>TestEnumNoGEnum.EVALUE2 :</p></dt>
-<dd></dd>
-<dt><p>TestEnumNoGEnum.EVALUE3 :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>TestEnumNoGEnum.EVALUE1</code></title>
+
+</item>
+<item>
+<title><code>TestEnumNoGEnum.EVALUE2</code></title>
+
+</item>
+<item>
+<title><code>TestEnumNoGEnum.EVALUE3</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumUnsigned.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumUnsigned.page
index 3069d8e..327cacc 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumUnsigned.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumUnsigned.page
@@ -19,12 +19,16 @@
-<dl>
-<dt><p>TestEnumUnsigned.VALUE1 :</p></dt>
-<dd></dd>
-<dt><p>TestEnumUnsigned.VALUE2 :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>TestEnumUnsigned.VALUE1</code></title>
+
+</item>
+<item>
+<title><code>TestEnumUnsigned.VALUE2</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.page
index 57a2116..c635d0e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.page
@@ -19,14 +19,20 @@
-<dl>
-<dt><p>TestError.CODE1 :</p></dt>
-<dd></dd>
-<dt><p>TestError.CODE2 :</p></dt>
-<dd></dd>
-<dt><p>TestError.CODE3 :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>TestError.CODE1</code></title>
+
+</item>
+<item>
+<title><code>TestError.CODE2</code></title>
+
+</item>
+<item>
+<title><code>TestError.CODE3</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page
index 889f5d1..9ca5d06 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page
@@ -30,10 +30,12 @@ function new():Regress.TestFloating {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>A new floating <link xref="Regress.TestFloating"/></p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>A new floating <link xref="Regress.TestFloating"/></p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page
index c2c23f2..d887b19 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page
@@ -30,10 +30,12 @@ function ref():Regress.TestFundamentalObject {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>A new <link xref="Regress.TestFundamentalObject"/></p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>A new <link xref="Regress.TestFundamentalObject"/></p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page
index efeb0c3..2e0932b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page
@@ -30,8 +30,8 @@ function unref():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page
index d9b958a..e879a7d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page
@@ -34,12 +34,16 @@ function new(data:String):Regress.TestFundamentalSubObject {
-<dl>
-<dt><p>data :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>data</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo.page
index 11c8730..9c1af71 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo.page
@@ -34,10 +34,12 @@ function do_foo(x:Number):void {
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page
index 0591726..176b164 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page
@@ -34,10 +34,12 @@ function do_foo_maybe_throw(x:Number):void {
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page
index 0c87efc..17020c6 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page
@@ -30,8 +30,8 @@ function get_origin():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page
index 0fb936c..e2444c6 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page
@@ -30,8 +30,8 @@ function get_size():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page
index 32565ee..f8d7132 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page
@@ -23,14 +23,20 @@ function callback(test_obj, user_param1, ...):void;
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+</item>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-allow_none_vfunc.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-allow_none_vfunc.page
index f16bc29..874928d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-allow_none_vfunc.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-allow_none_vfunc.page
@@ -23,10 +23,12 @@ function vfunc_allow_none_vfunc(two:Regress.TestObj):void {
-<dl>
-<dt><p>two :</p></dt>
-<dd><p>Another object</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>two</code></title>
+<p>Another object</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page
index b9938f6..085c698 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page
@@ -23,14 +23,20 @@ function callback(test_obj, user_param1, ...):void;
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+</item>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page
index ff33157..1a521f9 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page
@@ -23,14 +23,20 @@ function callback(test_obj, user_param1, ...):void;
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+</item>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-matrix.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-matrix.page
index 4133baa..7b81f90 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-matrix.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-matrix.page
@@ -25,12 +25,16 @@ case.</p>
-<dl>
-<dt><p>somestr :</p></dt>
-<dd><p>Meaningless string</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>somestr</code></title>
+<p>Meaningless string</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page
index d966ae2..afc914f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page
@@ -24,16 +24,24 @@ function callback(test_obj, arr:[Number], user_param1, ...):void;
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>arr :</p></dt>
-<dd><p>numbers</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<item>
+<title><code>arr</code></title>
+<p>numbers</p>
+</item>
+<item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+</item>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page
index 8ffd0af..d79c6f7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page
@@ -23,16 +23,24 @@ function callback(test_obj, cr:cairo.Context, user_param1, ...):void;
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>cr :</p></dt>
-<dd><p>A cairo context.</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<item>
+<title><code>cr</code></title>
+<p>A cairo context.</p>
+</item>
+<item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+</item>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page
index 154181c..ec5e4e1 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page
@@ -24,16 +24,24 @@ function callback(test_obj, hash:{String: GObject.Value}, user_param1, ...):void
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>hash :</p></dt>
-<dd></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<item>
+<title><code>hash</code></title>
+
+</item>
+<item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+</item>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page
index beebb08..28d4cf9 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page
@@ -24,18 +24,28 @@ the introspection client langage.</p>
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>i :</p></dt>
-<dd><p>an integer</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-<dt><p>Returns :</p></dt>
-<dd>gint64 </dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<item>
+<title><code>i</code></title>
+<p>an integer</p>
+</item>
+<item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+</item>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>gint64 </p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page
index cad3093..ef623d9 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page
@@ -23,16 +23,24 @@ function callback(test_obj, i:Number, user_param1, ...):[Number];
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>i :</p></dt>
-<dd><p>an integer</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<item>
+<title><code>i</code></title>
+<p>an integer</p>
+</item>
+<item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+</item>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page
index c56e793..470fe4d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page
@@ -24,16 +24,24 @@ Use with regress_test_obj_emit_sig_with_obj</p>
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>obj :</p></dt>
-<dd><p>A newly created RegressTestObj</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<item>
+<title><code>obj</code></title>
+<p>A newly created RegressTestObj</p>
+</item>
+<item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+</item>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page
index 9f4461d..812891c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page
@@ -23,16 +23,24 @@ function callback(test_obj, strs:[String], user_param1, ...):void;
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>strs :</p></dt>
-<dd><p>strings</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<item>
+<title><code>strs</code></title>
+<p>strings</p>
+</item>
+<item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+</item>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page
index 870aefa..80e7563 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page
@@ -24,18 +24,28 @@ the introspection client langage.</p>
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>i :</p></dt>
-<dd><p>an integer</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-<dt><p>Returns :</p></dt>
-<dd>guint64 </dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<item>
+<title><code>i</code></title>
+<p>an integer</p>
+</item>
+<item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+</item>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>guint64 </p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page
index ee0ed94..ec06fff 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page
@@ -23,16 +23,24 @@ function callback(test_obj, object:Regress.TestSimpleBoxedA, user_param1, ...):v
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>object :</p></dt>
-<dd></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<item>
+<title><code>object</code></title>
+
+</item>
+<item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+</item>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page
index 6180999..604283d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page
@@ -23,14 +23,20 @@ function callback(test_obj, user_param1, ...):void;
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+</item>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page
index b22362d..e41bb1d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page
@@ -30,10 +30,12 @@ function constructor():Regress.TestObj {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page
index 1d35e44..aa1e5f3 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page
@@ -36,12 +36,16 @@ case.</p>
-<dl>
-<dt><p>somestr :</p></dt>
-<dd><p>Meaningless string</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>somestr</code></title>
+<p>Meaningless string</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page
index da6e8b2..0096789 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page
@@ -30,8 +30,8 @@ function emit_sig_with_foreign_struct():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page
index 4f54523..029b884 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page
@@ -30,8 +30,8 @@ function emit_sig_with_int64():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page
index 1bdcd9c..4997415 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page
@@ -30,8 +30,8 @@ function emit_sig_with_obj():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page
index 06b4bf5..491828a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page
@@ -30,8 +30,8 @@ function emit_sig_with_uint64():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page
index abb6c63..f70bfbe 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page
@@ -30,8 +30,8 @@ function forced_method():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page
index aa90320..636d216 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page
@@ -30,10 +30,12 @@ function instance_method():Number {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page
index bd5ceaf..9fc1408 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page
@@ -34,10 +34,12 @@ function instance_method_callback(callback:Regress.TestCallback):void {
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page
index a9df483..2391086 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page
@@ -34,12 +34,16 @@ function new(obj:Regress.TestObj):Regress.TestObj {
-<dl>
-<dt><p>obj :</p></dt>
-<dd><p>A <link xref="Regress.TestObj"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+<p>A <link xref="Regress.TestObj"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page
index 1af9526..49cdd8e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page
@@ -34,12 +34,16 @@ function new_callback(callback:Regress.TestCallbackUserData):Regress.TestObj {
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page
index c12559a..ae4dd14 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page
@@ -34,12 +34,16 @@ function new_from_file(x:String):Regress.TestObj {
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.null_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.null_out.page
index f194391..fed5b0a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.null_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.null_out.page
@@ -30,8 +30,8 @@ function null_out():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page
index 3a963ca..b4da15e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page
@@ -34,10 +34,12 @@ function set_bare(bare:GObject.Object):void {
-<dl>
-<dt><p>bare :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>bare</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page
index 200835b..14cc9da 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page
@@ -50,20 +50,32 @@ function skip_inout_param(a:Number, c:Number, inout_d:Number, num1:Number, num2:
-<dl>
-<dt><p>a :</p></dt>
-<dd><p>Parameter.</p></dd>
-<dt><p>c :</p></dt>
-<dd><p>Other parameter.</p></dd>
-<dt><p>inout_d :</p></dt>
-<dd><p>Will be incremented.</p></dd>
-<dt><p>num1 :</p></dt>
-<dd><p>Number.</p></dd>
-<dt><p>num2 :</p></dt>
-<dd><p>Number.</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p><code>true</code> if the call succeeds, <code>false</code> if @error is set.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>a</code></title>
+<p>Parameter.</p>
+</item>
+<item>
+<title><code>c</code></title>
+<p>Other parameter.</p>
+</item>
+<item>
+<title><code>inout_d</code></title>
+<p>Will be incremented.</p>
+</item>
+<item>
+<title><code>num1</code></title>
+<p>Number.</p>
+</item>
+<item>
+<title><code>num2</code></title>
+<p>Number.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p><code>true</code> if the call succeeds, <code>false</code> if @error is set.</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page
index 7ee261d..3a44777 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page
@@ -50,20 +50,32 @@ function skip_out_param(a:Number, c:Number, inout_d:Number, num1:Number, num2:Nu
-<dl>
-<dt><p>a :</p></dt>
-<dd><p>Parameter.</p></dd>
-<dt><p>c :</p></dt>
-<dd><p>Other parameter.</p></dd>
-<dt><p>inout_d :</p></dt>
-<dd><p>Will be incremented.</p></dd>
-<dt><p>num1 :</p></dt>
-<dd><p>Number.</p></dd>
-<dt><p>num2 :</p></dt>
-<dd><p>Number.</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p><code>true</code> if the call succeeds, <code>false</code> if @error is set.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>a</code></title>
+<p>Parameter.</p>
+</item>
+<item>
+<title><code>c</code></title>
+<p>Other parameter.</p>
+</item>
+<item>
+<title><code>inout_d</code></title>
+<p>Will be incremented.</p>
+</item>
+<item>
+<title><code>num1</code></title>
+<p>Number.</p>
+</item>
+<item>
+<title><code>num2</code></title>
+<p>Number.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p><code>true</code> if the call succeeds, <code>false</code> if @error is set.</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page
index 8b5a6a7..e6e4535 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page
@@ -50,20 +50,32 @@ function skip_param(a:Number, c:Number, inout_d:Number, num1:Number, num2:Number
-<dl>
-<dt><p>a :</p></dt>
-<dd><p>Parameter.</p></dd>
-<dt><p>c :</p></dt>
-<dd><p>Other parameter.</p></dd>
-<dt><p>inout_d :</p></dt>
-<dd><p>Will be incremented.</p></dd>
-<dt><p>num1 :</p></dt>
-<dd><p>Number.</p></dd>
-<dt><p>num2 :</p></dt>
-<dd><p>Number.</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p><code>true</code> if the call succeeds, <code>false</code> if @error is set.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>a</code></title>
+<p>Parameter.</p>
+</item>
+<item>
+<title><code>c</code></title>
+<p>Other parameter.</p>
+</item>
+<item>
+<title><code>inout_d</code></title>
+<p>Will be incremented.</p>
+</item>
+<item>
+<title><code>num1</code></title>
+<p>Number.</p>
+</item>
+<item>
+<title><code>num2</code></title>
+<p>Number.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p><code>true</code> if the call succeeds, <code>false</code> if @error is set.</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page
index e8aa83c..7323da2 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page
@@ -50,20 +50,32 @@ function skip_return_val(a:Number, c:Number, inout_d:Number, num1:Number, num2:N
-<dl>
-<dt><p>a :</p></dt>
-<dd><p>Parameter.</p></dd>
-<dt><p>c :</p></dt>
-<dd><p>Other parameter.</p></dd>
-<dt><p>inout_d :</p></dt>
-<dd><p>Will be incremented.</p></dd>
-<dt><p>num1 :</p></dt>
-<dd><p>Number.</p></dd>
-<dt><p>num2 :</p></dt>
-<dd><p>Number.</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p><code>true</code> if the call succeeds, <code>false</code> if @error is set.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>a</code></title>
+<p>Parameter.</p>
+</item>
+<item>
+<title><code>c</code></title>
+<p>Other parameter.</p>
+</item>
+<item>
+<title><code>inout_d</code></title>
+<p>Will be incremented.</p>
+</item>
+<item>
+<title><code>num1</code></title>
+<p>Number.</p>
+</item>
+<item>
+<title><code>num2</code></title>
+<p>Number.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p><code>true</code> if the call succeeds, <code>false</code> if @error is set.</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page
index 875164b..84807b3 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page
@@ -35,12 +35,16 @@ raise an error.</p>
-<dl>
-<dt><p>a :</p></dt>
-<dd><p>Parameter.</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p><code>true</code> if the call succeeds, <code>false</code> if @error is set.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>a</code></title>
+<p>Parameter.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p><code>true</code> if the call succeeds, <code>false</code> if @error is set.</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method.page
index 53cbdd2..4744d5f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method.page
@@ -34,12 +34,16 @@ function static_method(x:Number):Number {
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method_callback.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method_callback.page
index a2b3868..d428186 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method_callback.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method_callback.page
@@ -34,10 +34,12 @@ function static_method_callback(callback:Regress.TestCallback):void {
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page
index 01f97d6..fa7d17b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page
@@ -42,14 +42,20 @@ function torture_signature_0(x:Number, foo:String, m:Number):void {
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>foo :</p></dt>
-<dd></dd>
-<dt><p>m :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>foo</code></title>
+
+</item>
+<item>
+<title><code>m</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page
index 205b1a3..2094693 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page
@@ -42,16 +42,24 @@ function torture_signature_1(x:Number, foo:String, m:Number):Boolean {
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>foo :</p></dt>
-<dd></dd>
-<dt><p>m :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>foo</code></title>
+
+</item>
+<item>
+<title><code>m</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.page
index 1d907d2..d1887d5 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.page
@@ -19,14 +19,20 @@
-<dl>
-<dt><p>TestOtherError.CODE1 :</p></dt>
-<dd></dd>
-<dt><p>TestOtherError.CODE2 :</p></dt>
-<dd></dd>
-<dt><p>TestOtherError.CODE3 :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>TestOtherError.CODE1</code></title>
+
+</item>
+<item>
+<title><code>TestOtherError.CODE2</code></title>
+
+</item>
+<item>
+<title><code>TestOtherError.CODE3</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.const_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.const_return.page
index ab33fce..81a0049 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.const_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.const_return.page
@@ -30,10 +30,12 @@ function const_return():Regress.TestSimpleBoxedA {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page
index c455952..e7d1c81 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page
@@ -30,10 +30,12 @@ function copy():Regress.TestSimpleBoxedA {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page
index de4ade8..9119729 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page
@@ -34,12 +34,16 @@ function equals(other_a:Regress.TestSimpleBoxedA):Boolean {
-<dl>
-<dt><p>other_a :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>other_a</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page
index 695bed6..0db8a8d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page
@@ -30,10 +30,12 @@ function copy():Regress.TestSimpleBoxedB {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page
index 8e50284..f023cfe 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page
@@ -30,8 +30,8 @@ function clone():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.parse.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.parse.page
index 3577ad7..22038ba 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.parse.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.parse.page
@@ -34,10 +34,12 @@ function parse(string:String):void {
-<dl>
-<dt><p>string :</p></dt>
-<dd><p>ignored</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>string</code></title>
+<p>ignored</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page
index ce72cfd..692f899 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page
@@ -30,8 +30,8 @@ function clone():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page
index a72301a..b3cdcd7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page
@@ -30,8 +30,8 @@ function frob():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.instance_method.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.instance_method.page
index d537cb6..e55a1c3 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.instance_method.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.instance_method.page
@@ -30,10 +30,12 @@ function instance_method():Number {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page
index 86fcd53..91236d2 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page
@@ -30,10 +30,12 @@ function new():Regress.TestObj {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page
index 391f291..e297b4d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page
@@ -30,8 +30,8 @@ function unset_bare():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page
index e6bf3d3..f38ab9c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page
@@ -30,10 +30,12 @@ function get_testbool():Boolean {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page
index 11f813d..9bcbcc1 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page
@@ -30,10 +30,12 @@ function new():Regress.TestWi8021x {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page
index 6735650..764aa43 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page
@@ -34,10 +34,12 @@ function set_testbool(v:Boolean):void {
-<dl>
-<dt><p>v :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>v</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.static_method.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.static_method.page
index 632758a..685c311 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.static_method.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.static_method.page
@@ -34,12 +34,16 @@ function static_method(x:Number):Number {
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.aliased_caller_alloc.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.aliased_caller_alloc.page
index fb7c16d..5c57a1b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.aliased_caller_alloc.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.aliased_caller_alloc.page
@@ -30,8 +30,8 @@ function aliased_caller_alloc():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_attribute_func.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_attribute_func.page
index 1547d02..981fc54 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_attribute_func.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_attribute_func.page
@@ -38,14 +38,20 @@ function annotation_attribute_func(object:Regress.AnnotationObject, data:String)
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>A <link xref="Regress.AnnotationObject"/>.</p></dd>
-<dt><p>data :</p></dt>
-<dd><p>Some data.</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>The return value.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>A <link xref="Regress.AnnotationObject"/>.</p>
+</item>
+<item>
+<title><code>data</code></title>
+<p>Some data.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>The return value.</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page
index 5c9042c..a975754 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page
@@ -35,10 +35,12 @@ detection, and fixing it via regress_annotations.</p>
-<dl>
-<dt><p>callback :</p></dt>
-<dd><p>Destroy notification</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+<p>Destroy notification</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_get_source_file.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_get_source_file.page
index cb782e6..a227f73 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_get_source_file.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_get_source_file.page
@@ -30,10 +30,12 @@ function annotation_get_source_file():filename {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>Source file</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>Source file</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_init.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_init.page
index 753a719..ae10b7e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_init.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_init.page
@@ -34,10 +34,12 @@ function annotation_init(argv:[String]):void {
-<dl>
-<dt><p>argv :</p></dt>
-<dd><p>The arguments.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>argv</code></title>
+<p>The arguments.</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_invalid_regress_annotation.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_invalid_regress_annotation.page
index 1d532df..a32b80f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_invalid_regress_annotation.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_invalid_regress_annotation.page
@@ -34,10 +34,12 @@ function annotation_invalid_regress_annotation(foo:Number):void {
-<dl>
-<dt><p>foo :</p></dt>
-<dd><p>some text (e.g. example) or else</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>foo</code></title>
+<p>some text (e.g. example) or else</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page
index 8c1805f..dd6de2a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page
@@ -34,10 +34,12 @@ function annotation_ptr_array(array:[GObject.Value]):void {
-<dl>
-<dt><p>array :</p></dt>
-<dd><p>the array</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>array</code></title>
+<p>the array</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_array.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_array.page
index 842bd60..a400582 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_array.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_array.page
@@ -30,10 +30,12 @@ function annotation_return_array():[String] {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>The return value</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>The return value</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_filename.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_filename.page
index 6790d9f..c590aec 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_filename.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_filename.page
@@ -30,10 +30,12 @@ function annotation_return_filename():filename {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>An annotated filename</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>An annotated filename</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_set_source_file.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_set_source_file.page
index 151e84f..4601452 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_set_source_file.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_set_source_file.page
@@ -34,10 +34,12 @@ function annotation_set_source_file(fname:filename):void {
-<dl>
-<dt><p>fname :</p></dt>
-<dd><p>Source file</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>fname</code></title>
+<p>Source file</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_space_after_comment_bug631690.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_space_after_comment_bug631690.page
index de11fc5..e8891e3 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_space_after_comment_bug631690.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_space_after_comment_bug631690.page
@@ -30,8 +30,8 @@ function annotation_space_after_comment_bug631690():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_array_length.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_array_length.page
index f1bbd9c..bdb0261 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_array_length.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_array_length.page
@@ -34,10 +34,12 @@ function annotation_string_array_length(properties:[String]):void {
-<dl>
-<dt><p>properties :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>properties</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated.page
index 00af2f1..0557895 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated.page
@@ -30,10 +30,12 @@ function annotation_string_zero_terminated():[String] {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>The return value</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>The return value</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated_out.page
index cf823b7..dce9add 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated_out.page
@@ -34,10 +34,12 @@ function annotation_string_zero_terminated_out(out:[String]):void {
-<dl>
-<dt><p>out :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>out</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page
index 8d954ed..b9f8a5c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page
@@ -30,10 +30,12 @@ function annotation_test_parsing_bug630862():GObject.Object {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>An object, note the colon:in here</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>An object, note the colon:in here</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page
index e246668..33bd9f4 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page
@@ -30,10 +30,12 @@ function annotation_transfer_floating():GObject.Object {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>A floating object</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>A floating object</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_versioned.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_versioned.page
index f5aafc2..6693eb1 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_versioned.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_versioned.page
@@ -31,8 +31,8 @@ function annotation_versioned():void {
<p>Since 0.6</p>
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.atest_error_quark.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.atest_error_quark.page
index e72ee9b..26b3557 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.atest_error_quark.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.atest_error_quark.page
@@ -30,10 +30,12 @@ function atest_error_quark():GLib.Quark {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_async_ready_callback.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_async_ready_callback.page
index c3db813..4a3e911 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_async_ready_callback.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_async_ready_callback.page
@@ -38,12 +38,16 @@ function foo_async_ready_callback(cancellable:Gio.Cancellable, callback:Gio.Asyn
-<dl>
-<dt><p>cancellable :</p></dt>
-<dd></dd>
-<dt><p>callback :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>cancellable</code></title>
+
+</item>
+<item>
+<title><code>callback</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_destroy_notify_callback.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_destroy_notify_callback.page
index ac1b97d..83a8354 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_destroy_notify_callback.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_destroy_notify_callback.page
@@ -34,10 +34,12 @@ function foo_destroy_notify_callback(callback:Regress.FooCallback):void {
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_init.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_init.page
index 242c00d..81fae43 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_init.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_init.page
@@ -30,10 +30,12 @@ function foo_init():Number {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_method_external_references.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_method_external_references.page
index e7f1c4f..0e5168e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_method_external_references.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_method_external_references.page
@@ -46,16 +46,24 @@ function foo_method_external_references(object:Utility.Object, e:Utility.EnumTyp
-<dl>
-<dt><p>object :</p></dt>
-<dd></dd>
-<dt><p>e :</p></dt>
-<dd></dd>
-<dt><p>f :</p></dt>
-<dd></dd>
-<dt><p>s :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+
+</item>
+<item>
+<title><code>e</code></title>
+
+</item>
+<item>
+<title><code>f</code></title>
+
+</item>
+<item>
+<title><code>s</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_not_a_constructor_new.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_not_a_constructor_new.page
index 7efaffc..38264da 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_not_a_constructor_new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_not_a_constructor_new.page
@@ -31,10 +31,12 @@ a "Can't find matching type for constructor" warning.</p>
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_array.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_array.page
index c77f18a..24d4000 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_array.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_array.page
@@ -30,10 +30,12 @@ function foo_test_array():[String] {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_param.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_param.page
index c46680c..3cb9d8e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_param.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_param.page
@@ -34,10 +34,12 @@ function foo_test_const_char_param(param:String):void {
-<dl>
-<dt><p>param :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>param</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_retval.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_retval.page
index f42f0a2..e478432 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_retval.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_retval.page
@@ -30,10 +30,12 @@ function foo_test_const_char_retval():String {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_param.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_param.page
index 9a104a7..b52e7d3 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_param.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_param.page
@@ -34,10 +34,12 @@ function foo_test_const_struct_param(param:Regress.FooStruct):void {
-<dl>
-<dt><p>param :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>param</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_retval.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_retval.page
index 7a3295d..5521386 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_retval.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_retval.page
@@ -30,10 +30,12 @@ function foo_test_const_struct_retval():Regress.FooStruct {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array.page
index 9623970..24dfaac 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array.page
@@ -34,10 +34,12 @@ function foo_test_string_array(array:[String]):void {
-<dl>
-<dt><p>array :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>array</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array_with_g.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array_with_g.page
index 872ed05..b34cf4f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array_with_g.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array_with_g.page
@@ -34,10 +34,12 @@ function foo_test_string_array_with_g(array:[String]):void {
-<dl>
-<dt><p>array :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>array</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_qualifier.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_qualifier.page
index 8545e84..ebd9a0f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_qualifier.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_qualifier.page
@@ -34,10 +34,12 @@ function foo_test_unsigned_qualifier(unsigned_param:Number):void {
-<dl>
-<dt><p>unsigned_param :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>unsigned_param</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_type.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_type.page
index 25bfbd9..f62023e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_type.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_type.page
@@ -34,10 +34,12 @@ function foo_test_unsigned_type(unsigned_param:Number):void {
-<dl>
-<dt><p>unsigned_param :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>unsigned_param</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.func_obj_null_in.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.func_obj_null_in.page
index 1b8cab1..79a12aa 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.func_obj_null_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.func_obj_null_in.page
@@ -34,10 +34,12 @@ function func_obj_null_in(obj:Regress.TestObj):void {
-<dl>
-<dt><p>obj :</p></dt>
-<dd><p>A <link xref="Regress.TestObj"/></p></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+<p>A <link xref="Regress.TestObj"/></p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.global_get_flags_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.global_get_flags_out.page
index df39d48..741a353 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.global_get_flags_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.global_get_flags_out.page
@@ -30,8 +30,8 @@ function global_get_flags_out():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.has_parameter_named_attrs.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.has_parameter_named_attrs.page
index 3901309..f147b84 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.has_parameter_named_attrs.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.has_parameter_named_attrs.page
@@ -39,12 +39,16 @@ libgnome-keyring.</p>
-<dl>
-<dt><p>foo :</p></dt>
-<dd><p>some int</p></dd>
-<dt><p>attributes :</p></dt>
-<dd><p>list of attributes</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>foo</code></title>
+<p>some int</p>
+</item>
+<item>
+<title><code>attributes</code></title>
+<p>list of attributes</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.introspectable_via_alias.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.introspectable_via_alias.page
index 9d7f75d..f138818 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.introspectable_via_alias.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.introspectable_via_alias.page
@@ -34,10 +34,12 @@ function introspectable_via_alias(data:Regress.PtrArrayAlias):void {
-<dl>
-<dt><p>data :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>data</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.set_abort_on_error.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.set_abort_on_error.page
index 8d85040..cfddc65 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.set_abort_on_error.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.set_abort_on_error.page
@@ -34,10 +34,12 @@ function set_abort_on_error(abort_on_error:Boolean):void {
-<dl>
-<dt><p>abort_on_error :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>abort_on_error</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_callback.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_callback.page
index bf026db..d5d324c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_callback.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_callback.page
@@ -34,12 +34,16 @@ function test_array_callback(callback:Regress.TestCallbackArray):Number {
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_out_objects.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_out_objects.page
index c560c5a..0eab51d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_out_objects.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_out_objects.page
@@ -30,8 +30,8 @@ function test_array_fixed_out_objects():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_in.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_in.page
index 9670d04..1f570f3 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_in.page
@@ -34,12 +34,16 @@ function test_array_fixed_size_int_in(ints:[Number]):Number {
-<dl>
-<dt><p>ints :</p></dt>
-<dd><p>a list of 5 integers</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>the sum of the items in <code>ints</code></p></dd>
-</dl>
+<terms>
+<item>
+<title><code>ints</code></title>
+<p>a list of 5 integers</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>the sum of the items in <code>ints</code></p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_out.page
index e351924..e10c883 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_out.page
@@ -30,8 +30,8 @@ function test_array_fixed_size_int_out():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_return.page
index 7773cf2..18179bf 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_return.page
@@ -30,10 +30,12 @@ function test_array_fixed_size_int_return():[Number] {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>a list of 5 integers ranging from 0 to 4</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>a list of 5 integers ranging from 0 to 4</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint16_in.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint16_in.page
index 20a8fb1..b15076f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint16_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint16_in.page
@@ -34,12 +34,16 @@ function test_array_gint16_in(ints:[gint16]):Number {
-<dl>
-<dt><p>ints :</p></dt>
-<dd><p>List of ints</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>ints</code></title>
+<p>List of ints</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint32_in.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint32_in.page
index 121a81f..f92ad91 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint32_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint32_in.page
@@ -34,12 +34,16 @@ function test_array_gint32_in(ints:[gint32]):gint32 {
-<dl>
-<dt><p>ints :</p></dt>
-<dd><p>List of ints</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>ints</code></title>
+<p>List of ints</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint64_in.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint64_in.page
index 82652a5..98a57d5 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint64_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint64_in.page
@@ -34,12 +34,16 @@ function test_array_gint64_in(ints:[Number]):Number {
-<dl>
-<dt><p>ints :</p></dt>
-<dd><p>List of ints</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>ints</code></title>
+<p>List of ints</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint8_in.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint8_in.page
index 0ed3479..fbaae44 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint8_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint8_in.page
@@ -34,12 +34,16 @@ function test_array_gint8_in(ints:[gint8]):Number {
-<dl>
-<dt><p>ints :</p></dt>
-<dd><p>List of ints</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>ints</code></title>
+<p>List of ints</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gtype_in.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gtype_in.page
index e7acd2b..0488943 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gtype_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gtype_in.page
@@ -34,12 +34,16 @@ function test_array_gtype_in(types:[GType]):String {
-<dl>
-<dt><p>types :</p></dt>
-<dd><p>List of types</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>string representation of provided types</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>types</code></title>
+<p>List of types</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>string representation of provided types</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_full_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_full_out.page
index c7f8ddd..d2b0ab8 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_full_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_full_out.page
@@ -30,10 +30,12 @@ function test_array_int_full_out():[Number] {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>a new array of integers.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>a new array of integers.</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_in.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_in.page
index 9339276..c3b26b2 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_in.page
@@ -34,12 +34,16 @@ function test_array_int_in(ints:[Number]):Number {
-<dl>
-<dt><p>ints :</p></dt>
-<dd><p>List of ints</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>ints</code></title>
+<p>List of ints</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_inout.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_inout.page
index 4f1fc06..118056f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_inout.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_inout.page
@@ -34,10 +34,12 @@ function test_array_int_inout(ints:[Number]):void {
-<dl>
-<dt><p>ints :</p></dt>
-<dd><p>a list of integers whose items will be increased by 1, except the first that will be dropped</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>ints</code></title>
+<p>a list of integers whose items will be increased by 1, except the first that will be dropped</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_none_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_none_out.page
index 1c47a95..a841e04 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_none_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_none_out.page
@@ -30,10 +30,12 @@ function test_array_int_none_out():[Number] {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>a static array of integers.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>a static array of integers.</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_in.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_in.page
index b37cb53..eadf590 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_in.page
@@ -34,10 +34,12 @@ function test_array_int_null_in(arr:[Number]):void {
-<dl>
-<dt><p>arr :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>arr</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_out.page
index bdc8eab..c50b620 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_out.page
@@ -30,8 +30,8 @@ function test_array_int_null_out():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_out.page
index 987667f..ba2b349 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_out.page
@@ -30,8 +30,8 @@ function test_array_int_out():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_async_ready_callback.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_async_ready_callback.page
index c6ccd90..c7cd25e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_async_ready_callback.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_async_ready_callback.page
@@ -34,10 +34,12 @@ function test_async_ready_callback(callback:Gio.AsyncReadyCallback):void {
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean.page
index 9e505ac..15f8a67 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean.page
@@ -34,12 +34,16 @@ function test_boolean(in:Boolean):Boolean {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_false.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_false.page
index 3d3aec1..2c35db3 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_false.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_false.page
@@ -34,12 +34,16 @@ function test_boolean_false(in:Boolean):Boolean {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_true.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_true.page
index a25d704..0206b08 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_true.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_true.page
@@ -34,12 +34,16 @@ function test_boolean_true(in:Boolean):Boolean {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_full_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_full_return.page
index d51550e..d78865d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_full_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_full_return.page
@@ -30,10 +30,12 @@ function test_cairo_context_full_return():cairo.Context {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_none_in.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_none_in.page
index b0f4f9b..9abd2d1 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_none_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_none_in.page
@@ -34,10 +34,12 @@ function test_cairo_context_none_in(context:cairo.Context):void {
-<dl>
-<dt><p>context :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>context</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page
index be96339..c0d6675 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page
@@ -30,8 +30,8 @@ function test_cairo_surface_full_out():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_return.page
index be1ca3f..eee51f1 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_return.page
@@ -30,10 +30,12 @@ function test_cairo_surface_full_return():cairo.Surface {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_in.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_in.page
index e875ab1..ef6d4cc 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_in.page
@@ -34,10 +34,12 @@ function test_cairo_surface_none_in(surface:cairo.Surface):void {
-<dl>
-<dt><p>surface :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>surface</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_return.page
index cbfd688..cec7127 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_return.page
@@ -30,10 +30,12 @@ function test_cairo_surface_none_return():cairo.Surface {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback.page
index a9db3a5..5797086 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback.page
@@ -34,12 +34,16 @@ function test_callback(callback:Regress.TestCallback):Number {
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_async.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_async.page
index f9db124..b281ca7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_async.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_async.page
@@ -34,10 +34,12 @@ function test_callback_async(callback:Regress.TestCallbackUserData):void {
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify.page
index 3e0c93e..18496d5 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify.page
@@ -35,12 +35,16 @@ is invoked.</p>
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify_no_user_data.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify_no_user_data.page
index a009729..6679446 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify_no_user_data.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify_no_user_data.page
@@ -35,12 +35,16 @@ condition in bindings which needs to be tested.</p>
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_async.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_async.page
index 10d2088..592d8e0 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_async.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_async.page
@@ -30,10 +30,12 @@ function test_callback_thaw_async():Number {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_notifications.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_notifications.page
index 49c482c..24e0e24 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_notifications.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_notifications.page
@@ -32,10 +32,12 @@ corresponding destroy notfications.</p>
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>Sum of the return values of the invoked callbacks.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>Sum of the return values of the invoked callbacks.</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_user_data.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_user_data.page
index c17015a..5e824a9 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_user_data.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_user_data.page
@@ -35,12 +35,16 @@ call and can be released on return.</p>
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page
index 2334781..ee8f025 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page
@@ -34,12 +34,16 @@ function test_closure(closure:GObject.Closure):Number {
-<dl>
-<dt><p>closure :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>closure</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page
index 71d015b..3df43b8 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page
@@ -38,14 +38,20 @@ function test_closure_one_arg(closure:GObject.Closure, arg:Number):Number {
-<dl>
-<dt><p>closure :</p></dt>
-<dd></dd>
-<dt><p>arg :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>closure</code></title>
+
+</item>
+<item>
+<title><code>arg</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page
index f0d8408..e54fd5a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page
@@ -38,14 +38,20 @@ function test_closure_variant(closure:GObject.Closure, arg:GLib.Variant):GLib.Va
-<dl>
-<dt><p>closure :</p></dt>
-<dd><p>GClosure which takes one GVariant and returns a GVariant</p></dd>
-<dt><p>arg :</p></dt>
-<dd><p>a GVariant passed as argument to <code>closure</code></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>the return value of <code>closure</code></p></dd>
-</dl>
+<terms>
+<item>
+<title><code>closure</code></title>
+<p>GClosure which takes one GVariant and returns a GVariant</p>
+</item>
+<item>
+<title><code>arg</code></title>
+<p>a GVariant passed as argument to <code>closure</code></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>the return value of <code>closure</code></p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page
index 1bbead6..c6a75d7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page
@@ -30,10 +30,12 @@ function test_date_in_gvalue():GObject.Value {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_def_error_quark.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_def_error_quark.page
index c93ebef..46d62af 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_def_error_quark.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_def_error_quark.page
@@ -30,10 +30,12 @@ function test_def_error_quark():GLib.Quark {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_double.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_double.page
index 3074d36..7be3ebd 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_double.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_double.page
@@ -34,12 +34,16 @@ function test_double(in:Number):Number {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page
index 7922381..e4c935f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page
@@ -30,10 +30,12 @@ function test_filename_return():[filename] {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>list of strings</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>list of strings</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_float.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_float.page
index e255ede..27952a2 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_float.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_float.page
@@ -34,12 +34,16 @@ function test_float(in:Number):Number {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_container_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_container_return.page
index 996d9d1..5dad944 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_container_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_container_return.page
@@ -30,10 +30,12 @@ function test_garray_container_return():[String] {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_full_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_full_return.page
index 9b9bfbe..35b90f8 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_full_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_full_return.page
@@ -30,10 +30,12 @@ function test_garray_full_return():[String] {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gerror_callback.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gerror_callback.page
index f34a422..4d7bc88 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gerror_callback.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gerror_callback.page
@@ -34,10 +34,12 @@ function test_gerror_callback(callback:Regress.TestCallbackGError):void {
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_container_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_container_return.page
index 46f1663..e15eb13 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_container_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_container_return.page
@@ -30,10 +30,12 @@ function test_ghash_container_return():{String: String} {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_everything_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_everything_return.page
index 863d3a6..0b0d347 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_everything_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_everything_return.page
@@ -30,10 +30,12 @@ function test_ghash_everything_return():{String: String} {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page
index 629039d..2556237 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page
@@ -34,10 +34,12 @@ function test_ghash_gvalue_in(hash:{String: GObject.Value}):void {
-<dl>
-<dt><p>hash :</p></dt>
-<dd><p>the hash table returned by <link xref="Regress.test_ghash_gvalue_return"/>.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>hash</code></title>
+<p>the hash table returned by <link xref="Regress.test_ghash_gvalue_return"/>.</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page
index 881fc77..8a9fe98 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page
@@ -30,10 +30,12 @@ function test_ghash_gvalue_return():{String: GObject.Value} {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return.page
index a750335..c2701df 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return.page
@@ -30,10 +30,12 @@ function test_ghash_nested_everything_return():{String: {String: String}} {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return2.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return2.page
index ec6d712..896e346 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return2.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return2.page
@@ -31,10 +31,12 @@ element-type annotation.</p>
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in.page
index d54a659..438f5ab 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in.page
@@ -34,10 +34,12 @@ function test_ghash_nothing_in(in:{String: String}):void {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in2.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in2.page
index a6d376e..2dc3aa8 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in2.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in2.page
@@ -34,10 +34,12 @@ function test_ghash_nothing_in2(in:{String: String}):void {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return.page
index 5e18e08..4ee392e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return.page
@@ -30,10 +30,12 @@ function test_ghash_nothing_return():{String: String} {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return2.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return2.page
index fe99a70..492f653 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return2.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return2.page
@@ -30,10 +30,12 @@ function test_ghash_nothing_return2():{String: String} {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_in.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_in.page
index f984cc6..52dd265 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_in.page
@@ -34,10 +34,12 @@ function test_ghash_null_in(in:{String: String}):void {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_out.page
index e4c1583..09d222d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_out.page
@@ -30,8 +30,8 @@ function test_ghash_null_out():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_return.page
index 60c23f5..dac341f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_return.page
@@ -30,10 +30,12 @@ function test_ghash_null_return():{String: String} {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page
index d35f72b..0e6cc95 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page
@@ -30,10 +30,12 @@ function test_glist_container_return():[String] {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page
index 4989dd8..a58d926 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page
@@ -30,10 +30,12 @@ function test_glist_everything_return():[String] {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page
index 9b13e1b..3e14483 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page
@@ -34,10 +34,12 @@ function test_glist_nothing_in(in:[String]):void {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page
index 8403760..b22fd18 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page
@@ -34,10 +34,12 @@ function test_glist_nothing_in2(in:[String]):void {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page
index 9ae9a95..ec64972 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page
@@ -30,10 +30,12 @@ function test_glist_nothing_return():[String] {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page
index 069f5b0..b31d98f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page
@@ -30,10 +30,12 @@ function test_glist_nothing_return2():[String] {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page
index 8426bbf..6add7ce 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page
@@ -34,10 +34,12 @@ function test_glist_null_in(in:[String]):void {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_out.page
index 5b82c2e..b13cc9a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_out.page
@@ -30,8 +30,8 @@ function test_glist_null_out():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page
index 7dd60e3..19f7091 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page
@@ -30,10 +30,12 @@ function test_gslist_container_return():[String] {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page
index c65a349..5393646 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page
@@ -30,10 +30,12 @@ function test_gslist_everything_return():[String] {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page
index 3c09413..e011db6 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page
@@ -34,10 +34,12 @@ function test_gslist_nothing_in(in:[String]):void {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page
index 5eb3aa3..0e71821 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page
@@ -34,10 +34,12 @@ function test_gslist_nothing_in2(in:[String]):void {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page
index 80f6f7e..dc11a42 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page
@@ -30,10 +30,12 @@ function test_gslist_nothing_return():[String] {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page
index 3119bf0..5e1c564 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page
@@ -30,10 +30,12 @@ function test_gslist_nothing_return2():[String] {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page
index 3cc8d42..e698701 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page
@@ -34,10 +34,12 @@ function test_gslist_null_in(in:[String]):void {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_out.page
index a25e08e..5c25956 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_out.page
@@ -30,8 +30,8 @@ function test_gslist_null_out():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gtype.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gtype.page
index 9adb3fa..d2a438d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gtype.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gtype.page
@@ -34,12 +34,16 @@ function test_gtype(in:GType):GType {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page
index 8558a6b..0d301a9 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page
@@ -30,10 +30,12 @@ function test_gvariant_as():GLib.Variant {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>New variant</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>New variant</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page
index 2671f72..fa477da 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page
@@ -30,10 +30,12 @@ function test_gvariant_asv():GLib.Variant {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>New variant</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>New variant</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page
index e54e622..7af092f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page
@@ -30,10 +30,12 @@ function test_gvariant_i():GLib.Variant {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>New variant</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>New variant</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page
index 61cf1e7..b98b64d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page
@@ -30,10 +30,12 @@ function test_gvariant_s():GLib.Variant {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>New variant</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>New variant</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page
index 3cecce5..4987455 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page
@@ -30,10 +30,12 @@ function test_gvariant_v():GLib.Variant {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>New variant</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>New variant</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_hash_table_callback.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_hash_table_callback.page
index 6779010..9f215d7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_hash_table_callback.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_hash_table_callback.page
@@ -38,12 +38,16 @@ function test_hash_table_callback(data:{String: Number}, callback:Regress.TestCa
-<dl>
-<dt><p>data :</p></dt>
-<dd><p>GHashTable that gets passed to callback</p></dd>
-<dt><p>callback :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>data</code></title>
+<p>GHashTable that gets passed to callback</p>
+</item>
+<item>
+<title><code>callback</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int.page
index 5007da2..31b8b67 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int.page
@@ -34,12 +34,16 @@ function test_int(in:Number):Number {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int16.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int16.page
index 16a4a0b..f2f3902 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int16.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int16.page
@@ -34,12 +34,16 @@ function test_int16(in:gint16):gint16 {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int32.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int32.page
index e8ecc27..c254ed4 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int32.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int32.page
@@ -34,12 +34,16 @@ function test_int32(in:gint32):gint32 {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int64.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int64.page
index 16851bb..a30895e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int64.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int64.page
@@ -34,12 +34,16 @@ function test_int64(in:Number):Number {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int8.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int8.page
index c4f8669..ba53b82 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int8.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int8.page
@@ -34,12 +34,16 @@ function test_int8(in:gint8):gint8 {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_out_utf8.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_out_utf8.page
index 3f1aac0..971e658 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_out_utf8.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_out_utf8.page
@@ -34,10 +34,12 @@ function test_int_out_utf8(in:String):void {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page
index a7fc731..866be0d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page
@@ -34,12 +34,16 @@ function test_int_value_arg(v:GObject.Value):Number {
-<dl>
-<dt><p>v :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>v</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_long.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_long.page
index fb7aa3f..9eeddea 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_long.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_long.page
@@ -34,12 +34,16 @@ function test_long(in:Number):Number {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_callback.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_callback.page
index 56fc322..519ce43 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_callback.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_callback.page
@@ -34,12 +34,16 @@ function test_multi_callback(callback:Regress.TestCallback):Number {
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_double_args.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_double_args.page
index 5a69995..70d56ce 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_double_args.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_double_args.page
@@ -34,10 +34,12 @@ function test_multi_double_args(in:Number):void {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multiline_doc_comments.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multiline_doc_comments.page
index 21e97a2..75e4221 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multiline_doc_comments.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multiline_doc_comments.page
@@ -30,8 +30,8 @@ function test_multiline_doc_comments():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_nested_parameter.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_nested_parameter.page
index 087a248..3ee6239 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_nested_parameter.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_nested_parameter.page
@@ -59,10 +59,12 @@ rgb(20%, 30%, 0%)</literallayout></entry>
-<dl>
-<dt><p>a :</p></dt>
-<dd><p>An integer</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>a</code></title>
+<p>An integer</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_null_gerror_callback.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_null_gerror_callback.page
index 632be61..710af51 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_null_gerror_callback.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_null_gerror_callback.page
@@ -34,10 +34,12 @@ function test_null_gerror_callback(callback:Regress.TestCallbackGError):void {
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_owned_gerror_callback.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_owned_gerror_callback.page
index 5266607..e966fe8 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_owned_gerror_callback.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_owned_gerror_callback.page
@@ -34,10 +34,12 @@ function test_owned_gerror_callback(callback:Regress.TestCallbackOwnedGError):vo
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_short.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_short.page
index ade0d1e..1c53e16 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_short.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_short.page
@@ -34,12 +34,16 @@ function test_short(in:gshort):gshort {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_simple_callback.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_simple_callback.page
index 1c44d09..d6e596c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_simple_callback.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_simple_callback.page
@@ -34,10 +34,12 @@ function test_simple_callback(callback:Regress.TestSimpleCallback):void {
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_size.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_size.page
index eead974..fe3f5b4 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_size.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_size.page
@@ -34,12 +34,16 @@ function test_size(in:gsize):gsize {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ssize.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ssize.page
index 53c9380..77bc9cd 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ssize.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ssize.page
@@ -34,12 +34,16 @@ function test_ssize(in:gssize):gssize {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in.page
index ab2afca..880f489 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in.page
@@ -34,12 +34,16 @@ function test_strv_in(arr:[String]):Boolean {
-<dl>
-<dt><p>arr :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>arr</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page
index 8a025d3..0444457 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page
@@ -30,10 +30,12 @@ function test_strv_in_gvalue():GObject.Value {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out.page
index b9273dd..b475f63 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out.page
@@ -30,10 +30,12 @@ function test_strv_out():[String] {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_c.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_c.page
index b785421..69239d5 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_c.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_c.page
@@ -30,10 +30,12 @@ function test_strv_out_c():[String] {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_container.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_container.page
index dcf1931..17b5581 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_container.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_container.page
@@ -30,10 +30,12 @@ function test_strv_out_container():[String] {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_outarg.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_outarg.page
index a465b61..63bde33 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_outarg.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_outarg.page
@@ -30,8 +30,8 @@ function test_strv_outarg():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_timet.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_timet.page
index f75c9ad..be54bcc 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_timet.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_timet.page
@@ -34,12 +34,16 @@ function test_timet(in:Number):Number {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_0.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_0.page
index 269f16a..af5810f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_0.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_0.page
@@ -42,14 +42,20 @@ function test_torture_signature_0(x:Number, foo:String, m:Number):void {
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>foo :</p></dt>
-<dd></dd>
-<dt><p>m :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>foo</code></title>
+
+</item>
+<item>
+<title><code>m</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_1.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_1.page
index 7951588..915fdfe 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_1.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_1.page
@@ -42,16 +42,24 @@ function test_torture_signature_1(x:Number, foo:String, m:Number):Boolean {
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>foo :</p></dt>
-<dd></dd>
-<dt><p>m :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>foo</code></title>
+
+</item>
+<item>
+<title><code>m</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_2.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_2.page
index 4504cf4..ac69400 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_2.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_2.page
@@ -46,16 +46,24 @@ function test_torture_signature_2(x:Number, callback:Regress.TestCallbackUserDat
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>foo :</p></dt>
-<dd></dd>
-<dt><p>m :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>foo</code></title>
+
+</item>
+<item>
+<title><code>m</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint.page
index 0c514f3..deb1e90 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint.page
@@ -34,12 +34,16 @@ function test_uint(in:Number):Number {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint16.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint16.page
index dc0601f..357dcc5 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint16.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint16.page
@@ -34,12 +34,16 @@ function test_uint16(in:guint16):guint16 {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint32.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint32.page
index 282967d..445dbff 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint32.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint32.page
@@ -34,12 +34,16 @@ function test_uint32(in:guint32):guint32 {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint64.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint64.page
index ec408e6..f77993c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint64.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint64.page
@@ -34,12 +34,16 @@ function test_uint64(in:Number):Number {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint8.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint8.page
index 77ac333..4f099b7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint8.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint8.page
@@ -34,12 +34,16 @@ function test_uint8(in:guint8):guint8 {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ulong.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ulong.page
index 4eb5f81..5ad9142 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ulong.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ulong.page
@@ -34,12 +34,16 @@ function test_ulong(in:Number):Number {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unichar.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unichar.page
index 23a7830..2a10fb3 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unichar.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unichar.page
@@ -34,12 +34,16 @@ function test_unichar(in:String):String {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unsigned_enum_param.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unsigned_enum_param.page
index 0bbc173..9da74e6 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unsigned_enum_param.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unsigned_enum_param.page
@@ -34,12 +34,16 @@ function test_unsigned_enum_param(e:Regress.TestEnumUnsigned):String {
-<dl>
-<dt><p>e :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>e</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ushort.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ushort.page
index 3a7b260..9dd5ddc 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ushort.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ushort.page
@@ -34,12 +34,16 @@ function test_ushort(in:gushort):gushort {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_in.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_in.page
index 9bfb3fd..7b1f74d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_in.page
@@ -34,10 +34,12 @@ function test_utf8_const_in(in:String):void {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_return.page
index d8c7655..514a565 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_return.page
@@ -30,10 +30,12 @@ function test_utf8_const_return():String {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>UTF-8 string</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>UTF-8 string</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_inout.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_inout.page
index df85d8a..cf5ce4a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_inout.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_inout.page
@@ -34,10 +34,12 @@ function test_utf8_inout(inout:String):void {
-<dl>
-<dt><p>inout :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>inout</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_nonconst_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_nonconst_return.page
index d4a0084..3b0e3c8 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_nonconst_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_nonconst_return.page
@@ -30,10 +30,12 @@ function test_utf8_nonconst_return():String {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>UTF-8 string</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>UTF-8 string</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_in.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_in.page
index 15c583b..ba9f250 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_in.page
@@ -34,10 +34,12 @@ function test_utf8_null_in(in:String):void {
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_out.page
index af8db3a..36e0022 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_out.page
@@ -30,8 +30,8 @@ function test_utf8_null_out():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out.page
index 9692dc6..0889a57 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out.page
@@ -30,8 +30,8 @@ function test_utf8_out():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_nonconst_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_nonconst_return.page
index 4e2cf0e..2feadbf 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_nonconst_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_nonconst_return.page
@@ -30,10 +30,12 @@ function test_utf8_out_nonconst_return():String {
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>a copy of "first"</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+<p>a copy of "first"</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_out.page
index 43e35d1..39037cb 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_out.page
@@ -30,8 +30,8 @@ function test_utf8_out_out():void {
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page
index 542af0b..a554bf1 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page
@@ -34,12 +34,16 @@ function test_value_return(i:Number):GObject.Value {
-<dl>
-<dt><p>i :</p></dt>
-<dd><p>an int</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>the int wrapped in a GValue.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>i</code></title>
+<p>an int</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>the int wrapped in a GValue.</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_versioning.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_versioning.page
index d3cfc1d..bfef494 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_versioning.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_versioning.page
@@ -31,8 +31,8 @@ function test_versioning():void {
<p>Since 1.32.1</p>
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.ATestError.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.ATestError.page
index dff139f..119860d 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.ATestError.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.ATestError.page
@@ -19,14 +19,20 @@
-<dl>
-<dt><p>ATestError.CODE0 :</p></dt>
-<dd></dd>
-<dt><p>ATestError.CODE1 :</p></dt>
-<dd></dd>
-<dt><p>ATestError.CODE2 :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>ATestError.CODE0</code></title>
+
+</item>
+<item>
+<title><code>ATestError.CODE1</code></title>
+
+</item>
+<item>
+<title><code>ATestError.CODE2</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page
index 221c269..f01e3bf 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page
@@ -23,20 +23,30 @@ def callback(annotation_object, arg1, arg2, user_param1, ...)
-<dl>
-<dt><p>annotation_object :</p></dt>
-<dd><p>instance of Regress.AnnotationObject that is emitting the signal</p></dd>
-<dt><p>arg1 :</p></dt>
-<dd><p>a value</p></dd>
-<dt><p>arg2 :</p></dt>
-<dd><p>another value</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-<dt><p>Returns :</p></dt>
-<dd>gchar* <p>the return value</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>annotation_object</code></title>
+<p>instance of Regress.AnnotationObject that is emitting the signal</p>
+</item>
+<item>
+<title><code>arg1</code></title>
+<p>a value</p>
+</item>
+<item>
+<title><code>arg2</code></title>
+<p>another value</p>
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>gchar* <p>the return value</p></p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page
index 03b488b..6499491 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page
@@ -23,16 +23,22 @@ def callback(annotation_object, arg1, user_param1, ...)
-<dl>
-<dt><p>annotation_object :</p></dt>
-<dd><p>instance of Regress.AnnotationObject that is emitting the signal</p></dd>
-<dt><p>arg1 :</p></dt>
-<dd></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>annotation_object</code></title>
+<p>instance of Regress.AnnotationObject that is emitting the signal</p>
+</item>
+<item>
+<title><code>arg1</code></title>
+
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page
index d0da8d6..250aca0 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page
@@ -24,16 +24,22 @@ known by GObject as it's only marked as G_TYPE_POINTER</p>
-<dl>
-<dt><p>annotation_object :</p></dt>
-<dd><p>instance of Regress.AnnotationObject that is emitting the signal</p></dd>
-<dt><p>list :</p></dt>
-<dd><p>a list of strings</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>annotation_object</code></title>
+<p>instance of Regress.AnnotationObject that is emitting the signal</p>
+</item>
+<item>
+<title><code>list</code></title>
+<p>a list of strings</p>
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page
index 66e2ee6..4aaf7e8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page
@@ -25,16 +25,22 @@ it says it's pointer but it's actually a string.</p>
<p>Since 1.0</p>
-<dl>
-<dt><p>annotation_object :</p></dt>
-<dd><p>instance of Regress.AnnotationObject that is emitting the signal</p></dd>
-<dt><p>string :</p></dt>
-<dd><p>a string</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>annotation_object</code></title>
+<p>instance of Regress.AnnotationObject that is emitting the signal</p>
+</item>
+<item>
+<title><code>string</code></title>
+<p>a string</p>
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page
index 7d94a77..0fe1c05 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page
@@ -39,14 +39,20 @@ def allow_none(self, somearg):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>somearg :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd><p><code>None</code> always</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>somearg</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page
index 157739d..3f2107e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page
@@ -39,14 +39,20 @@ def calleeowns(self, toown):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>toown :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>an int</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>toown</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page
index e943682..cd2c7d9 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page
@@ -43,16 +43,24 @@ def calleesowns(self, toown1, toown2):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>toown1 :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>toown2 :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>an int</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>toown1</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>toown2</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page
index 31c8d37..fcc8910 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page
@@ -39,12 +39,16 @@ def compute_sum(self, nums):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>nums :</p></dt>
-<dd><p>Sequence of numbers</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>nums</code></title>
+<p>Sequence of numbers</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page
index f017eb3..d929218 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page
@@ -43,14 +43,20 @@ def compute_sum_n(self, nums, n_nums):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>nums :</p></dt>
-<dd><p>Sequence of numbers that are zero-terminated</p></dd>
-<dt><p>n_nums :</p></dt>
-<dd><p>Length of number array</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>nums</code></title>
+<p>Sequence of numbers that are zero-terminated</p>
+</item>
+<item>
+<title><code>n_nums</code></title>
+<p>Length of number array</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page
index c7ae439..053a368 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page
@@ -43,14 +43,20 @@ def compute_sum_nz(self, nums, n_nums):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="Regress.AnnotationObject"/></p></dd>
-<dt><p>nums :</p></dt>
-<dd><p>Sequence of numbers that are zero-terminated</p></dd>
-<dt><p>n_nums :</p></dt>
-<dd><p>Length of number array</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="Regress.AnnotationObject"/></p>
+</item>
+<item>
+<title><code>nums</code></title>
+<p>Sequence of numbers that are zero-terminated</p>
+</item>
+<item>
+<title><code>n_nums</code></title>
+<p>Length of number array</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page
index 66b7406..4ee8088 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page
@@ -35,12 +35,16 @@ def create_object(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>The object</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page
index 648dc52..4e79b26 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page
@@ -35,12 +35,16 @@ def do_not_use(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p><code>None</code> always</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page
index b3fa22d..5ddadfc 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page
@@ -35,10 +35,12 @@ def extra_annos(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page
index be20587..0d34439 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page
@@ -43,14 +43,20 @@ def foreach(self, func, user_data):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="Regress.AnnotationObject"/></p></dd>
-<dt><p>func :</p></dt>
-<dd><p>Callback to invoke</p></dd>
-<dt><p>user_data :</p></dt>
-<dd><p>Callback user data</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="Regress.AnnotationObject"/></p>
+</item>
+<item>
+<title><code>func</code></title>
+<p>Callback to invoke</p>
+</item>
+<item>
+<title><code>user_data</code></title>
+<p>Callback user data</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page
index 66d4b85..87cfede 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page
@@ -36,12 +36,16 @@ objects.</p>
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>hash table</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page
index d288385..bd174a4 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page
@@ -37,12 +37,16 @@ intentionally similar example to gtk_container_get_children</p>
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>list of objects</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page
index 6b5f439..698180b 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page
@@ -36,12 +36,16 @@ each string needs to be freed.</p>
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>list of strings</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page
index 328a7ba..5dd1e2b 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page
@@ -35,10 +35,12 @@ def hidden_self(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>A <link xref="Regress.AnnotationObject"/></p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>A <link xref="Regress.AnnotationObject"/></p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page
index 71a0aef..569587e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page
@@ -39,14 +39,20 @@ def in(self, inarg):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>inarg :</p></dt>
-<dd><p>This is an argument test</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>an int</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>inarg</code></title>
+<p>This is an argument test</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page
index 7ddf3a7..84ac74a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page
@@ -39,14 +39,20 @@ def inout(self, inoutarg):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>inoutarg :</p></dt>
-<dd><p>This is an argument test</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>an int</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>inoutarg</code></title>
+<p>This is an argument test</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page
index 82056c3..b620580 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page
@@ -39,14 +39,20 @@ def inout2(self, inoutarg):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>inoutarg :</p></dt>
-<dd><p>This is an argument test</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>an int</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>inoutarg</code></title>
+<p>This is an argument test</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page
index 45b8959..ca64eaa 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page
@@ -39,14 +39,20 @@ def inout3(self, inoutarg):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>inoutarg :</p></dt>
-<dd><p>This is an argument test</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>an int</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>inoutarg</code></title>
+<p>This is an argument test</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page
index bb23ba1..f280088 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page
@@ -35,12 +35,16 @@ def method(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>an int</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page
index 73731e7..8e7786a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page
@@ -35,12 +35,16 @@ def notrans(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>An object, not referenced</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page
index ba69737..a871879 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page
@@ -39,14 +39,20 @@ def out(self, outarg):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>outarg :</p></dt>
-<dd><p>This is an argument test</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>an int</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>outarg</code></title>
+<p>This is an argument test</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.parse_args.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.parse_args.page
index ac28c6f..c76bb94 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.parse_args.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.parse_args.page
@@ -43,14 +43,20 @@ def parse_args(self, argc, argv):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="Regress.AnnotationObject"/></p></dd>
-<dt><p>argc :</p></dt>
-<dd><p>Length of the argument vector</p></dd>
-<dt><p>argv :</p></dt>
-<dd><p>Argument vector</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="Regress.AnnotationObject"/></p>
+</item>
+<item>
+<title><code>argc</code></title>
+<p>Length of the argument vector</p>
+</item>
+<item>
+<title><code>argv</code></title>
+<p>Argument vector</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page
index 8f94916..beaebab 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page
@@ -43,14 +43,20 @@ def set_data(self, data, length):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="Regress.AnnotationObject"/></p></dd>
-<dt><p>data :</p></dt>
-<dd><p>The data</p></dd>
-<dt><p>length :</p></dt>
-<dd><p>Length of the data</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="Regress.AnnotationObject"/></p>
+</item>
+<item>
+<title><code>data</code></title>
+<p>The data</p>
+</item>
+<item>
+<title><code>length</code></title>
+<p>Length of the data</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page
index 70c3e62..b9fc65f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page
@@ -43,14 +43,20 @@ def set_data2(self, data, length):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="Regress.AnnotationObject"/></p></dd>
-<dt><p>data :</p></dt>
-<dd><p>The data</p></dd>
-<dt><p>length :</p></dt>
-<dd><p>Length of the data</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="Regress.AnnotationObject"/></p>
+</item>
+<item>
+<title><code>data</code></title>
+<p>The data</p>
+</item>
+<item>
+<title><code>length</code></title>
+<p>Length of the data</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page
index 1a5bb11..ccabb84 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page
@@ -44,14 +44,20 @@ type.</p>
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="Regress.AnnotationObject"/></p></dd>
-<dt><p>data :</p></dt>
-<dd><p>The data</p></dd>
-<dt><p>length :</p></dt>
-<dd><p>Length of the data</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="Regress.AnnotationObject"/></p>
+</item>
+<item>
+<title><code>data</code></title>
+<p>The data</p>
+</item>
+<item>
+<title><code>length</code></title>
+<p>Length of the data</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page
index 5c02dbd..9d12f39 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page
@@ -39,14 +39,20 @@ def string_out(self, str_out):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="Regress.AnnotationObject"/></p></dd>
-<dt><p>str_out :</p></dt>
-<dd><p>string return value</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>some boolean</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="Regress.AnnotationObject"/></p>
+</item>
+<item>
+<title><code>str_out</code></title>
+<p>string return value</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page
index 2e5bba2..6c5d72c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page
@@ -39,12 +39,16 @@ def use_buffer(self, bytes):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>bytes :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>bytes</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page
index ced0ddc..ebb7aa0 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page
@@ -47,16 +47,24 @@ def watch_full(self, func, user_data, destroy):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>A <link xref="Regress.AnnotationObject"/></p></dd>
-<dt><p>func :</p></dt>
-<dd><p>The callback</p></dd>
-<dt><p>user_data :</p></dt>
-<dd><p>The callback data</p></dd>
-<dt><p>destroy :</p></dt>
-<dd><p>Destroy notification</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>A <link xref="Regress.AnnotationObject"/></p>
+</item>
+<item>
+<title><code>func</code></title>
+<p>The callback</p>
+</item>
+<item>
+<title><code>user_data</code></title>
+<p>The callback data</p>
+</item>
+<item>
+<title><code>destroy</code></title>
+<p>Destroy notification</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page
index 086223d..b4ceb23 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page
@@ -39,12 +39,16 @@ def with_voidp(self, data):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>data :</p></dt>
-<dd><p>Opaque pointer handle</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>data</code></title>
+<p>Opaque pointer handle</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooASingle.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooASingle.page
index 34f1ed7..b59e763 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooASingle.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooASingle.page
@@ -19,10 +19,12 @@
-<dl>
-<dt><p>FooASingle.FOO_SOME_SINGLE_ENUM :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>FooASingle.FOO_SOME_SINGLE_ENUM</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooAddressType.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooAddressType.page
index 2dafde0..e3f5293 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooAddressType.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooAddressType.page
@@ -19,14 +19,20 @@
-<dl>
-<dt><p>FooAddressType.INVALID :</p></dt>
-<dd></dd>
-<dt><p>FooAddressType.IPV4 :</p></dt>
-<dd></dd>
-<dt><p>FooAddressType.IPV6 :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>FooAddressType.INVALID</code></title>
+
+</item>
+<item>
+<title><code>FooAddressType.IPV4</code></title>
+
+</item>
+<item>
+<title><code>FooAddressType.IPV6</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page
index 8654fb4..fd700d2 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page
@@ -39,12 +39,16 @@ def add(self, b2):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>b2 :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>b2</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.method.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.method.page
index b357ea2..9cfe931 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.method.page
@@ -35,10 +35,12 @@ def method(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page
index 472d16b..8b65f13 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page
@@ -35,10 +35,12 @@ def some_method(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.method.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.method.page
index db6a6b0..2d19be6 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.method.page
@@ -35,10 +35,12 @@ def method(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumFullname.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumFullname.page
index a46070d..443f25e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumFullname.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumFullname.page
@@ -19,14 +19,20 @@
-<dl>
-<dt><p>FooEnumFullname.ONE :</p></dt>
-<dd></dd>
-<dt><p>FooEnumFullname.TWO :</p></dt>
-<dd></dd>
-<dt><p>FooEnumFullname.THREE :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>FooEnumFullname.ONE</code></title>
+
+</item>
+<item>
+<title><code>FooEnumFullname.TWO</code></title>
+
+</item>
+<item>
+<title><code>FooEnumFullname.THREE</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumNoType.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumNoType.page
index 2313192..5957904 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumNoType.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumNoType.page
@@ -19,16 +19,24 @@
-<dl>
-<dt><p>FooEnumNoType.UN :</p></dt>
-<dd></dd>
-<dt><p>FooEnumNoType.DEUX :</p></dt>
-<dd></dd>
-<dt><p>FooEnumNoType.TROIS :</p></dt>
-<dd></dd>
-<dt><p>FooEnumNoType.NEUF :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>FooEnumNoType.UN</code></title>
+
+</item>
+<item>
+<title><code>FooEnumNoType.DEUX</code></title>
+
+</item>
+<item>
+<title><code>FooEnumNoType.TROIS</code></title>
+
+</item>
+<item>
+<title><code>FooEnumNoType.NEUF</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.page
index 37510f5..d052d4f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.page
@@ -19,14 +19,20 @@
-<dl>
-<dt><p>FooEnumType.ALPHA :</p></dt>
-<dd></dd>
-<dt><p>FooEnumType.BETA :</p></dt>
-<dd></dd>
-<dt><p>FooEnumType.DELTA :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>FooEnumType.ALPHA</code></title>
+
+</item>
+<item>
+<title><code>FooEnumType.BETA</code></title>
+
+</item>
+<item>
+<title><code>FooEnumType.DELTA</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.page
index 0877e7c..5577eeb 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.page
@@ -19,14 +19,20 @@
-<dl>
-<dt><p>FooError.GOOD :</p></dt>
-<dd></dd>
-<dt><p>FooError.BAD :</p></dt>
-<dd></dd>
-<dt><p>FooError.UGLY :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>FooError.GOOD</code></title>
+
+</item>
+<item>
+<title><code>FooError.BAD</code></title>
+
+</item>
+<item>
+<title><code>FooError.UGLY</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page
index 8b7835f..86bdfa3 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page
@@ -35,12 +35,16 @@ def copy(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface-do_regress_foo.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface-do_regress_foo.page
index b942b55..6cb6433 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface-do_regress_foo.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface-do_regress_foo.page
@@ -24,12 +24,16 @@ def do_do_regress_foo(self, x):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>x :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>x</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page
index 60af844..465f913 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page
@@ -39,12 +39,16 @@ def do_regress_foo(self, x):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>x :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>x</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.static_method.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.static_method.page
index 947a5e9..7da66ea 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.static_method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.static_method.page
@@ -35,10 +35,12 @@ def static_method(x):
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-read_fn.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-read_fn.page
index a634e4e..e5189c1 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-read_fn.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-read_fn.page
@@ -24,14 +24,20 @@ def do_read_fn(object, offset, length):
-<dl>
-<dt><p>object :</p></dt>
-<dd></dd>
-<dt><p>offset :</p></dt>
-<dd><p>offset</p></dd>
-<dt><p>length :</p></dt>
-<dd><p>length</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+
+</item>
+<item>
+<title><code>offset</code></title>
+<p>offset</p>
+</item>
+<item>
+<title><code>length</code></title>
+<p>length</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page
index c663823..7a353a2 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page
@@ -23,20 +23,30 @@ def callback(foo_object, object, p0, user_param1, ...)
-<dl>
-<dt><p>foo_object :</p></dt>
-<dd><p>instance of Regress.FooObject that is emitting the signal</p></dd>
-<dt><p>object :</p></dt>
-<dd></dd>
-<dt><p>p0 :</p></dt>
-<dd></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-<dt><p>Returns :</p></dt>
-<dd>gchar* </dd>
-</dl>
+<terms>
+<item>
+<title><code>foo_object</code></title>
+<p>instance of Regress.FooObject that is emitting the signal</p>
+</item>
+<item>
+<title><code>object</code></title>
+
+</item>
+<item>
+<title><code>p0</code></title>
+
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>gchar* </p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-virtual_method.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-virtual_method.page
index 1ad7512..e457900 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-virtual_method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-virtual_method.page
@@ -24,14 +24,20 @@ def do_virtual_method(object, first_param):
-<dl>
-<dt><p>object :</p></dt>
-<dd></dd>
-<dt><p>first_param :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+
+</item>
+<item>
+<title><code>first_param</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page
index 6cb5138..e291ab6 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page
@@ -35,10 +35,12 @@ def a_global_method(obj):
-<dl>
-<dt><p>obj :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page
index a3e39f1..7fa2ea7 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page
@@ -39,14 +39,20 @@ def append_new_stack_layer(self, x):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page
index a023795..3d329fb 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page
@@ -35,12 +35,16 @@ def dup_name(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page
index 48d5e59..09481e9 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page
@@ -35,12 +35,16 @@ def external_type(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="Regress.FooObject"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p><code>None</code> always</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="Regress.FooObject"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page
index b1208bd..3b7c872 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page
@@ -31,10 +31,12 @@ uses a C sugar return type.</p>
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>The global <link xref="Regress.FooSubobject"/></p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page
index fc87e4a..52a9056 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page
@@ -35,12 +35,16 @@ def get_name(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page
index 20fea24..5671a1c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page
@@ -39,12 +39,16 @@ def handle_glyph(self, glyph):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>glyph :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>glyph</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page
index 3ee60dd..633c32f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page
@@ -39,12 +39,16 @@ def is_it_time_yet(self, time):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>time :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>time</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page
index d3ec000..787081f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page
@@ -43,14 +43,20 @@ def read(self, offset, length):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>obj</p></dd>
-<dt><p>offset :</p></dt>
-<dd><p>offset</p></dd>
-<dt><p>length :</p></dt>
-<dd><p>length</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>obj</p>
+</item>
+<item>
+<title><code>offset</code></title>
+<p>offset</p>
+</item>
+<item>
+<title><code>length</code></title>
+<p>length</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page
index 2212da0..4c825d8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page
@@ -30,10 +30,12 @@ def static_meth():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page
index 702a6e8..15227cd 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page
@@ -43,14 +43,20 @@ def various(self, data, some_type):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>data :</p></dt>
-<dd></dd>
-<dt><p>some_type :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>data</code></title>
+
+</item>
+<item>
+<title><code>some_type</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page
index 68a9409..3e05ffa 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page
@@ -39,14 +39,20 @@ def virtual_method(self, first_param):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>first_param :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>first_param</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page
index ea8bf20..e2f8bbe 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page
@@ -39,12 +39,16 @@ def add(self, r2):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>add to this rect</p></dd>
-<dt><p>r2 :</p></dt>
-<dd><p>source rectangle</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>add to this rect</p>
+</item>
+<item>
+<title><code>r2</code></title>
+<p>source rectangle</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooStackLayer.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStackLayer.page
index 83ca6a1..bd7a445 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooStackLayer.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStackLayer.page
@@ -19,26 +19,44 @@
-<dl>
-<dt><p>FooStackLayer.DESKTOP :</p></dt>
-<dd></dd>
-<dt><p>FooStackLayer.BOTTOM :</p></dt>
-<dd></dd>
-<dt><p>FooStackLayer.NORMAL :</p></dt>
-<dd></dd>
-<dt><p>FooStackLayer.TOP :</p></dt>
-<dd></dd>
-<dt><p>FooStackLayer.DOCK :</p></dt>
-<dd></dd>
-<dt><p>FooStackLayer.FULLSCREEN :</p></dt>
-<dd></dd>
-<dt><p>FooStackLayer.FOCUSED_WINDOW :</p></dt>
-<dd></dd>
-<dt><p>FooStackLayer.OVERRIDE_REDIRECT :</p></dt>
-<dd></dd>
-<dt><p>FooStackLayer.LAST :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>FooStackLayer.DESKTOP</code></title>
+
+</item>
+<item>
+<title><code>FooStackLayer.BOTTOM</code></title>
+
+</item>
+<item>
+<title><code>FooStackLayer.NORMAL</code></title>
+
+</item>
+<item>
+<title><code>FooStackLayer.TOP</code></title>
+
+</item>
+<item>
+<title><code>FooStackLayer.DOCK</code></title>
+
+</item>
+<item>
+<title><code>FooStackLayer.FULLSCREEN</code></title>
+
+</item>
+<item>
+<title><code>FooStackLayer.FOCUSED_WINDOW</code></title>
+
+</item>
+<item>
+<title><code>FooStackLayer.OVERRIDE_REDIRECT</code></title>
+
+</item>
+<item>
+<title><code>FooStackLayer.LAST</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy-event.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy-event.page
index bb146ab..3c43a77 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy-event.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy-event.page
@@ -23,14 +23,18 @@ def callback(foo_sub_interface, user_param1, ...)
-<dl>
-<dt><p>foo_sub_interface :</p></dt>
-<dd><p>instance of Regress.FooSubInterface that is emitting the signal</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>foo_sub_interface</code></title>
+<p>instance of Regress.FooSubInterface that is emitting the signal</p>
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy_event.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy_event.page
index 5f014df..4b925a9 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy_event.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy_event.page
@@ -24,10 +24,12 @@ def do_destroy_event(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_bar.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_bar.page
index fd55d89..d07cadc 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_bar.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_bar.page
@@ -24,10 +24,12 @@ def do_do_bar(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_baz.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_baz.page
index 1078dfc..723cea8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_baz.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_baz.page
@@ -24,14 +24,20 @@ def do_do_baz(self, callback, user_data):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>user_data :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>user_data</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page
index 6be01ab..45137e8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page
@@ -35,10 +35,12 @@ def do_bar(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page
index af759a1..e95447c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page
@@ -43,14 +43,20 @@ def do_baz(self, callback, user_data):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>user_data :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>user_data</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.page
index fea8d58..6a044d7 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.page
@@ -19,14 +19,20 @@
-<dl>
-<dt><p>TestABCError.CODE1 :</p></dt>
-<dd></dd>
-<dt><p>TestABCError.CODE2 :</p></dt>
-<dd></dd>
-<dt><p>TestABCError.CODE3 :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>TestABCError.CODE1</code></title>
+
+</item>
+<item>
+<title><code>TestABCError.CODE2</code></title>
+
+</item>
+<item>
+<title><code>TestABCError.CODE3</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page
index 489f3ff..fa810dd 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page
@@ -35,12 +35,16 @@ def copy(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page
index 68a19e0..e03d1f0 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page
@@ -39,14 +39,20 @@ def equals(self, other):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>other :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>other</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page
index f770ecf..30b4599 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page
@@ -35,12 +35,16 @@ def copy(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page
index 84a66e5..6923488 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page
@@ -35,12 +35,16 @@ def copy(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page
index 5c37368..366fb2d 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page
@@ -35,10 +35,12 @@ def free(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page
index af75b8f..551c617 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page
@@ -35,12 +35,16 @@ def get_magic(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestDEFError.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestDEFError.page
index b6f0eb8..6a92ba9 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestDEFError.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestDEFError.page
@@ -19,14 +19,20 @@
-<dl>
-<dt><p>TestDEFError.CODE0 :</p></dt>
-<dd></dd>
-<dt><p>TestDEFError.CODE1 :</p></dt>
-<dd></dd>
-<dt><p>TestDEFError.CODE2 :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>TestDEFError.CODE0</code></title>
+
+</item>
+<item>
+<title><code>TestDEFError.CODE1</code></title>
+
+</item>
+<item>
+<title><code>TestDEFError.CODE2</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page
index 3de1bbf..9009dcd 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page
@@ -19,16 +19,24 @@
-<dl>
-<dt><p>TestEnum.VALUE1 :</p></dt>
-<dd><p>value 1</p></dd>
-<dt><p>TestEnum.VALUE2 :</p></dt>
-<dd><p>value 2</p></dd>
-<dt><p>TestEnum.VALUE3 :</p></dt>
-<dd></dd>
-<dt><p>TestEnum.VALUE4 :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>TestEnum.VALUE1</code></title>
+<p>value 1</p>
+</item>
+<item>
+<title><code>TestEnum.VALUE2</code></title>
+<p>value 2</p>
+</item>
+<item>
+<title><code>TestEnum.VALUE3</code></title>
+
+</item>
+<item>
+<title><code>TestEnum.VALUE4</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.page
index 625c870..a0cd98c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.page
@@ -19,14 +19,20 @@
-<dl>
-<dt><p>TestEnumNoGEnum.EVALUE1 :</p></dt>
-<dd></dd>
-<dt><p>TestEnumNoGEnum.EVALUE2 :</p></dt>
-<dd></dd>
-<dt><p>TestEnumNoGEnum.EVALUE3 :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>TestEnumNoGEnum.EVALUE1</code></title>
+
+</item>
+<item>
+<title><code>TestEnumNoGEnum.EVALUE2</code></title>
+
+</item>
+<item>
+<title><code>TestEnumNoGEnum.EVALUE3</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumUnsigned.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumUnsigned.page
index 3069d8e..327cacc 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumUnsigned.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumUnsigned.page
@@ -19,12 +19,16 @@
-<dl>
-<dt><p>TestEnumUnsigned.VALUE1 :</p></dt>
-<dd></dd>
-<dt><p>TestEnumUnsigned.VALUE2 :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>TestEnumUnsigned.VALUE1</code></title>
+
+</item>
+<item>
+<title><code>TestEnumUnsigned.VALUE2</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.page
index 57a2116..c635d0e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.page
@@ -19,14 +19,20 @@
-<dl>
-<dt><p>TestError.CODE1 :</p></dt>
-<dd></dd>
-<dt><p>TestError.CODE2 :</p></dt>
-<dd></dd>
-<dt><p>TestError.CODE3 :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>TestError.CODE1</code></title>
+
+</item>
+<item>
+<title><code>TestError.CODE2</code></title>
+
+</item>
+<item>
+<title><code>TestError.CODE3</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page
index 243e8fd..23164e0 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page
@@ -35,12 +35,16 @@ def ref(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>A new <link xref="Regress.TestFundamentalObject"/></p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page
index eec1dbf..18f5765 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page
@@ -35,10 +35,12 @@ def unref(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page
index 5c97095..2aff243 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page
@@ -39,12 +39,16 @@ def do_foo(self, x):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>x :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>x</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page
index 1e3d041..4f7d8e6 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page
@@ -39,12 +39,16 @@ def do_foo_maybe_throw(self, x):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>x :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>x</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page
index 908bdec..ccd73b1 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page
@@ -43,14 +43,20 @@ def get_origin(self, x, y):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>y :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>y</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page
index f6bb036..39d7bcc 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page
@@ -43,14 +43,20 @@ def get_size(self, width, height):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>width :</p></dt>
-<dd></dd>
-<dt><p>height :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>width</code></title>
+
+</item>
+<item>
+<title><code>height</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page
index 1a1be53..f4c2acb 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page
@@ -23,14 +23,18 @@ def callback(test_obj, user_param1, ...)
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-allow_none_vfunc.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-allow_none_vfunc.page
index 3f72a49..aaea25a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-allow_none_vfunc.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-allow_none_vfunc.page
@@ -24,12 +24,16 @@ def do_allow_none_vfunc(obj, two):
-<dl>
-<dt><p>obj :</p></dt>
-<dd></dd>
-<dt><p>two :</p></dt>
-<dd><p>Another object</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+<item>
+<title><code>two</code></title>
+<p>Another object</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page
index 6c3bca2..292ae89 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page
@@ -23,14 +23,18 @@ def callback(test_obj, user_param1, ...)
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page
index 8a05f09..959a711 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page
@@ -23,14 +23,18 @@ def callback(test_obj, user_param1, ...)
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page
index b41a407..a1f1fd9 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page
@@ -26,14 +26,20 @@ case.</p>
-<dl>
-<dt><p>obj :</p></dt>
-<dd></dd>
-<dt><p>somestr :</p></dt>
-<dd><p>Meaningless string</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+<item>
+<title><code>somestr</code></title>
+<p>Meaningless string</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page
index d326c87..9441214 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page
@@ -24,16 +24,22 @@ def callback(test_obj, arr, user_param1, ...)
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>arr :</p></dt>
-<dd><p>numbers</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<item>
+<title><code>arr</code></title>
+<p>numbers</p>
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page
index 38e632a..8734cde 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page
@@ -23,16 +23,22 @@ def callback(test_obj, cr, user_param1, ...)
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>cr :</p></dt>
-<dd><p>A cairo context.</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<item>
+<title><code>cr</code></title>
+<p>A cairo context.</p>
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page
index 467f995..40a3c1e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page
@@ -24,16 +24,22 @@ def callback(test_obj, hash, user_param1, ...)
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>hash :</p></dt>
-<dd></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<item>
+<title><code>hash</code></title>
+
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page
index 357847b..5b077e1 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page
@@ -24,18 +24,26 @@ the introspection client langage.</p>
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>i :</p></dt>
-<dd><p>an integer</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-<dt><p>Returns :</p></dt>
-<dd>gint64 </dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<item>
+<title><code>i</code></title>
+<p>an integer</p>
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>gint64 </p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page
index 7f2bd5c..4f28c6f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page
@@ -23,16 +23,22 @@ def callback(test_obj, i, user_param1, ...)
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>i :</p></dt>
-<dd><p>an integer</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<item>
+<title><code>i</code></title>
+<p>an integer</p>
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page
index a410605..e749b70 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page
@@ -24,16 +24,22 @@ Use with regress_test_obj_emit_sig_with_obj</p>
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>obj :</p></dt>
-<dd><p>A newly created RegressTestObj</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<item>
+<title><code>obj</code></title>
+<p>A newly created RegressTestObj</p>
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page
index b6b5b25..d70bbbc 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page
@@ -23,16 +23,22 @@ def callback(test_obj, strs, user_param1, ...)
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>strs :</p></dt>
-<dd><p>strings</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<item>
+<title><code>strs</code></title>
+<p>strings</p>
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page
index 5617c5c..35ccde6 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page
@@ -24,18 +24,26 @@ the introspection client langage.</p>
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>i :</p></dt>
-<dd><p>an integer</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-<dt><p>Returns :</p></dt>
-<dd>guint64 </dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<item>
+<title><code>i</code></title>
+<p>an integer</p>
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>guint64 </p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page
index bdd3b3e..3bfeb1d 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page
@@ -23,16 +23,22 @@ def callback(test_obj, object, user_param1, ...)
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>object :</p></dt>
-<dd></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<item>
+<title><code>object</code></title>
+
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page
index 74a7454..2ec8ca2 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page
@@ -23,14 +23,18 @@ def callback(test_obj, user_param1, ...)
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page
index a714018..f7d905b 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page
@@ -41,14 +41,20 @@ case.</p>
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>A <link xref="Regress.TestObj"/></p></dd>
-<dt><p>somestr :</p></dt>
-<dd><p>Meaningless string</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>A <link xref="Regress.TestObj"/></p>
+</item>
+<item>
+<title><code>somestr</code></title>
+<p>Meaningless string</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page
index b0eafb0..4da0acf 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page
@@ -35,10 +35,12 @@ def emit_sig_with_foreign_struct(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page
index 86c6b93..a90da8d 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page
@@ -35,10 +35,12 @@ def emit_sig_with_int64(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page
index ccd5ad8..2f02db8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page
@@ -35,10 +35,12 @@ def emit_sig_with_obj(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page
index e2f9876..fede0a6 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page
@@ -35,10 +35,12 @@ def emit_sig_with_uint64(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page
index 8cb577f..33a7507 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page
@@ -35,10 +35,12 @@ def forced_method(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>A <link xref="Regress.TestObj"/></p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>A <link xref="Regress.TestObj"/></p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page
index 165c467..6f0dab4 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page
@@ -35,12 +35,16 @@ def instance_method(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page
index e57bcb6..34b7497 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page
@@ -39,12 +39,16 @@ def instance_method_callback(self, callback):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>callback :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>callback</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page
index 24c015c..f654e7e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page
@@ -35,10 +35,12 @@ def null_out(obj):
-<dl>
-<dt><p>obj :</p></dt>
-<dd><p>A <link xref="Regress.TestObj"/></p></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+<p>A <link xref="Regress.TestObj"/></p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page
index b468173..52013d5 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page
@@ -39,12 +39,16 @@ def set_bare(self, bare):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>bare :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>bare</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page
index 21f9418..609e8b3 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page
@@ -63,26 +63,44 @@ def skip_inout_param(self, a, out_b, c, inout_d, out_sum, num1, num2):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>A <link xref="Regress.TestObj"/>.</p></dd>
-<dt><p>a :</p></dt>
-<dd><p>Parameter.</p></dd>
-<dt><p>out_b :</p></dt>
-<dd><p>Return value.</p></dd>
-<dt><p>c :</p></dt>
-<dd><p>Other parameter.</p></dd>
-<dt><p>inout_d :</p></dt>
-<dd><p>Will be incremented.</p></dd>
-<dt><p>out_sum :</p></dt>
-<dd><p>Return value.</p></dd>
-<dt><p>num1 :</p></dt>
-<dd><p>Number.</p></dd>
-<dt><p>num2 :</p></dt>
-<dd><p>Number.</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p><code>True</code> if the call succeeds, <code>False</code> if @error is set.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>A <link xref="Regress.TestObj"/>.</p>
+</item>
+<item>
+<title><code>a</code></title>
+<p>Parameter.</p>
+</item>
+<item>
+<title><code>out_b</code></title>
+<p>Return value.</p>
+</item>
+<item>
+<title><code>c</code></title>
+<p>Other parameter.</p>
+</item>
+<item>
+<title><code>inout_d</code></title>
+<p>Will be incremented.</p>
+</item>
+<item>
+<title><code>out_sum</code></title>
+<p>Return value.</p>
+</item>
+<item>
+<title><code>num1</code></title>
+<p>Number.</p>
+</item>
+<item>
+<title><code>num2</code></title>
+<p>Number.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page
index b8eab28..b956db9 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page
@@ -63,26 +63,44 @@ def skip_out_param(self, a, out_b, c, inout_d, out_sum, num1, num2):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>A <link xref="Regress.TestObj"/>.</p></dd>
-<dt><p>a :</p></dt>
-<dd><p>Parameter.</p></dd>
-<dt><p>out_b :</p></dt>
-<dd><p>Return value.</p></dd>
-<dt><p>c :</p></dt>
-<dd><p>Other parameter.</p></dd>
-<dt><p>inout_d :</p></dt>
-<dd><p>Will be incremented.</p></dd>
-<dt><p>out_sum :</p></dt>
-<dd><p>Return value.</p></dd>
-<dt><p>num1 :</p></dt>
-<dd><p>Number.</p></dd>
-<dt><p>num2 :</p></dt>
-<dd><p>Number.</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p><code>True</code> if the call succeeds, <code>False</code> if @error is set.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>A <link xref="Regress.TestObj"/>.</p>
+</item>
+<item>
+<title><code>a</code></title>
+<p>Parameter.</p>
+</item>
+<item>
+<title><code>out_b</code></title>
+<p>Return value.</p>
+</item>
+<item>
+<title><code>c</code></title>
+<p>Other parameter.</p>
+</item>
+<item>
+<title><code>inout_d</code></title>
+<p>Will be incremented.</p>
+</item>
+<item>
+<title><code>out_sum</code></title>
+<p>Return value.</p>
+</item>
+<item>
+<title><code>num1</code></title>
+<p>Number.</p>
+</item>
+<item>
+<title><code>num2</code></title>
+<p>Number.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page
index 57f9167..9104649 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page
@@ -63,26 +63,44 @@ def skip_param(self, a, out_b, c, inout_d, out_sum, num1, num2):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>A <link xref="Regress.TestObj"/>.</p></dd>
-<dt><p>a :</p></dt>
-<dd><p>Parameter.</p></dd>
-<dt><p>out_b :</p></dt>
-<dd><p>Return value.</p></dd>
-<dt><p>c :</p></dt>
-<dd><p>Other parameter.</p></dd>
-<dt><p>inout_d :</p></dt>
-<dd><p>Will be incremented.</p></dd>
-<dt><p>out_sum :</p></dt>
-<dd><p>Return value.</p></dd>
-<dt><p>num1 :</p></dt>
-<dd><p>Number.</p></dd>
-<dt><p>num2 :</p></dt>
-<dd><p>Number.</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p><code>True</code> if the call succeeds, <code>False</code> if @error is set.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>A <link xref="Regress.TestObj"/>.</p>
+</item>
+<item>
+<title><code>a</code></title>
+<p>Parameter.</p>
+</item>
+<item>
+<title><code>out_b</code></title>
+<p>Return value.</p>
+</item>
+<item>
+<title><code>c</code></title>
+<p>Other parameter.</p>
+</item>
+<item>
+<title><code>inout_d</code></title>
+<p>Will be incremented.</p>
+</item>
+<item>
+<title><code>out_sum</code></title>
+<p>Return value.</p>
+</item>
+<item>
+<title><code>num1</code></title>
+<p>Number.</p>
+</item>
+<item>
+<title><code>num2</code></title>
+<p>Number.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page
index 92d58eb..4b1e9bb 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page
@@ -63,26 +63,44 @@ def skip_return_val(self, a, out_b, c, inout_d, out_sum, num1, num2):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="Regress.TestObj"/></p></dd>
-<dt><p>a :</p></dt>
-<dd><p>Parameter.</p></dd>
-<dt><p>out_b :</p></dt>
-<dd><p>A return value.</p></dd>
-<dt><p>c :</p></dt>
-<dd><p>Other parameter.</p></dd>
-<dt><p>inout_d :</p></dt>
-<dd><p>Will be incremented.</p></dd>
-<dt><p>out_sum :</p></dt>
-<dd><p>Return value.</p></dd>
-<dt><p>num1 :</p></dt>
-<dd><p>Number.</p></dd>
-<dt><p>num2 :</p></dt>
-<dd><p>Number.</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p><code>True</code> if the call succeeds, <code>False</code> if @error is set.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="Regress.TestObj"/></p>
+</item>
+<item>
+<title><code>a</code></title>
+<p>Parameter.</p>
+</item>
+<item>
+<title><code>out_b</code></title>
+<p>A return value.</p>
+</item>
+<item>
+<title><code>c</code></title>
+<p>Other parameter.</p>
+</item>
+<item>
+<title><code>inout_d</code></title>
+<p>Will be incremented.</p>
+</item>
+<item>
+<title><code>out_sum</code></title>
+<p>Return value.</p>
+</item>
+<item>
+<title><code>num1</code></title>
+<p>Number.</p>
+</item>
+<item>
+<title><code>num2</code></title>
+<p>Number.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page
index 5feb315..dd5ca45 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page
@@ -40,14 +40,20 @@ raise an error.</p>
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="Regress.TestObj"/></p></dd>
-<dt><p>a :</p></dt>
-<dd><p>Parameter.</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p><code>True</code> if the call succeeds, <code>False</code> if @error is set.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="Regress.TestObj"/></p>
+</item>
+<item>
+<title><code>a</code></title>
+<p>Parameter.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page
index 1294c2a..df4963e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page
@@ -35,12 +35,16 @@ def static_method(x):
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page
index 3d7d264..08e4441 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page
@@ -35,10 +35,12 @@ def static_method_callback(callback):
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page
index c4e4e77..c5d8c9f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page
@@ -59,22 +59,36 @@ def torture_signature_0(self, x, y, z, foo, q, m):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>A <link xref="Regress.TestObj"/></p></dd>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>y :</p></dt>
-<dd></dd>
-<dt><p>z :</p></dt>
-<dd></dd>
-<dt><p>foo :</p></dt>
-<dd></dd>
-<dt><p>q :</p></dt>
-<dd></dd>
-<dt><p>m :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>A <link xref="Regress.TestObj"/></p>
+</item>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>y</code></title>
+
+</item>
+<item>
+<title><code>z</code></title>
+
+</item>
+<item>
+<title><code>foo</code></title>
+
+</item>
+<item>
+<title><code>q</code></title>
+
+</item>
+<item>
+<title><code>m</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page
index 787a5c3..9954056 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page
@@ -59,24 +59,40 @@ def torture_signature_1(self, x, y, z, foo, q, m):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>A <link xref="Regress.TestObj"/></p></dd>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>y :</p></dt>
-<dd></dd>
-<dt><p>z :</p></dt>
-<dd></dd>
-<dt><p>foo :</p></dt>
-<dd></dd>
-<dt><p>q :</p></dt>
-<dd></dd>
-<dt><p>m :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>A <link xref="Regress.TestObj"/></p>
+</item>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>y</code></title>
+
+</item>
+<item>
+<title><code>z</code></title>
+
+</item>
+<item>
+<title><code>foo</code></title>
+
+</item>
+<item>
+<title><code>q</code></title>
+
+</item>
+<item>
+<title><code>m</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.page
index 1d907d2..d1887d5 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.page
@@ -19,14 +19,20 @@
-<dl>
-<dt><p>TestOtherError.CODE1 :</p></dt>
-<dd></dd>
-<dt><p>TestOtherError.CODE2 :</p></dt>
-<dd></dd>
-<dt><p>TestOtherError.CODE3 :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>TestOtherError.CODE1</code></title>
+
+</item>
+<item>
+<title><code>TestOtherError.CODE2</code></title>
+
+</item>
+<item>
+<title><code>TestOtherError.CODE3</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page
index b4444d2..6b7b9eb 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page
@@ -30,10 +30,12 @@ def const_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page
index 4976e9a..22a5525 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page
@@ -35,12 +35,16 @@ def copy(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page
index a9f6577..9616ddd 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page
@@ -39,14 +39,20 @@ def equals(self, other_a):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>other_a :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>other_a</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page
index c04d3cd..405778a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page
@@ -35,12 +35,16 @@ def copy(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page
index 2b609bb..cbc5b42 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page
@@ -39,12 +39,16 @@ def clone(self, a_out):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>the structure</p></dd>
-<dt><p>a_out :</p></dt>
-<dd><p>the cloned structure</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>the structure</p>
+</item>
+<item>
+<title><code>a_out</code></title>
+<p>the cloned structure</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page
index d18fcf7..d8bdaae 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page
@@ -39,12 +39,16 @@ def parse(a_out, string):
-<dl>
-<dt><p>a_out :</p></dt>
-<dd><p>the structure that is to be filled</p></dd>
-<dt><p>string :</p></dt>
-<dd><p>ignored</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>a_out</code></title>
+<p>the structure that is to be filled</p>
+</item>
+<item>
+<title><code>string</code></title>
+<p>ignored</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page
index 2a95a23..cebaa16 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page
@@ -39,12 +39,16 @@ def clone(self, b_out):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>the structure</p></dd>
-<dt><p>b_out :</p></dt>
-<dd><p>the cloned structure</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>the structure</p>
+</item>
+<item>
+<title><code>b_out</code></title>
+<p>the cloned structure</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page
index ffd3fae..0db4962 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page
@@ -35,10 +35,12 @@ def frob(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page
index bc854f4..417ba33 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page
@@ -35,12 +35,16 @@ def instance_method(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page
index fa4dcc1..bb2ad60 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page
@@ -35,10 +35,12 @@ def unset_bare(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page
index c0bffe8..4b9de5a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page
@@ -35,12 +35,16 @@ def get_testbool(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page
index ae04363..2234664 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page
@@ -39,12 +39,16 @@ def set_testbool(self, v):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>v :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>v</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page
index 3c04ae7..1fecc3a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page
@@ -35,12 +35,16 @@ def static_method(x):
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page
index f0476b8..377dcbd 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page
@@ -35,10 +35,12 @@ def aliased_caller_alloc(boxed):
-<dl>
-<dt><p>boxed :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>boxed</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page
index f48f724..023e993 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page
@@ -39,14 +39,20 @@ def annotation_attribute_func(object, data):
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>A <link xref="Regress.AnnotationObject"/>.</p></dd>
-<dt><p>data :</p></dt>
-<dd><p>Some data.</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>The return value.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>A <link xref="Regress.AnnotationObject"/>.</p>
+</item>
+<item>
+<title><code>data</code></title>
+<p>Some data.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page
index 439bd57..d98c2b8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page
@@ -44,14 +44,20 @@ detection, and fixing it via regress_annotations.</p>
-<dl>
-<dt><p>callback :</p></dt>
-<dd><p>Destroy notification</p></dd>
-<dt><p>destroy :</p></dt>
-<dd></dd>
-<dt><p>data :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+<p>Destroy notification</p>
+</item>
+<item>
+<title><code>destroy</code></title>
+
+</item>
+<item>
+<title><code>data</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page
index 339ad90..73e3555 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page
@@ -30,10 +30,12 @@ def annotation_get_source_file():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>Source file</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page
index 0fc0f5c..09ee5b1 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page
@@ -39,12 +39,16 @@ def annotation_init(argc, argv):
-<dl>
-<dt><p>argc :</p></dt>
-<dd><p>The number of args.</p></dd>
-<dt><p>argv :</p></dt>
-<dd><p>The arguments.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>argc</code></title>
+<p>The number of args.</p>
+</item>
+<item>
+<title><code>argv</code></title>
+<p>The arguments.</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page
index d173a8f..eec7b20 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page
@@ -35,10 +35,12 @@ def annotation_invalid_regress_annotation(foo):
-<dl>
-<dt><p>foo :</p></dt>
-<dd><p>some text (e.g. example) or else</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>foo</code></title>
+<p>some text (e.g. example) or else</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page
index 774a018..12752bb 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page
@@ -35,10 +35,12 @@ def annotation_ptr_array(array):
-<dl>
-<dt><p>array :</p></dt>
-<dd><p>the array</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>array</code></title>
+<p>the array</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page
index 5902fd0..5b6e6bc 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page
@@ -35,12 +35,16 @@ def annotation_return_array(length):
-<dl>
-<dt><p>length :</p></dt>
-<dd><p>Number of return values</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>The return value</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>length</code></title>
+<p>Number of return values</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page
index 961a403..c1e8e63 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page
@@ -30,10 +30,12 @@ def annotation_return_filename():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>An annotated filename</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page
index 67ab741..504ef28 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page
@@ -35,10 +35,12 @@ def annotation_set_source_file(fname):
-<dl>
-<dt><p>fname :</p></dt>
-<dd><p>Source file</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>fname</code></title>
+<p>Source file</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page
index 4f71806..0307bd2 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page
@@ -30,8 +30,8 @@ def annotation_space_after_comment_bug631690():
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page
index a1f859a..e42b140 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page
@@ -39,12 +39,16 @@ def annotation_string_array_length(n_properties, properties):
-<dl>
-<dt><p>n_properties :</p></dt>
-<dd></dd>
-<dt><p>properties :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>n_properties</code></title>
+
+</item>
+<item>
+<title><code>properties</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page
index 7aff509..8cafc09 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page
@@ -30,10 +30,12 @@ def annotation_string_zero_terminated():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>The return value</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page
index d7401ed..2c396ac 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page
@@ -35,10 +35,12 @@ def annotation_string_zero_terminated_out(out):
-<dl>
-<dt><p>out :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>out</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page
index 6021039..402a6ff 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page
@@ -30,10 +30,12 @@ def annotation_test_parsing_bug630862():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>An object, note the colon:in here</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page
index 321cd92..956465c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page
@@ -30,10 +30,12 @@ def annotation_transfer_floating():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>A floating object</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page
index 046fa11..a387a59 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page
@@ -31,8 +31,8 @@ def annotation_versioned():
<p>Since 0.6</p>
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page
index dcaa814..3640155 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page
@@ -30,10 +30,12 @@ def atest_error_quark():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page
index ef1f614..d9e9994 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page
@@ -43,14 +43,20 @@ def foo_async_ready_callback(cancellable, callback, user_data):
-<dl>
-<dt><p>cancellable :</p></dt>
-<dd></dd>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>user_data :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>cancellable</code></title>
+
+</item>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>user_data</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page
index dad0e22..1f758a6 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page
@@ -43,14 +43,20 @@ def foo_destroy_notify_callback(callback, data, destroy):
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>data :</p></dt>
-<dd></dd>
-<dt><p>destroy :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>data</code></title>
+
+</item>
+<item>
+<title><code>destroy</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page
index f7b916e..4ee838b 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page
@@ -30,10 +30,12 @@ def foo_init():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page
index ce521ac..77a94c4 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page
@@ -47,16 +47,24 @@ def foo_method_external_references(object, e, f, s):
-<dl>
-<dt><p>object :</p></dt>
-<dd></dd>
-<dt><p>e :</p></dt>
-<dd></dd>
-<dt><p>f :</p></dt>
-<dd></dd>
-<dt><p>s :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+
+</item>
+<item>
+<title><code>e</code></title>
+
+</item>
+<item>
+<title><code>f</code></title>
+
+</item>
+<item>
+<title><code>s</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page
index d70d337..0f58aaa 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page
@@ -31,10 +31,12 @@ a "Can't find matching type for constructor" warning.</p>
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page
index c1c4652..2680f70 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page
@@ -30,10 +30,12 @@ def foo_test_array():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page
index 61b2a56..6be54b8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page
@@ -35,10 +35,12 @@ def foo_test_const_char_param(param):
-<dl>
-<dt><p>param :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>param</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page
index d3079e2..4eb0d3a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page
@@ -30,10 +30,12 @@ def foo_test_const_char_retval():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page
index 9c757d4..31532fc 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page
@@ -35,10 +35,12 @@ def foo_test_const_struct_param(param):
-<dl>
-<dt><p>param :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>param</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page
index 870cca0..140bbbb 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page
@@ -30,10 +30,12 @@ def foo_test_const_struct_retval():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page
index f5c7798..1f9d3cc 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page
@@ -35,10 +35,12 @@ def foo_test_string_array(array):
-<dl>
-<dt><p>array :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>array</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page
index 4d46cef..bf4b9a7 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page
@@ -35,10 +35,12 @@ def foo_test_string_array_with_g(array):
-<dl>
-<dt><p>array :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>array</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page
index 8d79516..3c57204 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page
@@ -35,10 +35,12 @@ def foo_test_unsigned_qualifier(unsigned_param):
-<dl>
-<dt><p>unsigned_param :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>unsigned_param</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page
index 97672a0..d869c4e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page
@@ -35,10 +35,12 @@ def foo_test_unsigned_type(unsigned_param):
-<dl>
-<dt><p>unsigned_param :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>unsigned_param</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page
index 681f45b..0c0d372 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page
@@ -35,10 +35,12 @@ def func_obj_null_in(obj):
-<dl>
-<dt><p>obj :</p></dt>
-<dd><p>A <link xref="Regress.TestObj"/></p></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+<p>A <link xref="Regress.TestObj"/></p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page
index 816a722..bc3fffe 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page
@@ -35,10 +35,12 @@ def global_get_flags_out(v):
-<dl>
-<dt><p>v :</p></dt>
-<dd><p>A flags value</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>v</code></title>
+<p>A flags value</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page
index ed40522..8010d9b 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page
@@ -40,12 +40,16 @@ libgnome-keyring.</p>
-<dl>
-<dt><p>foo :</p></dt>
-<dd><p>some int</p></dd>
-<dt><p>attributes :</p></dt>
-<dd><p>list of attributes</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>foo</code></title>
+<p>some int</p>
+</item>
+<item>
+<title><code>attributes</code></title>
+<p>list of attributes</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page
index 63ef956..230882f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page
@@ -35,10 +35,12 @@ def introspectable_via_alias(data):
-<dl>
-<dt><p>data :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>data</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page
index aa72520..3eda9cd 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page
@@ -35,10 +35,12 @@ def set_abort_on_error(abort_on_error):
-<dl>
-<dt><p>abort_on_error :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>abort_on_error</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page
index 9a170d7..cf5c11a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page
@@ -35,12 +35,16 @@ def test_array_callback(callback):
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page
index a5cb397..2fe68c9 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page
@@ -35,10 +35,12 @@ def test_array_fixed_out_objects(objs):
-<dl>
-<dt><p>objs :</p></dt>
-<dd><p>An array of <link xref="Regress.TestObj"/></p></dd>
-</dl>
+<terms>
+<item>
+<title><code>objs</code></title>
+<p>An array of <link xref="Regress.TestObj"/></p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page
index de526c4..ed44e36 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page
@@ -35,12 +35,16 @@ def test_array_fixed_size_int_in(ints):
-<dl>
-<dt><p>ints :</p></dt>
-<dd><p>a list of 5 integers</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>the sum of the items in <code>ints</code></p></dd>
-</dl>
+<terms>
+<item>
+<title><code>ints</code></title>
+<p>a list of 5 integers</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page
index 9d7ec74..30cebc4 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page
@@ -35,10 +35,12 @@ def test_array_fixed_size_int_out(ints):
-<dl>
-<dt><p>ints :</p></dt>
-<dd><p>a list of 5 integers ranging from 0 to 4</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>ints</code></title>
+<p>a list of 5 integers ranging from 0 to 4</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page
index bc33d6d..d38e4f9 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page
@@ -30,10 +30,12 @@ def test_array_fixed_size_int_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>a list of 5 integers ranging from 0 to 4</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page
index 98f1e19..db9e904 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page
@@ -39,14 +39,20 @@ def test_array_gint16_in(n_ints, ints):
-<dl>
-<dt><p>n_ints :</p></dt>
-<dd></dd>
-<dt><p>ints :</p></dt>
-<dd><p>List of ints</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>n_ints</code></title>
+
+</item>
+<item>
+<title><code>ints</code></title>
+<p>List of ints</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page
index 74fb671..21e0902 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page
@@ -39,14 +39,20 @@ def test_array_gint32_in(n_ints, ints):
-<dl>
-<dt><p>n_ints :</p></dt>
-<dd></dd>
-<dt><p>ints :</p></dt>
-<dd><p>List of ints</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>n_ints</code></title>
+
+</item>
+<item>
+<title><code>ints</code></title>
+<p>List of ints</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page
index 0f2ad40..68b1158 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page
@@ -39,14 +39,20 @@ def test_array_gint64_in(n_ints, ints):
-<dl>
-<dt><p>n_ints :</p></dt>
-<dd></dd>
-<dt><p>ints :</p></dt>
-<dd><p>List of ints</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>n_ints</code></title>
+
+</item>
+<item>
+<title><code>ints</code></title>
+<p>List of ints</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page
index 4ad4fc7..4c96194 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page
@@ -39,14 +39,20 @@ def test_array_gint8_in(n_ints, ints):
-<dl>
-<dt><p>n_ints :</p></dt>
-<dd></dd>
-<dt><p>ints :</p></dt>
-<dd><p>List of ints</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>n_ints</code></title>
+
+</item>
+<item>
+<title><code>ints</code></title>
+<p>List of ints</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page
index bc9057b..42f7372 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page
@@ -39,14 +39,20 @@ def test_array_gtype_in(n_types, types):
-<dl>
-<dt><p>n_types :</p></dt>
-<dd></dd>
-<dt><p>types :</p></dt>
-<dd><p>List of types</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>string representation of provided types</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>n_types</code></title>
+
+</item>
+<item>
+<title><code>types</code></title>
+<p>List of types</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page
index 088ccfa..b0d3863 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page
@@ -35,12 +35,16 @@ def test_array_int_full_out(len):
-<dl>
-<dt><p>len :</p></dt>
-<dd><p>length of the returned array.</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>a new array of integers.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>len</code></title>
+<p>length of the returned array.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page
index 8bc291b..59a4be0 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page
@@ -39,14 +39,20 @@ def test_array_int_in(n_ints, ints):
-<dl>
-<dt><p>n_ints :</p></dt>
-<dd></dd>
-<dt><p>ints :</p></dt>
-<dd><p>List of ints</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>n_ints</code></title>
+
+</item>
+<item>
+<title><code>ints</code></title>
+<p>List of ints</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page
index 881cc86..48fc0ac 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page
@@ -39,12 +39,16 @@ def test_array_int_inout(n_ints, ints):
-<dl>
-<dt><p>n_ints :</p></dt>
-<dd><p>the length of <code>ints</code></p></dd>
-<dt><p>ints :</p></dt>
-<dd><p>a list of integers whose items will be increased by 1, except the first that will be dropped</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>n_ints</code></title>
+<p>the length of <code>ints</code></p>
+</item>
+<item>
+<title><code>ints</code></title>
+<p>a list of integers whose items will be increased by 1, except the first that will be dropped</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page
index 39542be..3c11393 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page
@@ -35,12 +35,16 @@ def test_array_int_none_out(len):
-<dl>
-<dt><p>len :</p></dt>
-<dd><p>length of the returned array.</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>a static array of integers.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>len</code></title>
+<p>length of the returned array.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page
index 1e8007f..a2f7ba9 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page
@@ -39,12 +39,16 @@ def test_array_int_null_in(arr, len):
-<dl>
-<dt><p>arr :</p></dt>
-<dd></dd>
-<dt><p>len :</p></dt>
-<dd><p>length</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>arr</code></title>
+
+</item>
+<item>
+<title><code>len</code></title>
+<p>length</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page
index 894a37e..dd2aa75 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page
@@ -39,12 +39,16 @@ def test_array_int_null_out(arr, len):
-<dl>
-<dt><p>arr :</p></dt>
-<dd></dd>
-<dt><p>len :</p></dt>
-<dd><p>length</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>arr</code></title>
+
+</item>
+<item>
+<title><code>len</code></title>
+<p>length</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page
index 3bfad94..15e62e1 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page
@@ -39,12 +39,16 @@ def test_array_int_out(n_ints, ints):
-<dl>
-<dt><p>n_ints :</p></dt>
-<dd><p>the length of <code>ints</code></p></dd>
-<dt><p>ints :</p></dt>
-<dd><p>a list of 5 integers, from 0 to 4 in consecutive order</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>n_ints</code></title>
+<p>the length of <code>ints</code></p>
+</item>
+<item>
+<title><code>ints</code></title>
+<p>a list of 5 integers, from 0 to 4 in consecutive order</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page
index 39a24a2..1486cc4 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page
@@ -35,10 +35,12 @@ def test_async_ready_callback(callback):
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page
index e7217be..8c19698 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page
@@ -35,12 +35,16 @@ def test_boolean(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page
index 0f7783a..7212f68 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page
@@ -35,12 +35,16 @@ def test_boolean_false(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page
index 65fec5e..13c90c2 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page
@@ -35,12 +35,16 @@ def test_boolean_true(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page
index dfebfd0..f927cf5 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page
@@ -30,10 +30,12 @@ def test_cairo_context_full_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page
index 922330d..d9cd230 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page
@@ -35,10 +35,12 @@ def test_cairo_context_none_in(context):
-<dl>
-<dt><p>context :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>context</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page
index 1b32629..ec8da6f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page
@@ -35,10 +35,12 @@ def test_cairo_surface_full_out(surface):
-<dl>
-<dt><p>surface :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>surface</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page
index 1cfa151..ac77695 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page
@@ -30,10 +30,12 @@ def test_cairo_surface_full_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page
index ad456c1..c2daf5f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page
@@ -35,10 +35,12 @@ def test_cairo_surface_none_in(surface):
-<dl>
-<dt><p>surface :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>surface</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page
index 4e5dd40..4eda436 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page
@@ -30,10 +30,12 @@ def test_cairo_surface_none_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page
index 5da4505..a5e52b5 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page
@@ -35,12 +35,16 @@ def test_callback(callback):
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page
index 8ffd966..471926a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page
@@ -39,12 +39,16 @@ def test_callback_async(callback, user_data):
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>user_data :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>user_data</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page
index fed6631..26a0c31 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page
@@ -44,16 +44,24 @@ is invoked.</p>
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>user_data :</p></dt>
-<dd></dd>
-<dt><p>notify :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>user_data</code></title>
+
+</item>
+<item>
+<title><code>notify</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page
index a343923..7df745a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page
@@ -40,14 +40,20 @@ condition in bindings which needs to be tested.</p>
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>notify :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>notify</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page
index 459bd47..a94e661 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page
@@ -30,10 +30,12 @@ def test_callback_thaw_async():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page
index 24c45e9..03158ab 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page
@@ -32,10 +32,12 @@ corresponding destroy notfications.</p>
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>Sum of the return values of the invoked callbacks.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page
index 2b03a8f..d4a9578 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page
@@ -40,14 +40,20 @@ call and can be released on return.</p>
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>user_data :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>user_data</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page
index a3290e5..cdbf8bb 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page
@@ -35,12 +35,16 @@ def test_closure(closure):
-<dl>
-<dt><p>closure :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>closure</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page
index c766153..b19753a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page
@@ -39,14 +39,20 @@ def test_closure_one_arg(closure, arg):
-<dl>
-<dt><p>closure :</p></dt>
-<dd></dd>
-<dt><p>arg :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>closure</code></title>
+
+</item>
+<item>
+<title><code>arg</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page
index 2151555..6be06f3 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page
@@ -39,14 +39,20 @@ def test_closure_variant(closure, arg):
-<dl>
-<dt><p>closure :</p></dt>
-<dd><p>GClosure which takes one GVariant and returns a GVariant</p></dd>
-<dt><p>arg :</p></dt>
-<dd><p>a GVariant passed as argument to <code>closure</code></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>the return value of <code>closure</code></p></dd>
-</dl>
+<terms>
+<item>
+<title><code>closure</code></title>
+<p>GClosure which takes one GVariant and returns a GVariant</p>
+</item>
+<item>
+<title><code>arg</code></title>
+<p>a GVariant passed as argument to <code>closure</code></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page
index 7e9400e..bcdb8ed 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page
@@ -30,10 +30,12 @@ def test_date_in_gvalue():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page
index dc3c910..89a1b50 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page
@@ -30,10 +30,12 @@ def test_def_error_quark():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page
index 986f57a..efea2d6 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page
@@ -35,12 +35,16 @@ def test_double(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page
index ccf1af1..80eebb1 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page
@@ -30,10 +30,12 @@ def test_filename_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>list of strings</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page
index 5b5bdb8..50f8993 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page
@@ -35,12 +35,16 @@ def test_float(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page
index 132de1f..1d0ef3e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page
@@ -30,10 +30,12 @@ def test_garray_container_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page
index e7c1b0f..ef2bcfd 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page
@@ -30,10 +30,12 @@ def test_garray_full_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page
index 52ef85d..f4f9465 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page
@@ -35,10 +35,12 @@ def test_gerror_callback(callback):
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page
index 676e665..9a297db 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page
@@ -30,10 +30,12 @@ def test_ghash_container_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page
index 0cca64b..3040336 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page
@@ -30,10 +30,12 @@ def test_ghash_everything_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page
index 39c476b..7028c8b 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page
@@ -35,10 +35,12 @@ def test_ghash_gvalue_in(hash):
-<dl>
-<dt><p>hash :</p></dt>
-<dd><p>the hash table returned by <link xref="Regress.test_ghash_gvalue_return"/>.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>hash</code></title>
+<p>the hash table returned by <link xref="Regress.test_ghash_gvalue_return"/>.</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page
index 9a94e39..b24a3bd 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page
@@ -30,10 +30,12 @@ def test_ghash_gvalue_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page
index 6d0a2a7..2039ab4 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page
@@ -30,10 +30,12 @@ def test_ghash_nested_everything_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page
index a6837da..adac865 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page
@@ -31,10 +31,12 @@ element-type annotation.</p>
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page
index 623aee6..264d31a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page
@@ -35,10 +35,12 @@ def test_ghash_nothing_in(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page
index 72e7c66..ac786a4 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page
@@ -35,10 +35,12 @@ def test_ghash_nothing_in2(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page
index 6443843..1e3851f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page
@@ -30,10 +30,12 @@ def test_ghash_nothing_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page
index 5748c38..66aa706 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page
@@ -30,10 +30,12 @@ def test_ghash_nothing_return2():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page
index 5eff48f..9b77e12 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page
@@ -35,10 +35,12 @@ def test_ghash_null_in(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page
index a1c9b5b..07d7e15 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page
@@ -35,10 +35,12 @@ def test_ghash_null_out(out):
-<dl>
-<dt><p>out :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>out</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page
index 0683dbe..7186740 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page
@@ -30,10 +30,12 @@ def test_ghash_null_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page
index 16ae13a..28be892 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page
@@ -30,10 +30,12 @@ def test_glist_container_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page
index 44f09fd..2d449a4 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page
@@ -30,10 +30,12 @@ def test_glist_everything_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page
index 1950b99..8f2d885 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page
@@ -35,10 +35,12 @@ def test_glist_nothing_in(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page
index 3a5d966..a930760 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page
@@ -35,10 +35,12 @@ def test_glist_nothing_in2(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page
index 1385402..1230c51 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page
@@ -30,10 +30,12 @@ def test_glist_nothing_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page
index 3a78443..4d120ea 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page
@@ -30,10 +30,12 @@ def test_glist_nothing_return2():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page
index 6f1ce10..619f941 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page
@@ -35,10 +35,12 @@ def test_glist_null_in(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page
index 1bc2c2d..9ed9114 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page
@@ -35,10 +35,12 @@ def test_glist_null_out(out_list):
-<dl>
-<dt><p>out_list :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>out_list</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page
index b328b0f..89574e2 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page
@@ -30,10 +30,12 @@ def test_gslist_container_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page
index 749adc2..d0eafc0 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page
@@ -30,10 +30,12 @@ def test_gslist_everything_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page
index 86e240e..ab61b07 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page
@@ -35,10 +35,12 @@ def test_gslist_nothing_in(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page
index 8edd87e..df5af0f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page
@@ -35,10 +35,12 @@ def test_gslist_nothing_in2(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page
index a6af8a2..7181380 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page
@@ -30,10 +30,12 @@ def test_gslist_nothing_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page
index 146643c..60a2816 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page
@@ -30,10 +30,12 @@ def test_gslist_nothing_return2():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page
index b3117c0..6bf4307 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page
@@ -35,10 +35,12 @@ def test_gslist_null_in(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page
index 3a0fa92..b9ce49e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page
@@ -35,10 +35,12 @@ def test_gslist_null_out(out_list):
-<dl>
-<dt><p>out_list :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>out_list</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page
index f98195a..798d219 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page
@@ -35,12 +35,16 @@ def test_gtype(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page
index edd0a83..c6fabf6 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page
@@ -30,10 +30,12 @@ def test_gvariant_as():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>New variant</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page
index 2e9eeeb..a99d402 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page
@@ -30,10 +30,12 @@ def test_gvariant_asv():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>New variant</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page
index c47377b..891ae8b 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page
@@ -30,10 +30,12 @@ def test_gvariant_i():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>New variant</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page
index dfd123f..cfabe8b 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page
@@ -30,10 +30,12 @@ def test_gvariant_s():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>New variant</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page
index 1f5d309..325e136 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page
@@ -30,10 +30,12 @@ def test_gvariant_v():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>New variant</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page
index 6429848..94b02d4 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page
@@ -39,12 +39,16 @@ def test_hash_table_callback(data, callback):
-<dl>
-<dt><p>data :</p></dt>
-<dd><p>GHashTable that gets passed to callback</p></dd>
-<dt><p>callback :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>data</code></title>
+<p>GHashTable that gets passed to callback</p>
+</item>
+<item>
+<title><code>callback</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page
index 22c435f..538f8ce 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page
@@ -35,12 +35,16 @@ def test_int(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page
index 6f0945a..b749c85 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page
@@ -35,12 +35,16 @@ def test_int16(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page
index 8070a64..29fd74a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page
@@ -35,12 +35,16 @@ def test_int32(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page
index c9456ad..52413c0 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page
@@ -35,12 +35,16 @@ def test_int64(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page
index 73c1749..50bfa63 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page
@@ -35,12 +35,16 @@ def test_int8(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page
index 9b5b728..bf06621 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page
@@ -39,12 +39,16 @@ def test_int_out_utf8(length, in):
-<dl>
-<dt><p>length :</p></dt>
-<dd></dd>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>length</code></title>
+
+</item>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page
index 2d6d569..cb034dd 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page
@@ -35,12 +35,16 @@ def test_int_value_arg(v):
-<dl>
-<dt><p>v :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>v</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page
index 3b56821..eb13e4f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page
@@ -35,12 +35,16 @@ def test_long(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page
index ed15aba..530f763 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page
@@ -35,12 +35,16 @@ def test_multi_callback(callback):
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page
index b781e79..df6a9f8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page
@@ -43,14 +43,20 @@ def test_multi_double_args(in, one, two):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>one :</p></dt>
-<dd></dd>
-<dt><p>two :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>one</code></title>
+
+</item>
+<item>
+<title><code>two</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page
index 6cfdbcd..9b8ae8c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page
@@ -30,8 +30,8 @@ def test_multiline_doc_comments():
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page
index 571dd0a..6ee8fc2 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page
@@ -60,10 +60,12 @@ rgb(20%, 30%, 0%)</literallayout></entry>
-<dl>
-<dt><p>a :</p></dt>
-<dd><p>An integer</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>a</code></title>
+<p>An integer</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page
index ce50e43..05b872e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page
@@ -35,10 +35,12 @@ def test_null_gerror_callback(callback):
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page
index 93cd72f..b2d2390 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page
@@ -35,10 +35,12 @@ def test_owned_gerror_callback(callback):
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page
index 77ddd58..40364ef 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page
@@ -35,12 +35,16 @@ def test_short(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page
index 241d0a8..fc87b44 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page
@@ -35,10 +35,12 @@ def test_simple_callback(callback):
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page
index 3496e37..2443209 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page
@@ -35,12 +35,16 @@ def test_size(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page
index 6e61bc8..bcfe773 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page
@@ -35,12 +35,16 @@ def test_ssize(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page
index dee44c0..fca58f0 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page
@@ -35,12 +35,16 @@ def test_strv_in(arr):
-<dl>
-<dt><p>arr :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>arr</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page
index ab03bda..1db56a9 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page
@@ -30,10 +30,12 @@ def test_strv_in_gvalue():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page
index e87d979..ca99305 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page
@@ -30,10 +30,12 @@ def test_strv_out():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page
index 8d5a73a..ad925c4 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page
@@ -30,10 +30,12 @@ def test_strv_out_c():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page
index feaf8c7..04b8152 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page
@@ -30,10 +30,12 @@ def test_strv_out_container():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page
index 7cea6b4..40882d5 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page
@@ -35,10 +35,12 @@ def test_strv_outarg(retp):
-<dl>
-<dt><p>retp :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>retp</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page
index 3e7637e..a93fd09 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page
@@ -35,12 +35,16 @@ def test_timet(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page
index 542dc1f..2be46bb 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page
@@ -55,20 +55,32 @@ def test_torture_signature_0(x, y, z, foo, q, m):
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>y :</p></dt>
-<dd></dd>
-<dt><p>z :</p></dt>
-<dd></dd>
-<dt><p>foo :</p></dt>
-<dd></dd>
-<dt><p>q :</p></dt>
-<dd></dd>
-<dt><p>m :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>y</code></title>
+
+</item>
+<item>
+<title><code>z</code></title>
+
+</item>
+<item>
+<title><code>foo</code></title>
+
+</item>
+<item>
+<title><code>q</code></title>
+
+</item>
+<item>
+<title><code>m</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page
index 333d386..15cfb50 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page
@@ -55,22 +55,36 @@ def test_torture_signature_1(x, y, z, foo, q, m):
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>y :</p></dt>
-<dd></dd>
-<dt><p>z :</p></dt>
-<dd></dd>
-<dt><p>foo :</p></dt>
-<dd></dd>
-<dt><p>q :</p></dt>
-<dd></dd>
-<dt><p>m :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>y</code></title>
+
+</item>
+<item>
+<title><code>z</code></title>
+
+</item>
+<item>
+<title><code>foo</code></title>
+
+</item>
+<item>
+<title><code>q</code></title>
+
+</item>
+<item>
+<title><code>m</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page
index 449793b..7ee3809 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page
@@ -67,26 +67,44 @@ def test_torture_signature_2(x, callback, user_data, notify, y, z, foo, q, m):
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>user_data :</p></dt>
-<dd></dd>
-<dt><p>notify :</p></dt>
-<dd></dd>
-<dt><p>y :</p></dt>
-<dd></dd>
-<dt><p>z :</p></dt>
-<dd></dd>
-<dt><p>foo :</p></dt>
-<dd></dd>
-<dt><p>q :</p></dt>
-<dd></dd>
-<dt><p>m :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>user_data</code></title>
+
+</item>
+<item>
+<title><code>notify</code></title>
+
+</item>
+<item>
+<title><code>y</code></title>
+
+</item>
+<item>
+<title><code>z</code></title>
+
+</item>
+<item>
+<title><code>foo</code></title>
+
+</item>
+<item>
+<title><code>q</code></title>
+
+</item>
+<item>
+<title><code>m</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page
index 84f702a..7735c13 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page
@@ -35,12 +35,16 @@ def test_uint(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page
index b8e444a..490c11f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page
@@ -35,12 +35,16 @@ def test_uint16(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page
index 37da548..87a20cc 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page
@@ -35,12 +35,16 @@ def test_uint32(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page
index b11cfbb..f697e69 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page
@@ -35,12 +35,16 @@ def test_uint64(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page
index 58f7817..ae918cb 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page
@@ -35,12 +35,16 @@ def test_uint8(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page
index f94fff0..349576c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page
@@ -35,12 +35,16 @@ def test_ulong(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page
index 363a5e3..2b705e8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page
@@ -35,12 +35,16 @@ def test_unichar(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page
index 4e77143..31b9166 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page
@@ -35,12 +35,16 @@ def test_unsigned_enum_param(e):
-<dl>
-<dt><p>e :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>e</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page
index 2b0f082..68f0aa8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page
@@ -35,12 +35,16 @@ def test_ushort(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page
index 36e992b..888e6ea 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page
@@ -35,10 +35,12 @@ def test_utf8_const_in(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page
index 9aef1f1..b704c60 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page
@@ -30,10 +30,12 @@ def test_utf8_const_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>UTF-8 string</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page
index c7c32cc..1839f09 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page
@@ -35,10 +35,12 @@ def test_utf8_inout(inout):
-<dl>
-<dt><p>inout :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>inout</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page
index fd5de6a..0304998 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page
@@ -30,10 +30,12 @@ def test_utf8_nonconst_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>UTF-8 string</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page
index c6aff04..1fda680 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page
@@ -35,10 +35,12 @@ def test_utf8_null_in(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page
index 65b277a..f8d7b6f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page
@@ -35,10 +35,12 @@ def test_utf8_null_out(char_out):
-<dl>
-<dt><p>char_out :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>char_out</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page
index 7f73b8d..acc0a40 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page
@@ -35,10 +35,12 @@ def test_utf8_out(out):
-<dl>
-<dt><p>out :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>out</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page
index ed43d54..e7efb7b 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page
@@ -35,12 +35,16 @@ def test_utf8_out_nonconst_return(out):
-<dl>
-<dt><p>out :</p></dt>
-<dd><p>a copy of "second"</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>a copy of "first"</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>out</code></title>
+<p>a copy of "second"</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page
index 763053f..bde41d8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page
@@ -39,12 +39,16 @@ def test_utf8_out_out(out0, out1):
-<dl>
-<dt><p>out0 :</p></dt>
-<dd><p>a copy of "first"</p></dd>
-<dt><p>out1 :</p></dt>
-<dd><p>a copy of "second"</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>out0</code></title>
+<p>a copy of "first"</p>
+</item>
+<item>
+<title><code>out1</code></title>
+<p>a copy of "second"</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page
index 54aaaa6..6470bab 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page
@@ -35,12 +35,16 @@ def test_value_return(i):
-<dl>
-<dt><p>i :</p></dt>
-<dd><p>an int</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>the int wrapped in a GValue.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>i</code></title>
+<p>an int</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page
index 4a5cfd8..cac760a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page
@@ -31,8 +31,8 @@ def test_versioning():
<p>Since 1.32.1</p>
-<dl>
-</dl>
+<terms>
+</terms>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
