summaryrefslogtreecommitdiff
path: root/tests/scanner/Regress-1.0-Gjs-expected
diff options
context:
space:
mode:
Diffstat (limited to 'tests/scanner/Regress-1.0-Gjs-expected')
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.ATestError.page22
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page40
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page28
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page28
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page28
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.extra_annos.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooASingle.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooAddressType.page22
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page22
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumFullname.page22
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumNoType.page28
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.page22
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.page22
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface-do_regress_foo.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.do_regress_foo.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.static_method.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-read_fn.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page40
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-virtual_method.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.a_global_method.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_default.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.static_meth.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStackLayer.page58
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page22
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy_event.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_bar.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_baz.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.page22
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page22
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page22
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page22
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestDEFError.page22
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page28
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumNoGEnum.page22
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumUnsigned.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.page22
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page22
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-allow_none_vfunc.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page22
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page22
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-matrix.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page28
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page28
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page28
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page34
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page28
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page28
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page28
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page34
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page28
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page22
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.null_out.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page40
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page40
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page40
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page40
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method_callback.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page22
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page28
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.page22
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.const_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.parse.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.instance_method.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.static_method.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.aliased_caller_alloc.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_attribute_func.page22
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_get_source_file.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_init.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_invalid_regress_annotation.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_array.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_filename.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_set_source_file.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_space_after_comment_bug631690.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_array_length.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated_out.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_versioned.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.atest_error_quark.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_async_ready_callback.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_destroy_notify_callback.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_init.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_method_external_references.page28
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_not_a_constructor_new.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_array.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_param.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_retval.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_param.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_retval.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array_with_g.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_qualifier.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_type.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.func_obj_null_in.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.global_get_flags_out.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.has_parameter_named_attrs.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.introspectable_via_alias.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.set_abort_on_error.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_callback.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_out_objects.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_in.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_out.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint16_in.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint32_in.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint64_in.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint8_in.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gtype_in.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_full_out.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_in.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_inout.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_none_out.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_in.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_out.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_out.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_async_ready_callback.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_false.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_true.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_full_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_none_in.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_in.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_async.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify_no_user_data.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_async.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_notifications.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_user_data.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page22
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page22
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_def_error_quark.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_double.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_float.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_container_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_full_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gerror_callback.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_container_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_everything_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return2.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in2.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return2.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_in.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_out.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_out.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_out.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gtype.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_hash_table_callback.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int16.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int32.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int64.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int8.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_out_utf8.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_long.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_callback.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_double_args.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multiline_doc_comments.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_nested_parameter.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_null_gerror_callback.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_owned_gerror_callback.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_short.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_simple_callback.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_size.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ssize.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_c.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_container.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_outarg.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_timet.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_0.page22
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_1.page28
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_2.page28
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint16.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint32.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint64.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint8.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ulong.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unichar.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unsigned_enum_param.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ushort.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_in.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_inout.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_nonconst_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_in.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_out.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_nonconst_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_out.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page16
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_versioning.page4
324 files changed, 2632 insertions, 1640 deletions
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 dff139fd..119860d2 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 73f9cde8..713f2fa9 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 178ce23c..68a6b8f5 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 b29e2a6a..3464bf78 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 d8e9f6a8..53124914 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 c54f0c3e..d94ad834 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 a11fd19c..d964b9c7 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 df95d103..bcc26d8f 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 5f930137..0dc19bcf 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 24e2a802..a6870013 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 02c501d9..ed909ac8 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 4b2d104f..6098722c 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 87249cf9..61915f41 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 ba06aea4..58bf5ff4 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 965297e8..5d5c79d7 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 dbff0ad3..ff2aef1d 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 7245a0b6..e339e088 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 2b9dde17..9a3db5d0 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 a59a446f..1abc4010 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 f9c8caef..b5f2d65f 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 d2064f22..9b615360 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 a79e4d06..58cab9ad 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 d421cbbb..e21a9c62 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 93015f3c..c771d769 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 94f5173d..606e2b1b 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 227eacc4..d4bf6b19 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 6940eca1..d1e428d4 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 6912c993..b1e4129a 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 68185d5e..402b1622 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 62dcf839..8c54d3b8 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 91f12525..59321295 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 1d61e1de..36a1815c 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 3fa6debd..c9904095 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 5b0e46a9..8a77746f 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 34f1ed7c..b59e7634 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 2dafde03..e3f52935 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 f46e101a..975d5123 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 66972b02..9476671b 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 447c9913..270c8093 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 edad8cdf..8d86995c 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 2a25e79a..5903a764 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 bbcd055b..0ba67e71 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 a46070da..443f25ea 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 2313192d..5957904b 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 37510f5c..d052d4f5 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 0877e7c8..5577eebe 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 9a3af8c0..97aff9ae 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 3f9478af..7753c4ad 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 0148788f..b39c41f1 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 96cbe499..f992fca8 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 ff890981..e79716c7 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 9c7b8ee5..72ee34e5 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 96617abc..d41290f6 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 0608ce16..aaf6bfa3 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 ddc25bcc..5241c4f3 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 6929812e..8c700359 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 078402a5..baf2386c 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 9b037def..71276178 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 733048bf..63027a5e 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 175cfd1b..54b6f10c 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 ecc5f33c..4de3f713 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 cf8374c8..5586b96b 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 ed357619..0cc61551 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 295cb68b..1245175f 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 a348b662..526a4fb7 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 b9c4f204..3bec5bb4 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 cbe37447..6f861c78 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 fede11b4..980d4ef3 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 1fcc81b6..18646a84 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 83ca6a12..bd7a445b 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 f73adeb5..a444574e 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 caa25fe1..8df59ff4 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 f3dbed54..04a55514 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 59e09b4a..b3e4bd7e 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 e31cf574..7db9c6b5 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 e0751860..00fc1255 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 a2a244f6..b9991b85 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 fea8d58e..6a044d79 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 59c0701f..d7fe0888 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 4a4f394e..82819c87 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 72921e74..9377348b 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 72c866f3..915a79bf 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 e8e3cf91..7cdfd4f4 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 1f516125..03623419 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 6fb2b3b0..c79a4d24 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 dcf0105f..687c90d0 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 2475baed..25dd557a 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 9b9e0cac..f30d4724 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 1b96fd20..c6affa24 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 8b7bf9a5..62465644 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 0568050d..781cd994 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 b6f0eb88..6a92ba9a 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 3de1bbf6..9009dcda 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 625c8703..a0cd98cc 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 3069d8e3..327cacc5 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 57a21163..c635d0e0 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 889f5d1f..9ca5d060 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 c2c23f29..d887b198 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 efeb0c3b..2e0932b6 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 d9b958aa..e879a7de 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 11c87305..9c1af712 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 05917260..176b164d 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 0c87efc9..17020c62 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 0fb936cc..e2444c69 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 32565ee3..f8d71322 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 f16bc29d..874928d9 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 b9938f6a..085c6987 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 ff33157e..1a521f97 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 4133baa8..7b81f903 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 d966ae2c..afc914fa 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 8ffd0af2..d79c6f78 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 154181c4..ec5e4e1e 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 beebb08a..28d4cf96 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 cad30933..ef623d9f 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 c56e7933..470fe4d6 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 9f4461dd..812891cc 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 870aefa5..80e75635 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 ee0ed943..ec06fff0 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 6180999b..604283d6 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 b22362d6..e41bb1dd 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 1d35e44b..aa1e5f3d 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 da6e8b22..00967896 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 4f54523f..029b8847 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 1bdcd9c3..49974155 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 06b4bf52..491828af 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 abb6c63c..f70bfbe9 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 aa903206..636d2167 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 bd5ceaf3..9fc14087 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 a9df4838..23910861 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 1af95263..49cdd8e4 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 c12559a9..ae4dd140 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 f194391a..fed5b0a3 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 3a963cad..b4da15e4 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 200835be..14cc9da4 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 7ee261d9..3a447770 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 8b5a6a76..e6e4535b 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 e8aa83c8..7323da2b 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 875164b9..84807b3b 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 53cbdd2e..4744d5fc 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 a2b3868d..d4281868 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 01f97d61..fa7d17be 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 205b1a31..20946935 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 1d907d24..d1887d5e 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 ab33fce3..81a0049d 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 c4559527..e7d1c811 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 de4ade80..91197290 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 695bed63..0db8a8da 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 8e50284e..f023cfe7 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 3577ad78..22038bad 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 ce72cfd1..692f8997 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 a72301a2..b3cdcd78 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 d537cb6e..e55a1c37 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 86fcd533..91236d2a 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 391f291d..e297b4dc 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 e6bf3d37..f38ab9cd 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 11f813db..9bcbcc11 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 67356504..764aa43e 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 632758a6..685c3110 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 fb7c16d0..5c57a1b4 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 1547d02c..981fc543 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 5c9042cc..a975754e 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 cb782e6a..a227f73d 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 753a719d..ae10b7ea 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 1d532dfb..a32b80fd 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 8c1805fd..dd6de2a4 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 842bd600..a400582a 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 6790d9ff..c590aecf 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 151e84f6..46014527 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 de11fc5a..e8891e36 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 f1bbd9c4..bdb02611 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 00af2f16..05578955 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 cf823b72..dce9addd 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 8d954edd..b9f8a5c0 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 e2466681..33bd9f40 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 f5aafc26..6693eb11 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 e72ee9b1..26b35573 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 c3db813e..4a3e9114 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 ac1b97d2..83a83544 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 242c00de..81fae432 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 e7f1c4f0..0e5168ed 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 7efaffcf..38264daf 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 c77f18a5..24d4000a 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 c46680c2..3cb9d8e9 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 f42f0a27..e4784320 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 9a104a7e..b52e7d3c 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 7a3295d9..55213864 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 96239704..24dfaacb 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 872ed05f..b34cf4f5 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 8545e846..ebd9a0f6 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 25bfbd94..f62023ed 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 1b8cab1b..79a12aae 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 df39d486..741a3536 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 39013096..f147b84c 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 9d7f75de..f1388183 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 8d85040f..cfddc655 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 bf026dbb..d5d324c3 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 c560c5af..0eab51d3 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 9670d04e..1f570f33 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 e3519249..e10c883f 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 7773cf28..18179bf9 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 20a8fb15..b15076fa 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 121a81f9..f92ad910 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 82652a5f..98a57d55 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 0ed3479c..fbaae440 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 e7acd2b9..04889436 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 c7f8ddd6..d2b0ab8f 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 9339276a..c3b26b24 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 4f1fc06d..118056fd 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 1c47a95a..a841e04f 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 b37cb539..eadf5908 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 bdc8eabb..c50b6202 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 987667f7..ba2b3497 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 c6ccd906..c7cd25e8 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 9e505ac4..15f8a674 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 3d3aec15..2c35db30 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 a25d7048..0206b085 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 d51550e7..d78865d2 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 b0f4f9b2..9abd2d19 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 be96339d..c0d66757 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 be1ca3f1..eee51f17 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 e875ab1d..ef6d4cc3 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 cbfd688e..cec71274 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 a9db3a5a..57970867 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 f9db1242..b281ca74 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 3e0c93e3..18496d52 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 a009729e..6679446f 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 10d2088b..592d8e07 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 49c482ca..24e0e24a 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 c17015a1..5e824a94 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 23347814..ee8f0253 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 71d015b6..3df43b83 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 f0d84088..e54fd5ae 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 1bbead66..c6a75d7f 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 c93ebefd..46d62afc 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 3074d369..7be3ebd4 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 7922381c..e4c935f7 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 e255ede8..27952a27 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 996d9d1c..5dad9446 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 9b9bfbe4..35b90f87 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 f34a4220..4d7bc884 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 46f1663d..e15eb13b 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 863d3a6e..0b0d347e 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 629039dc..2556237f 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 881fc772..8a9fe982 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 a7503357..c2701df3 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 ec6d7128..896e346d 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 d54a6594..438f5abe 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 a6d376e1..2dc3aa8d 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 5e18e086..4ee392e8 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 fe99a700..492f6536 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 f984cc68..52dd2654 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 e4c1583d..09d222d9 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 60c23f56..dac341f7 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 d35f72b9..0e6cc956 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 4989dd86..a58d9261 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 9b13e1b3..3e144833 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 84037606..b22fd185 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 9ae9a958..ec649721 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 069f5b0b..b31d98ff 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 8426bbff..6add7cec 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 5b82c2e4..b13cc9a0 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 7dd60e37..19f70911 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 c65a3490..53936460 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 3c09413a..e011db60 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 5eb3aa3f..0e718211 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 80f6f7e2..dc11a421 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 3119bf03..5e1c5646 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 3cc8d428..e6987019 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 a25e08e9..5c25956d 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 9adb3fad..d2a438d4 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 8558a6bd..0d301a9e 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 2671f72e..fa477da4 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 e54e6221..7af092f2 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 61cf1e7c..b98b64d1 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 3cecce56..49874551 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 67790100..9f215d76 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 5007da2f..31b8b674 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 16a4a0b2..f2f39024 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 e8ecc278..c254ed41 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 16851bbd..a30895ea 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 c4f86698..ba53b828 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 3f1aac0d..971e6580 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 a7fc7317..866be0d2 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 fb7aa3f4..9eeddeaa 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 56fc3228..519ce43a 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 5a699956..70d56ced 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 21e97a2f..75e42218 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 087a2482..3ee62390 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%)&lt;/literallayout&gt;&lt;/entry&gt;
-<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 632be614..710af513 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 5266607c..e966fe86 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 ade0d1ec..1c53e163 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 1c44d090..d6e596c9 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 eead974e..fe3f5b42 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 53c93808..77bc9cd9 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 ab2afcab..880f489d 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 8a025d32..04444570 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 b9273dd9..b475f63b 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 b7854212..69239d57 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 dcf19318..17b55812 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 a465b61d..63bde333 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 f75c9ad9..be54bccd 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 269f16ac..af5810f1 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 7951588f..915fdfe7 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 4504cf42..ac694000 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 0c514f34..deb1e900 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 dc0601f8..357dcc5b 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 282967df..445dbffb 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 ec408e66..f77993c6 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 77ac3334..4f099b7b 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 4eb5f81d..5ad91424 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 23a78300..2a10fb32 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 0bbc1735..9da74e6f 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 3a7b2607..9dd5ddc0 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 9bfb3fd9..7b1f74d9 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 d8c76555..514a5654 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 df85d8a8..cf5ce4ac 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 d4a00847..3b0e3c85 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 15c583bd..ba9f2509 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 af8db3af..36e00220 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 9692dc6b..0889a573 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 4e2cf0ed..2feadbff 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 43e35d1c..39037cb1 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 542af0ba..a554bf19 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 d3cfc1d4..bfef4942 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>