From 1fde44cbf63462b18aad202009610540fa3012da Mon Sep 17 00:00:00 2001 From: Jonathan Waltman Date: Thu, 7 Jul 2011 01:39:53 -0500 Subject: [PATCH] Follow the behavior described by :confval:`primary_domain` to display domain object names and use this as the category in Texinfo desc_signatures. --- sphinx/writers/texinfo.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sphinx/writers/texinfo.py b/sphinx/writers/texinfo.py index 526eccbaf..5799e0234 100644 --- a/sphinx/writers/texinfo.py +++ b/sphinx/writers/texinfo.py @@ -1271,13 +1271,15 @@ class TexinfoTranslator(nodes.NodeVisitor): if objtype != 'describe': for id in node.get('ids'): self.add_anchor(id, node) - # use the localized name for the category + # use the full name of the objtype for the category try: domain = self.builder.env.domains[node.parent['domain']] - lname = domain.object_types[objtype].lname + primary = self.builder.config.primary_domain + name = domain.get_type_name(domain.object_types[objtype], + primary == domain.name) except KeyError: - lname = objtype - category = self.escape_arg(string.capwords(lname)) + name = objtype + category = self.escape_arg(string.capwords(name)) self.body.append('\n%s {%s} ' % (self.at_deffnx, category)) self.at_deffnx = '@deffnx' def depart_desc_signature(self, node):