doxygen: bundle a matching favicon by default.

diff --git a/artwork/favicon.svg b/artwork/favicon.svg
index f904a9c7a7665992d09ae60111200db533f18849..eab34a44639703720f6ca9f3ae3ea1189954055c 100644 (file)
--- 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">
   <defs
@@ -29,10 +29,10 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="11.2"
-     inkscape:cx="-5.0357758"
+     inkscape:cx="-32.625062"
      inkscape:cy="-15.339316"
      inkscape:document-units="px"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="layer5"
      showgrid="false"
      units="px"
      inkscape:snap-page="true"
@@ -54,20 +54,42 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Vrstva 1"
      inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-292.76665)">
+     id="layer4"
+     inkscape:label="bg-light"
+     style="display:none">
+    <rect
+       y="292.76666"
+       x="0"
+       height="4.2333331"
+       width="4.2333331"
+       id="rect824"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52916664;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       transform="translate(0,-292.76665)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="bg"
+     style="display:inline">
     <rect
+       transform="translate(0,-292.76665)"
        style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#22272e;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52916664;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        id="rect815"
        width="4.2333331"
        height="4.2333331"
        x="0"
        y="292.76666" />
+  </g>
+  <g
+     inkscape:label="mcss"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-292.76665)"
+     style="display:none">
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:4.23333359px;line-height:6.61458302px;font-family:'Source Sans Pro';-inkscape-font-specification:'Source Sans Pro, Semi-Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#c7cf2f;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:4.23333359px;line-height:6.61458302px;font-family:'Source Sans Pro';-inkscape-font-specification:'Source Sans Pro, Semi-Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#c7cf2f;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        x="2.1055541"
        y="295.93744"
        id="text838"><tspan
@@ -75,6 +97,42 @@
          id="tspan836"
          x="2.1055541"
          y="295.93744"
-         style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:4.23333359px;font-family:'Source Sans Pro';-inkscape-font-specification:'Source Sans Pro, Semi-Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#c7cf2f;fill-opacity:1;stroke-width:0.26458332px;">m</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:4.23333359px;font-family:'Source Sans Pro';-inkscape-font-specification:'Source Sans Pro, Semi-Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#c7cf2f;fill-opacity:1;stroke-width:0.26458332px">m</tspan></text>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="dox-dark"
+     style="display:inline">
+    <text
+       transform="translate(0,-292.76665)"
+       id="text820"
+       y="295.93744"
+       x="2.1055541"
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:4.23333359px;line-height:6.61458302px;font-family:'Source Sans Pro';-inkscape-font-specification:'Source Sans Pro, Semi-Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:4.23333359px;font-family:'Source Sans Pro';-inkscape-font-specification:'Source Sans Pro, Semi-Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.26458332px"
+         y="295.93744"
+         x="2.1055541"
+         id="tspan818"
+         sodipodi:role="line">m</tspan></text>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="dox-light"
+     style="display:none">
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:4.23333359px;line-height:6.61458302px;font-family:'Source Sans Pro';-inkscape-font-specification:'Source Sans Pro, Semi-Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#2e2e2e;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="2.1055541"
+       y="295.93744"
+       id="text829"
+       transform="translate(0,-292.76665)"><tspan
+         sodipodi:role="line"
+         id="tspan827"
+         x="2.1055541"
+         y="295.93744"
+         style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:4.23333359px;font-family:'Source Sans Pro';-inkscape-font-specification:'Source Sans Pro, Semi-Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#2e2e2e;fill-opacity:1;stroke-width:0.26458332px">m</tspan></text>
   </g>
 </svg>

diff --git a/doc/doxygen.rst b/doc/doxygen.rst
index 8f91f2c1d3f44c78e8a9c8c97082402c5f004713..d1424a6651673f332421cdcb24429f43b1e193e7 100644 (file)
--- 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:`<link rel="icon" />`. If empty, no
-                                    :html:`<link>` tag is rendered.
+                                    :html:`<link>` 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 602fea4b9fd22bc49947cd20f5a081464851301c..54c9def5f554a2c3efdee7aaac70e2d49ffef4e8 100755 (executable)
--- 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 (file)
index 0000000..c249858
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 (file)
index 0000000..93ceb2a
Binary files /dev/null and b/doxygen/favicon-light.png differ

diff --git a/doxygen/templates/base.html b/doxygen/templates/base.html
index 2f503f6f874fb864bb4b09c515f996fa234667d1..6a2652615ae0914714d0e2607153d3a17492f12f 100644 (file)
--- a/doxygen/templates/base.html
+++ b/doxygen/templates/base.html
@@ -7,7 +7,7 @@
   <link rel="stylesheet" href="{{ css|basename_or_url|e }}" />
   {% endfor %}
   {% if M_FAVICON %}
-  <link rel="icon" href="{{ M_FAVICON[0] }}" type="{{ M_FAVICON[1] }}" />
+  <link rel="icon" href="{{ M_FAVICON[0]|basename_or_url|e }}" type="{{ M_FAVICON[1] }}" />
   {% endif %}
   {% block header_links %}
   {% endblock %}

diff --git a/doxygen/test/compound_deprecated/Doxyfile b/doxygen/test/compound_deprecated/Doxyfile
index 64cd8d023f5df5a2c8b7f8a22172fb0863037fca..253fe335c3054a07957ab9abba5b778341f91565 100644 (file)
--- 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 777b4adc9ffeaf6e3a49dbd4e06d8ff99add38f1..97f2af0d468f957dca7bcbf25b7e27e62c941974 100644 (file)
--- 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 d14de34bce2e55fb1f2af83742ca0e5d31f4fb69..698cbd7fbf753ee3dd3f177dd55f8b1a82d5f21f 100644 (file)
--- 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 7b8ad8772f5a5a62b88193d97724000593648ff7..c90f097acd1f0ce2a47c94f8ac7f0b9b76e777a6 100644 (file)
--- 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 bbab75fdaf7c5c47516396e73fa29fec604aa312..2d8ac5a07975f154ec1c3262287d5f526fa4fd7d 100644 (file)
--- 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 2da38ad61335ddbadc2b696678cecef4424249d6..1c8867f5a35a34ab7ff93ce374b8b73ff9ac9930 100644 (file)
--- 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 8663c0b34a58968dc6b4a422204247665953f485..a89bef49a3f2f254232bf084cd39b0825920ae05 100644 (file)
--- 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 ee2f4a71c279b5100d97d1a1ea283ce664038b6f..118631ca033fd061c7dd79ce7f611fc49f599665 100644 (file)
--- 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 86eba7842c0c73f1cad35557719b54200874e092..a514ba2d997e42772bb267b68a17e11f18f536a9 100644 (file)
--- 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 7d7365d5ba33fdd50c00234f746580abcf0eefb1..1919187635ffee6a3f0464e8bd6d1e11231ee6de 100644 (file)
--- 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 14fcdeba27a520e7e9c856488b53305d2e10a6c0..460cc7c5aa2d48f045f565375ee37b2a8ffe2a45 100644 (file)
--- 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 b632f47898bc1970015cd08e5cf0c55e4222d5d3..d2fcc288e4771d448f562df6b988bba801b287e4 100644 (file)
--- 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 3f1f0bc00ddd43287d3eadfe8924bf92b07495d8..898e7d00c4d9c4acaa9f78128b14bf827926379c 100644 (file)
--- 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 3f1f0bc00ddd43287d3eadfe8924bf92b07495d8..898e7d00c4d9c4acaa9f78128b14bf827926379c 100644 (file)
--- 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 8400780c0cb81c675d14bfd45cedf11dfce77c30..a0a7a22b561bc560a04f09d488812ef915cf252b 100644 (file)
--- 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 b519d1b9807edb930045edc506600e9d73d7ae9b..b6f89acf31e5b02a97f1f42cad0568f377af7398 100644 (file)
--- 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 38425b658882f68d7460b9b5765ceb1baef61186..d1b0fce7bc98e5c47122d84ef122c6d216958ee6 100644 (file)
--- 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 ccb711b243ab377bcb64ebb3881f1414695139b0..466ff7b8139414b80ae6b35b8fda47023edd36db 100644 (file)
--- 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 debc7187da80db493dadf792d81ee8f6d5eb33b2..1d4433075013e595255815277fd94dd9409cd725 100644 (file)
--- 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 38425b658882f68d7460b9b5765ceb1baef61186..d1b0fce7bc98e5c47122d84ef122c6d216958ee6 100644 (file)
--- 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 01f7aad059ebf66072248a620f0d325eed8bad01..fe6d3cfb49da351cd5400a430a2826dc009fc34f 100644 (file)
--- 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 777b4adc9ffeaf6e3a49dbd4e06d8ff99add38f1..97f2af0d468f957dca7bcbf25b7e27e62c941974 100644 (file)
--- 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 777b4adc9ffeaf6e3a49dbd4e06d8ff99add38f1..97f2af0d468f957dca7bcbf25b7e27e62c941974 100644 (file)
--- 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 c1c81fbd86393350b02846cbbf2a98ca0f3d002f..20c2486a783047fa29a20836608234b2b12f64c0 100644 (file)
--- 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 8a903cc04e29abb9222ed64a94d7d10f9320c608..364fcdfe9f1674b1c93722818ee03266247adc48 100644 (file)
--- 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 = "<p><a href=\"{filename}\">A self link</a>.</p>"
 M_PAGE_FINE_PRINT = "<p><a href=\"http://doxygen.org\">Doxygen</a> version {doxygen_version}.</p>"
 M_LINKS_NAVBAR1 = "files pages namespaces" \

diff --git a/doxygen/test/layout/pages.html b/doxygen/test/layout/pages.html
index 76f2284057ff7942eb499bebc3e9913225366f56..25c3c02e05866eb3f64b1e02c1ec816e1dc5a5e5 100644 (file)
--- a/doxygen/test/layout/pages.html
+++ b/doxygen/test/layout/pages.html
@@ -5,7 +5,7 @@
   <title>A project is cool</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,600i%7CSource+Code+Pro:400,400i,600" />
   <link rel="stylesheet" href="m-dark+doxygen.compiled.css" />
-  <link rel="icon" href="favicon.png" type="image/png" />
+  <link rel="icon" href="favicon-light.png" type="image/png" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta name="theme-color" content="00ffff" />
 </head>

diff --git a/doxygen/test/layout_generated_doxyfile/index.html b/doxygen/test/layout_generated_doxyfile/index.html
index 4a6924531fb587ce1bc0a0820d2a25e96598cb73..5fc7ba857b81f9f61b046d6f24eff40064dca312 100644 (file)
--- a/doxygen/test/layout_generated_doxyfile/index.html
+++ b/doxygen/test/layout_generated_doxyfile/index.html
@@ -5,6 +5,7 @@
   <title>My Project</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,600i%7CSource+Code+Pro:400,400i,600" />
   <link rel="stylesheet" href="m-dark+doxygen.compiled.css" />
+  <link rel="icon" href="favicon-dark.png" type="image/png" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta name="theme-color" content="#22272e" />
 </head>

diff --git a/doxygen/test/layout_minimal/index.html b/doxygen/test/layout_minimal/index.html
index 4a6924531fb587ce1bc0a0820d2a25e96598cb73..5fc7ba857b81f9f61b046d6f24eff40064dca312 100644 (file)
--- a/doxygen/test/layout_minimal/index.html
+++ b/doxygen/test/layout_minimal/index.html
@@ -5,6 +5,7 @@
   <title>My Project</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,600i%7CSource+Code+Pro:400,400i,600" />
   <link rel="stylesheet" href="m-dark+doxygen.compiled.css" />
+  <link rel="icon" href="favicon-dark.png" type="image/png" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta name="theme-color" content="#22272e" />
 </head>

diff --git a/doxygen/test/layout_navbar_single_column/Doxyfile b/doxygen/test/layout_navbar_single_column/Doxyfile
index 6f3346464406b9f83a3fb13f94cc14c9805272f7..589305b630bf0cbb7bd8854dd437473e49d74d01 100644 (file)
--- 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 546e9ea44f17d76c3b99a0d4985888e2b60f584e..2adc63d67190c4f8b8faeaab0391fb1896458df9 100644 (file)
--- 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 38425b658882f68d7460b9b5765ceb1baef61186..d1b0fce7bc98e5c47122d84ef122c6d216958ee6 100644 (file)
--- 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 38425b658882f68d7460b9b5765ceb1baef61186..d1b0fce7bc98e5c47122d84ef122c6d216958ee6 100644 (file)
--- 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 38425b658882f68d7460b9b5765ceb1baef61186..d1b0fce7bc98e5c47122d84ef122c6d216958ee6 100644 (file)
--- 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 c611a4546a7df5dcf2ca6a8d33cff921c4c7af41..c6dc3fbdb083df6fb458dc7496c4b15bf5fd5053 100644 (file)
--- 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 8f48a7f2aa794a34b8a6888599e5d9ca751972a5..fac82ea9bd2f4351367a6e1cd67a41f5e03c5054 100644 (file)
--- 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 b951f3a33a8e9a16f8f14cfa3db2c8873da168d8..c99c91e68352a2f262144866010a108b00c163db 100644 (file)
--- 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 38425b658882f68d7460b9b5765ceb1baef61186..d1b0fce7bc98e5c47122d84ef122c6d216958ee6 100644 (file)
--- 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 38425b658882f68d7460b9b5765ceb1baef61186..d1b0fce7bc98e5c47122d84ef122c6d216958ee6 100644 (file)
--- 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 afec645fefc258f4ecc6730eab96b04c62ea7edb..a2da4c68fa1588f55bf9bc1f2fee6e09b6c72ea3 100644 (file)
--- 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 da0a336c06736566cad57acd63fc2a3da284c19a..3a7b4621d7783f5dccafc66038483868e70eb38b 100644 (file)
--- 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 289714414022714c8a75e712a681f6de3f0612fd..7e379fde5a60f378d4d03aae956c8674b91abacd 100644 (file)
--- 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):