Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix doc #509

Merged
merged 2 commits into from
Apr 18, 2020
Merged

Fix doc #509

merged 2 commits into from
Apr 18, 2020

Conversation

alephzero
Copy link
Contributor

@vermeeren
Copy link
Collaborator

We should also document the allowed values for :sections: option. The definitions of sections[] is found at https://github.com/michaeljones/breathe/blob/master/breathe/renderer/sphinxrenderer.py#L546, but this doesn't contain all of the possible values.

For example, at least briefdescription and innerclass are missing from that list. Seems that several nodes are actually manually in visit_compounddef() at https://github.com/michaeljones/breathe/blob/master/breathe/renderer/sphinxrenderer.py#L585.

Do you think that the list is complete is we combine the sections[] list and all addnode('...', ...) names as found invisit_compounddef()? A short description per possible entry should really help out for those trying to use :sections: without knowing the internals.

Probably this needs to be added to the top of documentation/source/file.rst, just like documentation/source/struct.rst has a proper top section with unique options, how to use them and a table of contents.

I could also make these changes if you prefer, but I do need confirmation of the list of possible options before anything can be done by either of us.

@vermeeren vermeeren linked an issue Apr 18, 2020 that may be closed by this pull request
@alephzero
Copy link
Contributor Author

alephzero commented Apr 18, 2020

Here's a list of sections I found through experimentation:

  • briefdescription
  • dcop-func
  • define
  • derivedcompoundref
  • detaileddescription
  • enum
  • event
  • friend
  • func
  • innerclass
  • innernamespace
  • package-attrib
  • package-func
  • package-static-attrib
  • package-static-func
  • package-type
  • private-attrib
  • private-func
  • private-slot
  • private-static-attrib
  • private-static-func
  • private-type
  • property
  • protected-attrib
  • protected-func
  • protected-slot
  • protected-static-attrib
  • protected-static-func
  • protected-type
  • prototype
  • public-attrib
  • public-func
  • public-slot
  • public-static-attrib
  • public-static-func
  • public-type
  • related
  • signal
  • typedef
  • user-defined
  • var

@alephzero
Copy link
Contributor Author

I haven't been able to find a definitive list anywhere online, or in any doxygen code. This is the closest I've found:
https://github.com/doxygen/doxygen/blob/master/src/xmlgen.cpp#L68

@vermeeren
Copy link
Collaborator

vermeeren commented Apr 18, 2020

Breathe has the following:

briefdescription
dcop-func
define
derivedcompoundref
detaileddescription
enum
event
friend
func
innerclass
innernamespace
package-attrib
package-func
package-static-attrib
package-static-func
package-type
private-attrib
private-func
private-slot
private-static-attrib
private-static-func
private-type
property
protected-attrib
protected-func
protected-slot
protected-static-attrib
protected-static-func
protected-type
prototype
public-attrib
public-func
public-slot
public-static-attrib
public-static-func
public-type
related
signal
typedef
user-defined
var

Doxygen has:

dcop-func
define
dictionary
enum
event
friend
func
interfaces
package-attrib
package-func
package-static-attrib
package-static-func
package-type
private-attrib
private-func
private-slot
private-static-attrib
private-static-func
private-type
property
protected-attrib
protected-func
protected-slot
protected-static-attrib
protected-static-func
protected-type
prototype
public-attrib
public-func
public-slot
public-static-attrib
public-static-func
public-type
related
sequence
services
signal
typedef
var

The output of git diff --no-index doxygen breathe is:

diff --git a/doxygen b/breathe
index 09211c5..ec4e5d3 100644
--- a/doxygen
+++ b/breathe
@@ -1,11 +1,14 @@
+briefdescription
 dcop-func
 define
-dictionary
+derivedcompoundref
+detaileddescription
 enum
 event
 friend
 func
-interfaces
+innerclass
+innernamespace
 package-attrib
 package-func
 package-static-attrib
@@ -32,8 +35,7 @@ public-static-attrib
 public-static-func
 public-type
 related
-sequence
-services
 signal
 typedef
+user-defined
 var

I suppose the things currently in Doxygen but not handled by Breathe are effectively ignored, so it probably makes sense to only document the things actually handled by Breathe. Thanks for the link to Doxygen. I will fixup the doc on this PR in a bit.

@vermeeren vermeeren self-requested a review April 18, 2020 19:47
@vermeeren vermeeren self-assigned this Apr 18, 2020
@vermeeren vermeeren added documentation Generated html, changelog, inline comments enhancement Improvements, additions (also cosmetics) labels Apr 18, 2020
@vermeeren
Copy link
Collaborator

@alephzero can you check if this looks good to you?

@vermeeren
Copy link
Collaborator

vermeeren commented Apr 18, 2020

@alephzero explicit approve is in the Files changed tab, top-right green button Review changes. You can then approve even without any further comment. Do the other changes look good too, besides the conversation above?

@alephzero
Copy link
Contributor Author

All changes look good to me! Ship it :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Generated html, changelog, inline comments enhancement Improvements, additions (also cosmetics)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

doxygenfile: only @file description
2 participants