From: Vladimír Vondruš Date: Sun, 6 May 2018 12:54:34 +0000 (+0200) Subject: doxygen: bundle a matching favicon by default. X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=389e5ba81ef758200215254a2b2bfe46149a0845;p=blog.git doxygen: bundle a matching favicon by default. --- diff --git a/artwork/favicon.svg b/artwork/favicon.svg index f904a9c7..eab34a44 100644 --- a/artwork/favicon.svg +++ b/artwork/favicon.svg @@ -16,7 +16,7 @@ id="svg8" inkscape:version="0.92.2 5c3e80d, 2017-08-06" sodipodi:docname="favicon.svg" - inkscape:export-filename="/home/mosra/Code/magnum-website/m.css/doc/static/favicon.png" + inkscape:export-filename="/home/mosra/Code/magnum-website/m.css/doxygen/favicon-dark.png" inkscape:export-xdpi="96.000008" inkscape:export-ydpi="96.000008"> + id="layer4" + inkscape:label="bg-light" + style="display:none"> + + + + + + + m + + diff --git a/doc/doxygen.rst b/doc/doxygen.rst index 8f91f2c1..d1424a66 100644 --- a/doc/doxygen.rst +++ b/doc/doxygen.rst @@ -265,14 +265,16 @@ Variable Description :ini:`TAGFILES` Used to discover what base URL to prepend to external references :ini:`HTML_EXTRA_STYLESHEET` List of CSS files to include. Relative paths - are also searched relative to the - ``dox2html5.py`` script. See below for more + are searched relative to the Doxyfile base dir + and to the ``dox2html5.py`` script dir as a + fallback. See `Theme selection`_ for more information. :ini:`HTML_EXTRA_FILES` List of extra files to copy (for example additional CSS files that are :css:`@import`\ ed - from the primary one). Relative paths are also - searched relative to the ``dox2html5.py`` - script. + from the primary one). Relative paths are + searched relative to the Doxyfile base dir and + to the ``dox2html5.py`` script dir as a + fallback. =============================== =============================================== In addition, the m.css Doxygen theme recognizes the following extra options: @@ -288,7 +290,11 @@ Variable Description `Theme selection`_ for more information. :ini:`M_FAVICON` Favicon URL, used to populate :html:``. If empty, no - :html:`` tag is rendered. + :html:`` tag is rendered. Relative + paths are searched relative to the Doxyfile + base dir and to the ``dox2html5.py`` script + dir as a fallback. See `Theme selection`_ + for more information. :ini:`M_LINKS_NAVBAR1` Left navbar column links. See `Navbar links`_ for more information. :ini:`M_LINKS_NAVBAR2` Right navbar column links. See @@ -351,6 +357,7 @@ following configuration: https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,600i%7CSource+Code+Pro:400,400i,600 \ ../css/m-dark+doxygen.compiled.css M_THEME_COLOR = #22272e + M_FAVICON = favicon-dark.png If you have a site already using the ``m-dark.compiled.css`` file, there's another file called ``m-dark.doxygen.compiled.css``, which contains just the @@ -376,6 +383,7 @@ place of ``m-light+doxygen.compiled.css``: https://fonts.googleapis.com/css?family=Libre+Baskerville:400,400i,700,700i%7CSource+Code+Pro:400,400i,600 \ ../css/m-light+doxygen.compiled.css M_THEME_COLOR = #cb4b16 + M_FAVICON = favicon-light.png See the `CSS files`_ section below for more information about customizing the CSS files. diff --git a/doxygen/dox2html5.py b/doxygen/dox2html5.py index 602fea4b..54c9def5 100755 --- a/doxygen/dox2html5.py +++ b/doxygen/dox2html5.py @@ -2656,7 +2656,7 @@ def parse_doxyfile(state: State, doxyfile, config = None): 'M_FILE_TREE_EXPAND_LEVELS': ['1'], 'M_EXPAND_INNER_TYPES': ['NO'], 'M_THEME_COLOR': ['#22272e'], - 'M_FAVICON': [], + 'M_FAVICON': ['favicon-dark.png'], 'M_LINKS_NAVBAR1': ['pages', 'namespaces'], 'M_LINKS_NAVBAR2': ['annotated', 'files'], 'M_PAGE_FINE_PRINT': ['[default]'], @@ -2893,7 +2893,7 @@ def run(doxyfile, templates=default_templates, wildcard=default_wildcard, index_ f.write(base85encode_search_data(data)) # Copy all referenced files - for i in state.images + state.doxyfile['HTML_EXTRA_STYLESHEET'] + state.doxyfile['HTML_EXTRA_FILES'] + ([] if state.doxyfile['M_SEARCH_DISABLED'] else ['search.js']): + for i in state.images + state.doxyfile['HTML_EXTRA_STYLESHEET'] + state.doxyfile['HTML_EXTRA_FILES'] + ([state.doxyfile['M_FAVICON'][0]] if state.doxyfile['M_FAVICON'] else []) + ([] if state.doxyfile['M_SEARCH_DISABLED'] else ['search.js']): # Skip absolute URLs if urllib.parse.urlparse(i).netloc: continue diff --git a/doxygen/favicon-dark.png b/doxygen/favicon-dark.png new file mode 100644 index 00000000..c2498580 Binary files /dev/null and b/doxygen/favicon-dark.png differ diff --git a/doxygen/favicon-light.png b/doxygen/favicon-light.png new file mode 100644 index 00000000..93ceb2aa Binary files /dev/null and b/doxygen/favicon-light.png differ diff --git a/doxygen/templates/base.html b/doxygen/templates/base.html index 2f503f6f..6a265261 100644 --- a/doxygen/templates/base.html +++ b/doxygen/templates/base.html @@ -7,7 +7,7 @@ {% endfor %} {% if M_FAVICON %} - + {% endif %} {% block header_links %} {% endblock %} diff --git a/doxygen/test/compound_deprecated/Doxyfile b/doxygen/test/compound_deprecated/Doxyfile index 64cd8d02..253fe335 100644 --- a/doxygen/test/compound_deprecated/Doxyfile +++ b/doxygen/test/compound_deprecated/Doxyfile @@ -9,6 +9,7 @@ XML_PROGRAMLISTING = NO M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_LINKS_NAVBAR1 = M_LINKS_NAVBAR2 = M_SEARCH_DISABLED = YES diff --git a/doxygen/test/compound_detailed/Doxyfile b/doxygen/test/compound_detailed/Doxyfile index 777b4adc..97f2af0d 100644 --- a/doxygen/test/compound_detailed/Doxyfile +++ b/doxygen/test/compound_detailed/Doxyfile @@ -8,6 +8,7 @@ XML_PROGRAMLISTING = NO M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_LINKS_NAVBAR1 = M_LINKS_NAVBAR2 = M_SEARCH_DISABLED = YES diff --git a/doxygen/test/compound_filename_case/Doxyfile b/doxygen/test/compound_filename_case/Doxyfile index d14de34b..698cbd7f 100644 --- a/doxygen/test/compound_filename_case/Doxyfile +++ b/doxygen/test/compound_filename_case/Doxyfile @@ -8,6 +8,7 @@ XML_PROGRAMLISTING = NO M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_LINKS_NAVBAR1 = M_LINKS_NAVBAR2 = M_SEARCH_DISABLED = YES diff --git a/doxygen/test/compound_ignored/Doxyfile b/doxygen/test/compound_ignored/Doxyfile index 7b8ad877..c90f097a 100644 --- a/doxygen/test/compound_ignored/Doxyfile +++ b/doxygen/test/compound_ignored/Doxyfile @@ -7,6 +7,7 @@ XML_PROGRAMLISTING = NO M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_LINKS_NAVBAR1 = M_LINKS_NAVBAR2 = M_SEARCH_DISABLED = YES diff --git a/doxygen/test/compound_listing/Doxyfile b/doxygen/test/compound_listing/Doxyfile index bbab75fd..2d8ac5a0 100644 --- a/doxygen/test/compound_listing/Doxyfile +++ b/doxygen/test/compound_listing/Doxyfile @@ -13,5 +13,6 @@ M_CLASS_TREE_EXPAND_LEVELS = 5 M_EXPAND_INNER_TYPES = YES M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_SEARCH_DISABLED = YES # Keeping navbar enabled so we can test for highlighted items diff --git a/doxygen/test/compound_modules/Doxyfile b/doxygen/test/compound_modules/Doxyfile index 2da38ad6..1c8867f5 100644 --- a/doxygen/test/compound_modules/Doxyfile +++ b/doxygen/test/compound_modules/Doxyfile @@ -7,6 +7,7 @@ XML_PROGRAMLISTING = NO M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_LINKS_NAVBAR1 = modules M_LINKS_NAVBAR2 = M_SEARCH_DISABLED = YES diff --git a/doxygen/test/compound_namespace_members_in_file_scope/Doxyfile b/doxygen/test/compound_namespace_members_in_file_scope/Doxyfile index 8663c0b3..a89bef49 100644 --- a/doxygen/test/compound_namespace_members_in_file_scope/Doxyfile +++ b/doxygen/test/compound_namespace_members_in_file_scope/Doxyfile @@ -8,6 +8,7 @@ XML_NAMESPACE_MEMBERS_IN_FILE_SCOPE = YES M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_LINKS_NAVBAR1 = M_LINKS_NAVBAR2 = M_SEARCH_DISABLED = YES diff --git a/doxygen/test/compound_warnings/Doxyfile b/doxygen/test/compound_warnings/Doxyfile index ee2f4a71..118631ca 100644 --- a/doxygen/test/compound_warnings/Doxyfile +++ b/doxygen/test/compound_warnings/Doxyfile @@ -11,6 +11,7 @@ PREDEFINED = DOXYGEN_GENERATING_OUTPUT M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_LINKS_NAVBAR1 = M_LINKS_NAVBAR2 = M_SEARCH_DISABLED = YES diff --git a/doxygen/test/contents_autobrief_heading/Doxyfile b/doxygen/test/contents_autobrief_heading/Doxyfile index 86eba784..a514ba2d 100644 --- a/doxygen/test/contents_autobrief_heading/Doxyfile +++ b/doxygen/test/contents_autobrief_heading/Doxyfile @@ -7,6 +7,7 @@ XML_PROGRAMLISTING = NO M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_LINKS_NAVBAR1 = M_LINKS_NAVBAR2 = M_SEARCH_DISABLED = YES diff --git a/doxygen/test/contents_autobrief_hr/Doxyfile b/doxygen/test/contents_autobrief_hr/Doxyfile index 7d7365d5..19191876 100644 --- a/doxygen/test/contents_autobrief_hr/Doxyfile +++ b/doxygen/test/contents_autobrief_hr/Doxyfile @@ -7,6 +7,7 @@ XML_PROGRAMLISTING = NO M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_LINKS_NAVBAR1 = M_LINKS_NAVBAR2 = M_SEARCH_DISABLED = YES diff --git a/doxygen/test/contents_autobrief_multiline/Doxyfile b/doxygen/test/contents_autobrief_multiline/Doxyfile index 14fcdeba..460cc7c5 100644 --- a/doxygen/test/contents_autobrief_multiline/Doxyfile +++ b/doxygen/test/contents_autobrief_multiline/Doxyfile @@ -7,6 +7,7 @@ XML_PROGRAMLISTING = NO M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_LINKS_NAVBAR1 = M_LINKS_NAVBAR2 = M_SEARCH_DISABLED = YES diff --git a/doxygen/test/contents_blocks/Doxyfile b/doxygen/test/contents_blocks/Doxyfile index b632f478..d2fcc288 100644 --- a/doxygen/test/contents_blocks/Doxyfile +++ b/doxygen/test/contents_blocks/Doxyfile @@ -7,6 +7,7 @@ XML_PROGRAMLISTING = NO M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_LINKS_NAVBAR1 = M_LINKS_NAVBAR2 = M_SEARCH_DISABLED = YES diff --git a/doxygen/test/contents_code/Doxyfile b/doxygen/test/contents_code/Doxyfile index 3f1f0bc0..898e7d00 100644 --- a/doxygen/test/contents_code/Doxyfile +++ b/doxygen/test/contents_code/Doxyfile @@ -8,6 +8,7 @@ XML_PROGRAMLISTING = NO M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_LINKS_NAVBAR1 = M_LINKS_NAVBAR2 = M_SEARCH_DISABLED = YES diff --git a/doxygen/test/contents_code_language/Doxyfile b/doxygen/test/contents_code_language/Doxyfile index 3f1f0bc0..898e7d00 100644 --- a/doxygen/test/contents_code_language/Doxyfile +++ b/doxygen/test/contents_code_language/Doxyfile @@ -8,6 +8,7 @@ XML_PROGRAMLISTING = NO M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_LINKS_NAVBAR1 = M_LINKS_NAVBAR2 = M_SEARCH_DISABLED = YES diff --git a/doxygen/test/contents_custom/Doxyfile b/doxygen/test/contents_custom/Doxyfile index 8400780c..a0a7a22b 100644 --- a/doxygen/test/contents_custom/Doxyfile +++ b/doxygen/test/contents_custom/Doxyfile @@ -8,6 +8,7 @@ XML_PROGRAMLISTING = NO M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_LINKS_NAVBAR1 = M_LINKS_NAVBAR2 = M_SEARCH_DISABLED = YES diff --git a/doxygen/test/contents_image/Doxyfile b/doxygen/test/contents_image/Doxyfile index b519d1b9..b6f89acf 100644 --- a/doxygen/test/contents_image/Doxyfile +++ b/doxygen/test/contents_image/Doxyfile @@ -8,6 +8,7 @@ XML_PROGRAMLISTING = NO M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_LINKS_NAVBAR1 = M_LINKS_NAVBAR2 = M_SEARCH_DISABLED = YES diff --git a/doxygen/test/contents_math/Doxyfile b/doxygen/test/contents_math/Doxyfile index 38425b65..d1b0fce7 100644 --- a/doxygen/test/contents_math/Doxyfile +++ b/doxygen/test/contents_math/Doxyfile @@ -7,6 +7,7 @@ XML_PROGRAMLISTING = NO M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_LINKS_NAVBAR1 = M_LINKS_NAVBAR2 = M_SEARCH_DISABLED = YES diff --git a/doxygen/test/contents_section_underscore_one/Doxyfile b/doxygen/test/contents_section_underscore_one/Doxyfile index ccb711b2..466ff7b8 100644 --- a/doxygen/test/contents_section_underscore_one/Doxyfile +++ b/doxygen/test/contents_section_underscore_one/Doxyfile @@ -7,6 +7,7 @@ XML_PROGRAMLISTING = NO M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_LINKS_NAVBAR1 = M_LINKS_NAVBAR2 = M_SEARCH_DISABLED = YES diff --git a/doxygen/test/contents_tagfile/Doxyfile b/doxygen/test/contents_tagfile/Doxyfile index debc7187..1d443307 100644 --- a/doxygen/test/contents_tagfile/Doxyfile +++ b/doxygen/test/contents_tagfile/Doxyfile @@ -8,6 +8,7 @@ XML_PROGRAMLISTING = NO M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_LINKS_NAVBAR1 = M_LINKS_NAVBAR2 = M_SEARCH_DISABLED = YES diff --git a/doxygen/test/contents_typography/Doxyfile b/doxygen/test/contents_typography/Doxyfile index 38425b65..d1b0fce7 100644 --- a/doxygen/test/contents_typography/Doxyfile +++ b/doxygen/test/contents_typography/Doxyfile @@ -7,6 +7,7 @@ XML_PROGRAMLISTING = NO M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_LINKS_NAVBAR1 = M_LINKS_NAVBAR2 = M_SEARCH_DISABLED = YES diff --git a/doxygen/test/cpp_derived/Doxyfile b/doxygen/test/cpp_derived/Doxyfile index 01f7aad0..fe6d3cfb 100644 --- a/doxygen/test/cpp_derived/Doxyfile +++ b/doxygen/test/cpp_derived/Doxyfile @@ -8,6 +8,7 @@ XML_PROGRAMLISTING = NO M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_LINKS_NAVBAR1 = M_LINKS_NAVBAR2 = M_SEARCH_DISABLED = YES diff --git a/doxygen/test/cpp_enum_class/Doxyfile b/doxygen/test/cpp_enum_class/Doxyfile index 777b4adc..97f2af0d 100644 --- a/doxygen/test/cpp_enum_class/Doxyfile +++ b/doxygen/test/cpp_enum_class/Doxyfile @@ -8,6 +8,7 @@ XML_PROGRAMLISTING = NO M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_LINKS_NAVBAR1 = M_LINKS_NAVBAR2 = M_SEARCH_DISABLED = YES diff --git a/doxygen/test/cpp_template_alias/Doxyfile b/doxygen/test/cpp_template_alias/Doxyfile index 777b4adc..97f2af0d 100644 --- a/doxygen/test/cpp_template_alias/Doxyfile +++ b/doxygen/test/cpp_template_alias/Doxyfile @@ -8,6 +8,7 @@ XML_PROGRAMLISTING = NO M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_LINKS_NAVBAR1 = M_LINKS_NAVBAR2 = M_SEARCH_DISABLED = YES diff --git a/doxygen/test/example/Doxyfile b/doxygen/test/example/Doxyfile index c1c81fbd..20c2486a 100644 --- a/doxygen/test/example/Doxyfile +++ b/doxygen/test/example/Doxyfile @@ -11,6 +11,7 @@ ALIASES = \ M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_LINKS_NAVBAR1 = M_LINKS_NAVBAR2 = M_SEARCH_DISABLED = YES diff --git a/doxygen/test/layout/Doxyfile b/doxygen/test/layout/Doxyfile index 8a903cc0..364fcdfe 100644 --- a/doxygen/test/layout/Doxyfile +++ b/doxygen/test/layout/Doxyfile @@ -4,7 +4,7 @@ PROJECT_NAME = "A project" PROJECT_BRIEF = "is cool" M_THEME_COLOR = 00ffff -M_FAVICON = favicon.png +M_FAVICON = favicon-light.png M_PAGE_HEADER = "

A self link.

" M_PAGE_FINE_PRINT = "

Doxygen version {doxygen_version}.

" M_LINKS_NAVBAR1 = "files pages namespaces" \ diff --git a/doxygen/test/layout/pages.html b/doxygen/test/layout/pages.html index 76f22840..25c3c02e 100644 --- a/doxygen/test/layout/pages.html +++ b/doxygen/test/layout/pages.html @@ -5,7 +5,7 @@ A project is cool - + diff --git a/doxygen/test/layout_generated_doxyfile/index.html b/doxygen/test/layout_generated_doxyfile/index.html index 4a692453..5fc7ba85 100644 --- a/doxygen/test/layout_generated_doxyfile/index.html +++ b/doxygen/test/layout_generated_doxyfile/index.html @@ -5,6 +5,7 @@ My Project + diff --git a/doxygen/test/layout_minimal/index.html b/doxygen/test/layout_minimal/index.html index 4a692453..5fc7ba85 100644 --- a/doxygen/test/layout_minimal/index.html +++ b/doxygen/test/layout_minimal/index.html @@ -5,6 +5,7 @@ My Project + diff --git a/doxygen/test/layout_navbar_single_column/Doxyfile b/doxygen/test/layout_navbar_single_column/Doxyfile index 6f334646..589305b6 100644 --- a/doxygen/test/layout_navbar_single_column/Doxyfile +++ b/doxygen/test/layout_navbar_single_column/Doxyfile @@ -1,10 +1,11 @@ XML_OUTPUT = -M_LINKS_NAVBAR1 = pages \ - namespaces \ - annotated \ - files -M_LINKS_NAVBAR2 = -M_PAGE_FINE_PRINT = -M_THEME_COLOR = +M_LINKS_NAVBAR1 = pages \ + namespaces \ + annotated \ + files +M_LINKS_NAVBAR2 = +M_PAGE_FINE_PRINT = +M_THEME_COLOR = +M_FAVICON = M_SEARCH_DISABLED = YES diff --git a/doxygen/test/layout_search_binary/Doxyfile b/doxygen/test/layout_search_binary/Doxyfile index 546e9ea4..2adc63d6 100644 --- a/doxygen/test/layout_search_binary/Doxyfile +++ b/doxygen/test/layout_search_binary/Doxyfile @@ -2,6 +2,7 @@ XML_OUTPUT = M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_LINKS_NAVBAR1 = M_LINKS_NAVBAR2 = M_SEARCH_DOWNLOAD_BINARY = YES diff --git a/doxygen/test/page_brief/Doxyfile b/doxygen/test/page_brief/Doxyfile index 38425b65..d1b0fce7 100644 --- a/doxygen/test/page_brief/Doxyfile +++ b/doxygen/test/page_brief/Doxyfile @@ -7,6 +7,7 @@ XML_PROGRAMLISTING = NO M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_LINKS_NAVBAR1 = M_LINKS_NAVBAR2 = M_SEARCH_DISABLED = YES diff --git a/doxygen/test/page_empty_index/Doxyfile b/doxygen/test/page_empty_index/Doxyfile index 38425b65..d1b0fce7 100644 --- a/doxygen/test/page_empty_index/Doxyfile +++ b/doxygen/test/page_empty_index/Doxyfile @@ -7,6 +7,7 @@ XML_PROGRAMLISTING = NO M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_LINKS_NAVBAR1 = M_LINKS_NAVBAR2 = M_SEARCH_DISABLED = YES diff --git a/doxygen/test/page_empty_title/Doxyfile b/doxygen/test/page_empty_title/Doxyfile index 38425b65..d1b0fce7 100644 --- a/doxygen/test/page_empty_title/Doxyfile +++ b/doxygen/test/page_empty_title/Doxyfile @@ -7,6 +7,7 @@ XML_PROGRAMLISTING = NO M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_LINKS_NAVBAR1 = M_LINKS_NAVBAR2 = M_SEARCH_DISABLED = YES diff --git a/doxygen/test/page_footernavigation/Doxyfile b/doxygen/test/page_footernavigation/Doxyfile index c611a454..c6dc3fbd 100644 --- a/doxygen/test/page_footernavigation/Doxyfile +++ b/doxygen/test/page_footernavigation/Doxyfile @@ -8,6 +8,7 @@ XML_PROGRAMLISTING = NO M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_LINKS_NAVBAR1 = M_LINKS_NAVBAR2 = M_SEARCH_DISABLED = YES diff --git a/doxygen/test/page_in_navbar/Doxyfile b/doxygen/test/page_in_navbar/Doxyfile index 8f48a7f2..fac82ea9 100644 --- a/doxygen/test/page_in_navbar/Doxyfile +++ b/doxygen/test/page_in_navbar/Doxyfile @@ -7,6 +7,7 @@ XML_PROGRAMLISTING = NO M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_LINKS_NAVBAR1 = "page-in-navbar pages page-b" \ "page-b" M_LINKS_NAVBAR2 = "page-b" \ diff --git a/doxygen/test/page_order/Doxyfile b/doxygen/test/page_order/Doxyfile index b951f3a3..c99c91e6 100644 --- a/doxygen/test/page_order/Doxyfile +++ b/doxygen/test/page_order/Doxyfile @@ -8,6 +8,7 @@ XML_PROGRAMLISTING = NO M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_LINKS_NAVBAR1 = M_LINKS_NAVBAR2 = M_SEARCH_DISABLED = YES diff --git a/doxygen/test/page_subpage_of_index/Doxyfile b/doxygen/test/page_subpage_of_index/Doxyfile index 38425b65..d1b0fce7 100644 --- a/doxygen/test/page_subpage_of_index/Doxyfile +++ b/doxygen/test/page_subpage_of_index/Doxyfile @@ -7,6 +7,7 @@ XML_PROGRAMLISTING = NO M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_LINKS_NAVBAR1 = M_LINKS_NAVBAR2 = M_SEARCH_DISABLED = YES diff --git a/doxygen/test/page_toc/Doxyfile b/doxygen/test/page_toc/Doxyfile index 38425b65..d1b0fce7 100644 --- a/doxygen/test/page_toc/Doxyfile +++ b/doxygen/test/page_toc/Doxyfile @@ -7,6 +7,7 @@ XML_PROGRAMLISTING = NO M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_LINKS_NAVBAR1 = M_LINKS_NAVBAR2 = M_SEARCH_DISABLED = YES diff --git a/doxygen/test/search/Doxyfile b/doxygen/test/search/Doxyfile index afec645f..a2da4c68 100644 --- a/doxygen/test/search/Doxyfile +++ b/doxygen/test/search/Doxyfile @@ -16,6 +16,7 @@ ALIASES = \ M_PAGE_FINE_PRINT = M_THEME_COLOR = +M_FAVICON = M_LINKS_NAVBAR1 = M_LINKS_NAVBAR2 = M_SEARCH_DOWNLOAD_BINARY = YES diff --git a/doxygen/test/test_doxyfile.py b/doxygen/test/test_doxyfile.py index da0a336c..3a7b4621 100644 --- a/doxygen/test/test_doxyfile.py +++ b/doxygen/test/test_doxyfile.py @@ -42,7 +42,7 @@ class Doxyfile(unittest.TestCase): 'HTML_OUTPUT': 'html', 'M_CLASS_TREE_EXPAND_LEVELS': 1, 'M_EXPAND_INNER_TYPES': False, - 'M_FAVICON': '', + 'M_FAVICON': 'favicon-dark.png', 'M_FILE_TREE_EXPAND_LEVELS': 1, 'M_LINKS_NAVBAR1': ['pages', 'namespaces'], 'M_LINKS_NAVBAR2': ['annotated', 'files'], diff --git a/doxygen/test/test_layout.py b/doxygen/test/test_layout.py index 28971441..7e379fde 100644 --- a/doxygen/test/test_layout.py +++ b/doxygen/test/test_layout.py @@ -37,6 +37,7 @@ class Layout(BaseTestCase): self.assertTrue(os.path.exists(os.path.join(self.path, 'html', 'm-dark+doxygen.compiled.css'))) self.assertTrue(os.path.exists(os.path.join(self.path, 'html', 'search.js'))) self.assertTrue(os.path.exists(os.path.join(self.path, 'html', 'searchdata.js'))) + self.assertTrue(os.path.exists(os.path.join(self.path, 'html', 'favicon-light.png'))) class LayoutGeneratedDoxyfile(BaseTestCase): def __init__(self, *args, **kwargs):