From 1a07c2e08960af3b784a5922633405076a9a2864 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 29 Dec 2018 22:26:17 +0100 Subject: [PATCH] doxygen: adapt to renamed Doxygen option. --- doc/doxygen.rst | 15 +++++++-------- .../Doxyfile | 2 +- .../Doxyfile | 2 +- doxygen/test/search/Doxyfile | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/doc/doxygen.rst b/doc/doxygen.rst index a371090b..1974e9a5 100644 --- a/doc/doxygen.rst +++ b/doc/doxygen.rst @@ -69,9 +69,9 @@ switch. It may work reasonably well with older versions, but I can't guarantee that. Upgrade to the latest version to have the best experience. - Some features depend on patches that are not yet integrated in Doxygen, in - that case the documentation mentions which revision to use or which patch - you need to apply. + Some features depend on newer versions or patches that are not yet + integrated in Doxygen, in that case the documentation mentions which + revision to use or which patch you need to apply. The base is contained in a single Python script and related style/template files, for advanced features such as math rendering it'll make use of internals @@ -633,17 +633,16 @@ Table of contents for pages is generated only if they specify Doxygen by default doesn't render namespace members for file documentation in its XML output. To match the behavior of stock HTML output, enable the -:ini:`XML_NAMESPACE_MEMBERS_IN_FILE_SCOPE` option: +:ini:`XML_NS_MEMB_FILE_SCOPE` option: .. code:: ini - # Requires a patch to Doxygen 1.8.14, see below - XML_NAMESPACE_MEMBERS_IN_FILE_SCOPE = YES + XML_NS_MEMB_FILE_SCOPE = YES .. note-warning:: Doxygen patches - In order to use the :ini:`XML_NAMESPACE_MEMBERS_IN_FILE_SCOPE` option, you - need Doxygen with :gh:`doxygen/doxygen#653` applied. + In order to use the :ini:`XML_NS_MEMB_FILE_SCOPE` option, you need Doxygen + 1.8.15 (released December 2018). `Code highlighting`_ -------------------- diff --git a/doxygen/test/compound_namespace_members_in_file_scope/Doxyfile b/doxygen/test/compound_namespace_members_in_file_scope/Doxyfile index cd500a22..8fc580a2 100644 --- a/doxygen/test/compound_namespace_members_in_file_scope/Doxyfile +++ b/doxygen/test/compound_namespace_members_in_file_scope/Doxyfile @@ -4,7 +4,7 @@ GENERATE_HTML = NO GENERATE_LATEX = NO GENERATE_XML = YES XML_PROGRAMLISTING = NO -XML_NAMESPACE_MEMBERS_IN_FILE_SCOPE = YES +XML_NS_MEMB_FILE_SCOPE = YES ##! M_PAGE_FINE_PRINT = ##! M_THEME_COLOR = diff --git a/doxygen/test/compound_namespace_members_in_file_scope_define_base_url/Doxyfile b/doxygen/test/compound_namespace_members_in_file_scope_define_base_url/Doxyfile index cd500a22..8fc580a2 100644 --- a/doxygen/test/compound_namespace_members_in_file_scope_define_base_url/Doxyfile +++ b/doxygen/test/compound_namespace_members_in_file_scope_define_base_url/Doxyfile @@ -4,7 +4,7 @@ GENERATE_HTML = NO GENERATE_LATEX = NO GENERATE_XML = YES XML_PROGRAMLISTING = NO -XML_NAMESPACE_MEMBERS_IN_FILE_SCOPE = YES +XML_NS_MEMB_FILE_SCOPE = YES ##! M_PAGE_FINE_PRINT = ##! M_THEME_COLOR = diff --git a/doxygen/test/search/Doxyfile b/doxygen/test/search/Doxyfile index a87b24c9..eaef5f79 100644 --- a/doxygen/test/search/Doxyfile +++ b/doxygen/test/search/Doxyfile @@ -6,7 +6,7 @@ GENERATE_XML = YES XML_PROGRAMLISTING = NO # Verify that this doesn't cause duplicated items -XML_NAMESPACE_MEMBERS_IN_FILE_SCOPE = YES +XML_NS_MEMB_FILE_SCOPE = YES EXAMPLE_PATH = . ALIASES = \ -- 2.30.2