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

Add table examples to documentation #638

Merged
merged 1 commit into from
Feb 15, 2021

Conversation

utzig
Copy link
Contributor

@utzig utzig commented Feb 14, 2021

This adds the examples found on Doxygen's website for describing tables in Markdown and Doxygen syntax.

PS: The examples that include rowspan/colspan were left commented out in the rST because they are currently breaking latex generation (although "make html" works).

@utzig utzig mentioned this pull request Feb 14, 2021
@vermeeren vermeeren self-requested a review February 14, 2021 20:19
@vermeeren vermeeren self-assigned this Feb 14, 2021
@vermeeren vermeeren added the documentation Generated html, changelog, inline comments label Feb 14, 2021
Copy link
Collaborator

@vermeeren vermeeren left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@utzig Built it locally and looks pretty good already!

I read in the commit message it the fancier tables break LaTeX renderer, I'm thinking we can use the conditional Sphinx .. only:: html directive for all the ones currently commented out. Thoughts on this?

https://www.sphinx-doc.org/en/master/usage/restructuredtext/directives.html#including-content-based-on-tags

This adds the examples found on Doxygen's website for describing tables
in Markdown and Doxygen syntax.

PS: The examples that include rowspan/colspan were left commented out in
the rST because they are currently breaking latex generation (although
"make html" works).

Signed-off-by: Fabio Utzig <utzig@apache.org>
@utzig
Copy link
Contributor Author

utzig commented Feb 14, 2021

@utzig Built it locally and looks pretty good already!

I read in the commit message it the fancier tables break LaTeX renderer, I'm thinking we can use the conditional Sphinx .. only:: html directive for all the ones currently commented out. Thoughts on this?

https://www.sphinx-doc.org/en/master/usage/restructuredtext/directives.html#including-content-based-on-tags

Neat trick, never seen that one before. Of course the tables will still render a bit "funny" until rowspan/colspan support is added by the builds work, so it's better to leave them rendered there! :-)

Copy link
Collaborator

@vermeeren vermeeren left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@utzig Yeah this is nice, even the complex table is rendered pretty well, so all the information is there even is the layout is a bit funky at times. Thanks!

michaeljones pushed a commit that referenced this pull request Feb 15, 2021
@michaeljones michaeljones merged commit 6f405d3 into breathe-doc:master Feb 15, 2021
@utzig utzig deleted the table-examples branch February 15, 2021 00:25
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants