[gobject-introspection] doctool: Rename page_style to page_kind
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection] doctool: Rename page_style to page_kind
- Date: Fri, 15 Feb 2013 11:46:01 +0000 (UTC)
commit 9f1b87bb764635eeba7e83bf795844aa49e27d81
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Fri Feb 15 06:05:31 2013 -0500
doctool: Rename page_style to page_kind
giscanner/doctemplates/C/function.tmpl | 4 ++--
giscanner/doctemplates/Gjs/function.tmpl | 4 ++--
giscanner/doctemplates/Python/function.tmpl | 4 ++--
giscanner/doctemplates/base.tmpl | 2 +-
giscanner/docwriter.py | 6 +++---
5 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/giscanner/doctemplates/C/function.tmpl b/giscanner/doctemplates/C/function.tmpl
index c2d393b..c788225 100644
--- a/giscanner/doctemplates/C/function.tmpl
+++ b/giscanner/doctemplates/C/function.tmpl
@@ -1,9 +1,9 @@
<%inherit file="/base.tmpl"/>
<%block name="info">
% if node.parent is not None:
- <link type="guide" xref="${namespace.name}.${node.parent.name}" group="${page_style}"/>
+ <link type="guide" xref="${namespace.name}.${node.parent.name}" group="${page_kind}"/>
% else:
- <link type="guide" xref="index" group="${page_style}"/>
+ <link type="guide" xref="index" group="${page_kind}"/>
% endif
<api:function>
<api:returns>
diff --git a/giscanner/doctemplates/Gjs/function.tmpl b/giscanner/doctemplates/Gjs/function.tmpl
index 46c4627..6a43ddb 100644
--- a/giscanner/doctemplates/Gjs/function.tmpl
+++ b/giscanner/doctemplates/Gjs/function.tmpl
@@ -1,9 +1,9 @@
<%inherit file="/base.tmpl"/>
<%block name="info">
% if node.parent is not None:
- <link type="guide" xref="${namespace.name}.${node.parent.name}" group="${page_style}"/>
+ <link type="guide" xref="${namespace.name}.${node.parent.name}" group="${page_kind}"/>
% else:
- <link type="guide" xref="index" group="${page_style}"/>
+ <link type="guide" xref="index" group="${page_kind}"/>
% endif
<api:function>
<api:returns>
diff --git a/giscanner/doctemplates/Python/function.tmpl b/giscanner/doctemplates/Python/function.tmpl
index d1b57f4..e1fc5d9 100644
--- a/giscanner/doctemplates/Python/function.tmpl
+++ b/giscanner/doctemplates/Python/function.tmpl
@@ -1,9 +1,9 @@
<%inherit file="/base.tmpl"/>
<%block name="info">
% if node.parent is not None:
- <link type="guide" xref="${namespace.name}.${node.parent.name}" group="${page_style}"/>
+ <link type="guide" xref="${namespace.name}.${node.parent.name}" group="${page_kind}"/>
% else:
- <link type="guide" xref="index" group="${page_style}"/>
+ <link type="guide" xref="index" group="${page_kind}"/>
% endif
<api:function>
<api:returns>
diff --git a/giscanner/doctemplates/base.tmpl b/giscanner/doctemplates/base.tmpl
index 0fe8465..7fd0fd2 100644
--- a/giscanner/doctemplates/base.tmpl
+++ b/giscanner/doctemplates/base.tmpl
@@ -2,7 +2,7 @@
<?xml version="1.0"?>
<page id="${page_id}"
type="${self.attr.page_type}"
- style="${page_style}"
+ style="${page_kind}"
xmlns="http://projectmallard.org/1.0/"
xmlns:api="http://projectmallard.org/experimental/api/"
xmlns:ui="http://projectmallard.org/1.0/ui/">
diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py
index d5b1f90..1a14937 100644
--- a/giscanner/docwriter.py
+++ b/giscanner/docwriter.py
@@ -620,15 +620,15 @@ class DocWriter(object):
def _render_node(self, node, output):
namespace = self._transformer.namespace
- node_kind = get_node_kind(node)
- template_name = '%s/%s.tmpl' % (self._language, node_kind)
+ page_kind = get_node_kind(node)
+ template_name = '%s/%s.tmpl' % (self._language, page_kind)
page_id = make_page_id(node)
template = self._lookup.get_template(template_name)
result = template.render(namespace=namespace,
node=node,
page_id=page_id,
- page_style=node_kind,
+ page_kind=page_kind,
formatter=self._formatter)
output_file_name = os.path.join(os.path.abspath(output),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]