IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0.x' into 3.x

Browse Source
This commit is contained in:
Takeshi KOMIYA
2020-04-13 23:36:10 +09:00
parent a4edbc1104 86ef8521df
commit b2a601a33d
9 changed files with 265 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
doc/usage/configuration.rst
View File

@@ -2479,6 +2479,30 @@ Options for the XML builder
match any sequence of characters *including* slashes.
.. _c-config:
Options for the C domain
------------------------
.. confval:: c_id_attributes
A list of strings that the parser additionally should accept as attributes.
This can for example be used when attributes have been ``#define`` d for
portability.
.. versionadded:: 3.0
.. confval:: c_paren_attributes
A list of strings that the parser additionally should accept as attributes
with one argument. That is, if ``my_align_as`` is in the list, then
``my_align_as(X)`` is parsed as an attribute for all strings ``X`` that have
balanced braces (``()``, ``[]``, and ``{}``). This can for example be used
when attributes have been ``#define`` d for portability.
.. versionadded:: 3.0
.. _cpp-config:
Options for the C++ domain

5
doc/usage/restructuredtext/domains.rst
View File

@@ -771,6 +771,11 @@ The ``c:namespace-pop`` directive undoes the most recent
.. c:namespace-push:: A.B
Configuration Variables
~~~~~~~~~~~~~~~~~~~~~~~
See :ref:`c-config`.
.. _cpp-domain: