Add support for doxygen with interfaces

xsphinx/breathe/breathe/__init__.py

@@ -266,6 +266,7 @@ class DoxygenDirectiveFactory(object):
             "doxygenfunction" : DoxygenFunctionDirective,
             "doxygenstruct" : DoxygenStructDirective,
             "doxygenclass" : DoxygenClassDirective,
+            "doxygeninterface" : DoxygenClassDirective,
             "doxygenenum" : DoxygenEnumDirective,
             "doxygentypedef" : DoxygenTypedefDirective,
             "doxygendefine" : DoxygenDefineDirective,
@@ -387,6 +388,11 @@ def setup(app):
             directive_factory.create_class_directive_container(),
             )
 
+    app.add_directive(
+            "doxygeninterface",
+            directive_factory.create_class_directive_container(),
+            )
+
     app.add_config_value("breathe_projects", {}, True)
     app.add_config_value("breathe_default_project", "", True)
 

xsphinx/breathe/breathe/renderer/rst/doxygen/xmosbreathe.py

@@ -131,7 +131,13 @@ def render_content(data_object, tab):
                                "?",
                                args)
 
-            s = ".. c:function:: " + data_object.definition + args + "\n" + add_indent(s)
+            args = re.sub("class",
+                          "interface",
+                          args)
+
+            fname = data_object.definition
+            fname = re.sub("[^ ]*::","",fname)
+            s = ".. c:function:: " + fname + args + "\n" + add_indent(s)
             print "Rendering Doxygen function " + data_object.definition
         elif data_object.kind == "typedef":
             s = ".. c:type:: " + data_object.name + "\n" + add_indent(s)
@@ -159,6 +165,7 @@ def render_content(data_object, tab):
 
 
     s = s.replace("___port___port___","port:")
+    s = re.sub(r'__attribute__(\w*)','[[\\1]]', s)
 
     if s.find('__multret__') != -1:
         mult_ret_subs = [ ('{','obrace'),
@@ -178,7 +185,14 @@ def render_content(data_object, tab):
 
 def render_compoundtype(type_data_object, data_object, state, content, content_offset):
 
-    s = ".. c:type:: %s\n" % (type_data_object.name)
+    is_interface = (type_data_object.get_kind() == 'class')
+
+    if is_interface:
+        name = "interface " + type_data_object.name
+    else:
+        name = type_data_object.name
+
+    s = ".. c:type:: %s\n" % name
 
     print "Rendering Doxygen struct " + type_data_object.name
 
@@ -193,12 +207,12 @@ def render_compoundtype(type_data_object, data_object, state, content, content_o
         if sectiondef.kind == "public-attrib":
             s += add_indent("**Structure Members:**\n\n")
             s += add_indent(render_content(sectiondef,''))
-
+        if sectiondef.kind == "private-func":
+            s += add_indent(render_content(sectiondef,''))
 
     content.data = s.split("\n")
 
-#    print str.join("\n",content.data)
-
+    #print str.join("\n",content.data)
 
     term = nodes.Element()
     state.nested_parse(content, content_offset,term)

xsphinx/writers/xlatex.py

@@ -343,6 +343,7 @@ def __init__(self, document, builder):
         self.in_options = False
         self.in_cmd = False
         self.in_list_item = False
+        self.desc_level = 0
 
     def astext(self):
         text = HEADER0 % self.elements
@@ -929,7 +930,13 @@ def visit_desc(self, node):
             node['long_params'] = long_params
             for x in node.traverse(addnodes.desc_parameter):
                 x['long_params'] = long_params
-            if long_params:
+                #print node.parent.parent
+                #print node.parent
+            first_in_section = \
+               isinstance(node.parent.parent, nodes.section) and \
+               node.parent.parent.children[1] == node.parent
+            #print node.parent.parent.children[1]
+            if long_params and not first_in_section:
                 self.body.append('\n\\vspace{-1.5\\baselineskip}')
             self.body.append('\n\n\\texttt{')
             if long_params:
@@ -958,11 +965,11 @@ def depart_desc_signature(self, node):
         self.in_sig = False
 
     def visit_desc_addname(self, node):
-        self.body.append(r'\optemph{')
+        #self.body.append(r'\optemph{')
         self.literal_whitespace += 1
 
     def depart_desc_addname(self, node):
-        self.body.append('}')
+        #self.body.append('}')
         self.literal_whitespace -= 1
 
     def visit_desc_type(self, node):
@@ -1020,15 +1027,19 @@ def depart_desc_annotation(self, node):
 
     def visit_desc_content(self, node):
        if node.parent['desctype'] in toplevel_desc:
+           self.desc_level += 1
            if node.parent['long_params']:
                self.body.append('\n\\end{tabbing}')
                if len(node.children) == 0:
                    self.body.append('\\vspace{-3mm}\n')
 
-           if self.fullwidth:
+           if self.desc_level > 1:
+               indent ='0.5\\blockindentlen'
+           elif self.fullwidth:
                indent = '\\blockindentlen'
            else:
                indent = '\\blockindentlen'
+
            self.body.append('}\n\n')
 
            self.body.append('\\vspace{-2mm}\n')
@@ -1049,6 +1060,7 @@ def visit_desc_content(self, node):
 
     def depart_desc_content(self, node):
        if node.parent['desctype'] in toplevel_desc:
+           self.desc_level -= 1
            if len(node.children) != 0:
                self.body.append('\n\\end{indentation*}\n')
                #self.body.append('\\vspace{u3mm}\n')

xsphinx/xc_prefilter.py

@@ -1,7 +1,9 @@
 import sys, re
 
 # A list of regex substitutions to make
-substs =  [ ('port:(\d+)','___port___port___\\1')]
+substs =  [ ('port:(\d+)','___port___port___\\1') ,
+            ('interface', 'class'),
+            ('\[\[(.*)\]\]', '__attribute__\\1') ]
 
 
 mult_ret_subs = [ ('\{','obrace'),