diff options
author | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-01-31 19:19:28 -0500 |
---|---|---|
committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-02-01 19:47:41 -0500 |
commit | e8fff809b66f3afa86d6e0c7c09cfa3e7698ebe3 (patch) | |
tree | 41fbc39c7c63ae4590edc3e0b5115253104cf847 | |
parent | b4ce0aec3b74adbe996ea0489d9dd5dfe91ba11d (diff) | |
download | gobject-introspection-e8fff809b66f3afa86d6e0c7c09cfa3e7698ebe3.tar.gz |
mallardwriter: Don't set content for links
These are set automatically.
7 files changed, 11 insertions, 13 deletions
diff --git a/giscanner/mallardwriter.py b/giscanner/mallardwriter.py index 6526a4a8..e136570a 100644 --- a/giscanner/mallardwriter.py +++ b/giscanner/mallardwriter.py @@ -319,9 +319,7 @@ class MallardFormatter(object): # Enum/BitField members are linked to the main enum page. return self.format_xref(node.parent) + '.' + node.name else: - return xmlwriter.build_xml_tag('link', - [('xref', make_page_id(node))], - self.format_page_name(node)) + return xmlwriter.build_xml_tag('link', [('xref', make_page_id(node))]) def format_property_flags(self, property_, construct_only=False): flags = [] diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page index 23fe6e5f..344b36f3 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page @@ -52,8 +52,8 @@ gint first_arg, </code></synopsis> - <p>This is an example of how to document a method.</p><p>You should call this on a <link xref="DocExamples.Obj">DocExamples.Obj</link> that was -created with <link xref="DocExamples.Obj.new">doc_examples_obj_new</link>.</p><p>This should be a %FALSEALARM.</p> + <p>This is an example of how to document a method.</p><p>You should call this on a <link xref="DocExamples.Obj"/> that was +created with <link xref="DocExamples.Obj.new"/>.</p><p>This should be a %FALSEALARM.</p> <p>Since 0.99</p> @@ -61,7 +61,7 @@ created with <link xref="DocExamples.Obj.new">doc_examples_obj_new</link>.</p><p <dl> <dt><p>first_arg :</p></dt> -<dd><p>A <link xref="DocExamples.Obj">DocExamples.Obj</link>.</p></dd> +<dd><p>A <link xref="DocExamples.Obj"/>.</p></dd> <dt><p>second_arg :</p></dt> <dd><p>second argument</p></dd> <dt><p>boolean_arg :</p></dt> diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page index d3aeb465..85132de6 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page @@ -14,7 +14,7 @@ - <p>This is an example of how to document a class</p><p>This class has a signal: <link xref="DocExamples.Obj-signal-example">DocExamples.Obj::signal-example</link>.</p><p>And also has a property: <link xref="DocExamples.Obj-property-example">DocExamples.Obj:property-example</link>.</p> + <p>This is an example of how to document a class</p><p>This class has a signal: <link xref="DocExamples.Obj-signal-example"/>.</p><p>And also has a property: <link xref="DocExamples.Obj-property-example"/>.</p> <p>Since 0.99</p> diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page index 57e2f72e..0ae97913 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page @@ -52,7 +52,7 @@ will expose this in different ways (e.g. Python keeps the <dt><p>destroy_notify :</p></dt> <dd><p>how to get rid of <code>user_data</code></p></dd> <dt><p>Returns :</p></dt> -<dd><p><link xref="DocExamples.Enum">DocExamples.Enum</link>.foo sometimes, <link xref="DocExamples.Enum">DocExamples.Enum</link>.bar other times.</p></dd> +<dd><p><link xref="DocExamples.Enum"/>.foo sometimes, <link xref="DocExamples.Enum"/>.bar other times.</p></dd> </dl> diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page index 54a57c40..245b2586 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page @@ -50,8 +50,8 @@ def method(self, first_arg, second_arg, boolean_arg, pointer_arg, string): </code></synopsis> - <p>This is an example of how to document a method.</p><p>You should call this on a <link xref="DocExamples.Obj">DocExamples.Obj</link> that was -created with <link xref="DocExamples.Obj.new">Obj.new</link>.</p><p>This should be a %FALSEALARM.</p> + <p>This is an example of how to document a method.</p><p>You should call this on a <link xref="DocExamples.Obj"/> that was +created with <link xref="DocExamples.Obj.new"/>.</p><p>This should be a %FALSEALARM.</p> <p>Since 0.99</p> @@ -59,7 +59,7 @@ created with <link xref="DocExamples.Obj.new">Obj.new</link>.</p><p>This should <dl> <dt><p>first_arg :</p></dt> -<dd><p>A <link xref="DocExamples.Obj">DocExamples.Obj</link>.</p></dd> +<dd><p>A <link xref="DocExamples.Obj"/>.</p></dd> <dt><p>second_arg :</p></dt> <dd><p>second argument</p></dd> <dt><p>boolean_arg :</p></dt> diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.page index ad02f506..14eedd4a 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.page @@ -18,7 +18,7 @@ from gi.repository import DocExamples obj = DocExamples.Obj(<link xref='DocExamples.Obj-property-example'>property_example</link>=value) </code></synopsis> - <p>This is an example of how to document a class</p><p>This class has a signal: <link xref="DocExamples.Obj-signal-example">DocExamples.Obj::signal-example</link>.</p><p>And also has a property: <link xref="DocExamples.Obj-property-example">DocExamples.Obj:property-example</link>.</p> + <p>This is an example of how to document a class</p><p>This class has a signal: <link xref="DocExamples.Obj-signal-example"/>.</p><p>And also has a property: <link xref="DocExamples.Obj-property-example"/>.</p> <p>Since 0.99</p> diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page index 80ee488a..9b805712 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page @@ -53,7 +53,7 @@ will expose this in different ways (e.g. Python keeps the <dt><p>destroy_notify :</p></dt> <dd><p>how to get rid of <code>user_data</code></p></dd> <dt><p>Returns :</p></dt> -<dd><p><link xref="DocExamples.Enum">DocExamples.Enum</link>.foo sometimes, <link xref="DocExamples.Enum">DocExamples.Enum</link>.bar other times.</p></dd> +<dd><p><link xref="DocExamples.Enum"/>.foo sometimes, <link xref="DocExamples.Enum"/>.bar other times.</p></dd> </dl> |