Merge commit '699abdd57242d33291a0ea4ee333c7d4de11a30c'

diff --cc m.css/CONTRIBUTING.rst
Simple merge

diff --cc m.css/COPYING
Simple merge

diff --cc m.css/CREDITS.rst
Simple merge

diff --cc m.css/css/m-components.css
Simple merge

diff --cc m.css/css/m-dark+documentation.compiled.css
Simple merge

diff --cc m.css/css/m-dark.compiled.css
Simple merge

diff --cc m.css/css/m-dark.css
Simple merge

diff --cc m.css/css/m-dark.documentation.compiled.css
Simple merge

diff --cc m.css/css/m-debug.css
Simple merge

diff --cc m.css/css/m-documentation.css
Simple merge

diff --cc m.css/css/m-grid.css
Simple merge

diff --cc m.css/css/m-layout.css
Simple merge

diff --cc m.css/css/m-light+documentation.compiled.css
Simple merge

diff --cc m.css/css/m-light.compiled.css
Simple merge

diff --cc m.css/css/m-light.css
Simple merge

diff --cc m.css/css/m-light.documentation.compiled.css
Simple merge

diff --cc m.css/css/m-theme-dark.css
Simple merge

diff --cc m.css/css/m-theme-light.css
index a21896f3283305bc1f4faa0f2a96082ce49511a2,0000000000000000000000000000000000000000..71a9b4a8b91ecbb07a1dc24976f1e20cfd610282
mode 100644,000000..100644
--- 1/m.css/css/m-theme-light.css
--- /dev/null
+++ b/m.css/css/m-theme-light.css
@@@ -1,159 -1,0 +1,160 @@@
-     Copyright © 2017, 2018, 2019, 2020, 2021, 2022, 2023
 +/*
 +    This file is part of m.css.
 +
++    Copyright © 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024
 +              Vladimír Vondruš <mosra@centrum.cz>
++    Copyright © 2019 Cris Luengo <cris.l.luengo@gmail.com>
 +
 +    Permission is hereby granted, free of charge, to any person obtaining a
 +    copy of this software and associated documentation files (the "Software"),
 +    to deal in the Software without restriction, including without limitation
 +    the rights to use, copy, modify, merge, publish, distribute, sublicense,
 +    and/or sell copies of the Software, and to permit persons to whom the
 +    Software is furnished to do so, subject to the following conditions:
 +
 +    The above copyright notice and this permission notice shall be included
 +    in all copies or substantial portions of the Software.
 +
 +    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 +    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 +    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 +    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 +    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 +    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 +    DEALINGS IN THE SOFTWARE.
 +*/
 +
 +:root {
 +  /* Text properties */
 +  --font: 'Source Sans Pro', sans-serif;
 +  --code-font: 'Source Code Pro', monospace;
 +  --font-size: 16px;
 +  --code-font-size: 0.9em; /* *not* rem, so it follows surrounding font size */
 +  --line-height: normal;
 +  --paragraph-indent: 1.5rem;
 +  --paragraph-align: justify;
 +  --link-decoration: underline;
 +  --link-decoration-nav: none;
 +  --link-decoration-heading: none;
 +  --nav-brand-case: uppercase;
 +  --nav-menu-case: none;
 +  --nav-heading-case: uppercase;
 +  --nav-categories-case: lowercase;
 +  --landing-header-case: lowercase;
 +  --heading-font-weight: 600;
 +
 +  /* Shapes */
 +  --border-radius: 0.2rem;
 +
 +  /* Basics */
 +  --background-color: #ffffff;
 +  --color: #000000;
 +  --line-color: #f7e3db;
 +  --link-color: #ea7944;
 +  --link-active-color: #cb4b16;
 +  --mark-color: #4c93d3;
 +  --mark-background-color: #e6e69c;
 +  --code-color: #5b5b5b;
 +  --code-inverted-color: rgba(91, 91, 91, 0.33);
 +  --console-color: var(--code-color);
 +  --console-inverted-color: var(--code-inverted-color);
 +  /* This is simply color-picked --code-note-background-color on top of
 +     --background-color */
 +  --code-background-color: #fbf0ec;
 +  --code-note-background-color: rgba(251, 240, 236, 0.5);
 +  --console-background-color: #000000;
 +  --button-background-color: #ffffff;
 +
 +  /* Header */
 +  --header-border-width: 0.25rem 0 0 0;
 +  --header-color: #000000;
 +  --header-breadcrumb-color: #bdbdbd; /* same as --dim-color */
 +  --header-background-color: #ffffff;
 +  --header-background-color-landing: rgba(255, 255, 255, 0.75);
 +  --header-background-color-jumbo: rgba(255, 255, 255, 0.25);
 +  --header-link-color: #000000;
 +  --header-link-active-color: #cb4b16;
 +  --header-link-current-color: #ea7944;
 +  --header-link-active-background-color: #ffffff;
 +  --header-link-active-background-color: rgba(255, 255, 255, 0.5);
 +
 +  /* Footer */
 +  --footer-font-size: 0.85rem;
 +  --footer-color: #7c7c7c;
 +  --footer-background-color: #eeeeee;
 +  --footer-link-color: #191919;
 +  --footer-link-active-color: #494949;
 +
 +  /* Cover image */
 +  --cover-image-background-color: #666666;
 +
 +  /* Search (used only by m-documentation.css) */
 +  --search-overlay-color: var(--header-background-color-landing);
 +  --search-background-color: var(--header-background-color);
 +
 +  /* Article */
 +  --article-header-color: #7a7a7a;
 +  --article-footer-color: #969696;
 +  --article-heading-color: #cb4b16;
 +  --article-heading-active-color: #802f0e;
 +
 +  /* Right navigation panel */
 +  --navpanel-link-color: #292929;
 +  --navpanel-link-active-color: #cb4b16;
 +
 +  /* Plots */
 +  --plot-background-color: #fbf0ec;
 +  --plot-error-color: #000000;
 +
 +  /* Colored components */
 +  --default-color: #000000;
 +  --default-link-active-color: #cb4b16;
 +  --default-filled-color: #000000;
 +  --default-filled-background-color: #fbf0ec;
 +  --default-filled-link-color: #ea7944;
 +  --default-filled-link-active-color: #cb4b16;
 +
 +  --primary-color: #cb4b16;
 +  --primary-link-active-color: #000000;
 +  --primary-filled-color: #fbe4d9;
 +  --primary-filled-background-color: #ef9069;
 +  --primary-filled-link-color: #782f0d;
 +  --primary-filled-link-active-color: #2f1205;
 +
 +  --success-color: #31c25d;
 +  --success-link-active-color: #dcf6e3;
 +  --success-filled-color: #f4fcf6;
 +  --success-filled-background-color: #4dd376;
 +  --success-filled-link-color: #c5f2d1;
 +  --success-filled-link-active-color: #dcf6e3;
 +
 +  --warning-color: #c7cf2f;
 +  --warning-link-active-color: #f6f6dc;
 +  --warning-filled-color: #fcfcf4;
 +  --warning-filled-background-color: #d1d34d;
 +  --warning-filled-link-color: #f0f1c7;
 +  --warning-filled-link-active-color: #f6f6dc;
 +
 +  --danger-color: #f60000;
 +  --danger-link-active-color: #f6dddc;
 +  --danger-filled-color: #fdf3f3;
 +  --danger-filled-background-color: #e23e3e;
 +  --danger-filled-link-color: #f2c7c6;
 +  --danger-filled-link-active-color: #f6dddc;
 +
 +  --info-color: #2e7dc5;
 +  --info-link-active-color: #c6ddf2;
 +  --info-filled-color: #f4f8fc;
 +  --info-filled-background-color: #4c93d3;
 +  --info-filled-link-color: #c6ddf2;
 +  --info-filled-link-active-color: #dbeaf7;
 +
 +  --dim-color: #bdbdbd;
 +  --dim-link-color: #c0c0c0;
 +  --dim-link-active-color: #949494;
 +  --dim-filled-color: #7c7c7c;
 +  --dim-filled-background-color: #f1f1f1;
 +  --dim-filled-link-color: #c0c0c0;
 +  --dim-filled-link-active-color: #949494;
 +  --dim-button-active-color: #c0c0c0;
 +}

diff --cc m.css/css/postprocess.py
Simple merge

diff --cc m.css/css/pygments-console.py
Simple merge

diff --cc m.css/css/pygments-dark.py
Simple merge

diff --cc m.css/doc/admire/math.rst
Simple merge

diff --cc m.css/doc/build-status.html.in
Simple merge

diff --cc m.css/doc/build-status.js
Simple merge

diff --cc m.css/doc/css.rst
Simple merge

diff --cc m.css/doc/css/components-test.rst
Simple merge

diff --cc m.css/doc/css/components.rst
Simple merge

diff --cc m.css/doc/css/grid-test.rst
Simple merge

diff --cc m.css/doc/css/grid.rst
Simple merge

diff --cc m.css/doc/css/page-layout-test-navbar-brand-logo.html
Simple merge

diff --cc m.css/doc/css/page-layout-test-navbar-subsite.html
Simple merge

diff --cc m.css/doc/css/page-layout-test.rst
Simple merge

diff --cc m.css/doc/css/page-layout.rst
Simple merge

diff --cc m.css/doc/css/themes.rst
Simple merge

diff --cc m.css/doc/css/typography-test.rst
Simple merge

diff --cc m.css/doc/css/typography.rst
Simple merge

diff --cc m.css/doc/documentation.rst
Simple merge

diff --cc m.css/doc/documentation/corrade.tag
Simple merge

diff --cc m.css/doc/documentation/doxygen-test.rst
Simple merge

diff --cc m.css/doc/documentation/doxygen.rst
Simple merge

diff --cc m.css/doc/documentation/python.rst
Simple merge

diff --cc m.css/doc/examples/article-hide-summary.rst
Simple merge

diff --cc m.css/doc/examples/article.rst
Simple merge

diff --cc m.css/doc/examples/jumbo-article-hide-summary.rst
Simple merge

diff --cc m.css/doc/examples/jumbo-article.rst
Simple merge

diff --cc m.css/doc/index.rst
Simple merge

diff --cc m.css/doc/plugins.rst
Simple merge

diff --cc m.css/doc/plugins/components-test.rst
Simple merge

diff --cc m.css/doc/plugins/components.rst
Simple merge

diff --cc m.css/doc/plugins/htmlsanity.rst
Simple merge

diff --cc m.css/doc/plugins/images-test.rst
Simple merge

diff --cc m.css/doc/plugins/images.rst
Simple merge

diff --cc m.css/doc/plugins/links.rst
Simple merge

diff --cc m.css/doc/plugins/math-and-code-test.rst
Simple merge

diff --cc m.css/doc/plugins/math-and-code.rst
Simple merge

diff --cc m.css/doc/plugins/metadata.rst
Simple merge

diff --cc m.css/doc/plugins/plots-and-graphs-test.rst
Simple merge

diff --cc m.css/doc/plugins/plots-and-graphs.rst
Simple merge

diff --cc m.css/doc/plugins/sphinx.rst
Simple merge

diff --cc m.css/doc/themes.rst
Simple merge

diff --cc m.css/doc/themes/pelican.rst
Simple merge

diff --cc m.css/doc/themes/writing-rst-content.rst
Simple merge

diff --cc m.css/doc/why.rst
Simple merge

diff --cc m.css/documentation/.coveragerc
Simple merge

diff --cc m.css/documentation/__init__.py
Simple merge

diff --cc m.css/documentation/_search.py
Simple merge

diff --cc m.css/documentation/doxygen.py
Simple merge

diff --cc m.css/documentation/python.py
Simple merge

diff --cc m.css/documentation/search.js
Simple merge

diff --cc m.css/documentation/templates/python/details-function.html
Simple merge

diff --cc m.css/documentation/templates/python/entry-data.html
Simple merge

diff --cc m.css/documentation/templates/python/entry-function.html
Simple merge

diff --cc m.css/documentation/templates/python/stub.pyi
index 0000000000000000000000000000000000000000,9431c0e7e9147391afc442f3d39f4dd180711f08..9431c0e7e9147391afc442f3d39f4dd180711f08
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/templates/python/stub.pyi
+++ b/m.css/documentation/templates/python/stub.pyi

diff --cc m.css/documentation/test/__init__.py
Simple merge

diff --cc m.css/documentation/test/_search_test_metadata.py
Simple merge

diff --cc m.css/documentation/test/populate-js-test-data.py
Simple merge

diff --cc m.css/documentation/test/test-search.js
Simple merge

diff --cc m.css/documentation/test/test_search.py
Simple merge

diff --cc m.css/documentation/test_doxygen/__init__.py
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_includes/First.h
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_includes/Second.h
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_includes/group__group.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_includes/namespaceContained-stupid.html
index 0000000000000000000000000000000000000000,01d6b3a6851c4f69f130999100f2841d21bf6379..01d6b3a6851c4f69f130999100f2841d21bf6379
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/compound_includes/namespaceContained-stupid.html
+++ b/m.css/documentation/test_doxygen/compound_includes/namespaceContained-stupid.html

diff --cc m.css/documentation/test_doxygen/compound_includes/namespaceContained.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_includes/namespaceSpread.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_includes/structSpreadClass-1818.html
index 0000000000000000000000000000000000000000,b66c90f32a5f731c0eb34fb6b5fd1c6b3bb76c19..b66c90f32a5f731c0eb34fb6b5fd1c6b3bb76c19
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/compound_includes/structSpreadClass-1818.html
+++ b/m.css/documentation/test_doxygen/compound_includes/structSpreadClass-1818.html

diff --cc m.css/documentation/test_doxygen/compound_includes/structSpreadClass.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_includes_disabled/group__group.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_includes_disabled/namespaceContained-stupid.html
index 0000000000000000000000000000000000000000,044aeb3dc189a308db10828bef422a667ee4db44..044aeb3dc189a308db10828bef422a667ee4db44
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/compound_includes_disabled/namespaceContained-stupid.html
+++ b/m.css/documentation/test_doxygen/compound_includes_disabled/namespaceContained-stupid.html

diff --cc m.css/documentation/test_doxygen/compound_includes_disabled/namespaceContained.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_includes_disabled/namespaceSpread.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_includes_disabled/structSpreadClass.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_includes_strip_from_path/Data_8h.html
index 0000000000000000000000000000000000000000,f294c287cfdce61ba4d26d203d47b2b6afaa23c2..f294c287cfdce61ba4d26d203d47b2b6afaa23c2
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/compound_includes_strip_from_path/Data_8h.html
+++ b/m.css/documentation/test_doxygen/compound_includes_strip_from_path/Data_8h.html

diff --cc m.css/documentation/test_doxygen/compound_includes_strip_from_path/Doxyfile
index 0000000000000000000000000000000000000000,34154d6a70eecb876d441d3c207153a89ded3714..34154d6a70eecb876d441d3c207153a89ded3714
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/compound_includes_strip_from_path/Doxyfile
+++ b/m.css/documentation/test_doxygen/compound_includes_strip_from_path/Doxyfile

diff --cc m.css/documentation/test_doxygen/compound_includes_strip_from_path/Library_8h.html
index 0000000000000000000000000000000000000000,452ad8d6de9307a0fab76cc1a7feb58ac3f9d7c9..452ad8d6de9307a0fab76cc1a7feb58ac3f9d7c9
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/compound_includes_strip_from_path/Library_8h.html
+++ b/m.css/documentation/test_doxygen/compound_includes_strip_from_path/Library_8h.html

diff --cc m.css/documentation/test_doxygen/compound_includes_strip_from_path/classLibrary_1_1Class.html
index 0000000000000000000000000000000000000000,83ad07c1611bc106cc0f601b1c861ea44c943a5b..83ad07c1611bc106cc0f601b1c861ea44c943a5b
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/compound_includes_strip_from_path/classLibrary_1_1Class.html
+++ b/m.css/documentation/test_doxygen/compound_includes_strip_from_path/classLibrary_1_1Class.html

diff --cc m.css/documentation/test_doxygen/compound_includes_strip_from_path/dir_d44c64559bbebec7f509842c48db8b23.html
index 0000000000000000000000000000000000000000,c607a75a51dd3af20d60a1a47b6ee5dfb2242eae..c607a75a51dd3af20d60a1a47b6ee5dfb2242eae
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/compound_includes_strip_from_path/dir_d44c64559bbebec7f509842c48db8b23.html
+++ b/m.css/documentation/test_doxygen/compound_includes_strip_from_path/dir_d44c64559bbebec7f509842c48db8b23.html

diff --cc m.css/documentation/test_doxygen/compound_includes_strip_from_path/dir_f3b5534f769798fe34f6616e7fe90e4d.html
index 0000000000000000000000000000000000000000,202579979c7c109b022c39a358842c1f1417e0ef..202579979c7c109b022c39a358842c1f1417e0ef
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/compound_includes_strip_from_path/dir_f3b5534f769798fe34f6616e7fe90e4d.html
+++ b/m.css/documentation/test_doxygen/compound_includes_strip_from_path/dir_f3b5534f769798fe34f6616e7fe90e4d.html

diff --cc m.css/documentation/test_doxygen/compound_includes_strip_from_path/example_8cpp.html
index 0000000000000000000000000000000000000000,031a9f54e4cf4a4bbda8fe36d0b910824f6fe2fe..031a9f54e4cf4a4bbda8fe36d0b910824f6fe2fe
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/compound_includes_strip_from_path/example_8cpp.html
+++ b/m.css/documentation/test_doxygen/compound_includes_strip_from_path/example_8cpp.html

diff --cc m.css/documentation/test_doxygen/compound_includes_strip_from_path/files.html
index 0000000000000000000000000000000000000000,3c7306cc26fab321bb521613fa464ccccd96f462..3c7306cc26fab321bb521613fa464ccccd96f462
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/compound_includes_strip_from_path/files.html
+++ b/m.css/documentation/test_doxygen/compound_includes_strip_from_path/files.html

diff --cc m.css/documentation/test_doxygen/compound_includes_strip_from_path/input.dox
index 0000000000000000000000000000000000000000,5a3b131843f24463dfb72c92f351efd5974514eb..5a3b131843f24463dfb72c92f351efd5974514eb
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/compound_includes_strip_from_path/input.dox
+++ b/m.css/documentation/test_doxygen/compound_includes_strip_from_path/input.dox

diff --cc m.css/documentation/test_doxygen/compound_includes_strip_from_path/namespaceLibrary.html
index 0000000000000000000000000000000000000000,fd8827a69e30ca82844fc6ecbc0f58bc3d502593..fd8827a69e30ca82844fc6ecbc0f58bc3d502593
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/compound_includes_strip_from_path/namespaceLibrary.html
+++ b/m.css/documentation/test_doxygen/compound_includes_strip_from_path/namespaceLibrary.html

diff --cc m.css/documentation/test_doxygen/compound_includes_strip_from_path/namespaceLibrary_1_1Helper.html
index 0000000000000000000000000000000000000000,72d60e61ecaf1f01696172b3f6597f7088f3468c..72d60e61ecaf1f01696172b3f6597f7088f3468c
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/compound_includes_strip_from_path/namespaceLibrary_1_1Helper.html
+++ b/m.css/documentation/test_doxygen/compound_includes_strip_from_path/namespaceLibrary_1_1Helper.html

diff --cc m.css/documentation/test_doxygen/compound_includes_strip_from_path/project/examples/example.cpp
index 0000000000000000000000000000000000000000,0bf762ae264474dc42b6c7073def15aa270b6bd2..0bf762ae264474dc42b6c7073def15aa270b6bd2
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/compound_includes_strip_from_path/project/examples/example.cpp
+++ b/m.css/documentation/test_doxygen/compound_includes_strip_from_path/project/examples/example.cpp

diff --cc m.css/documentation/test_doxygen/compound_includes_strip_from_path/project/include/Library/Data.h
index 0000000000000000000000000000000000000000,77e115c9de853daf7b660db009d3e427add21a32..77e115c9de853daf7b660db009d3e427add21a32
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/compound_includes_strip_from_path/project/include/Library/Data.h
+++ b/m.css/documentation/test_doxygen/compound_includes_strip_from_path/project/include/Library/Data.h

diff --cc m.css/documentation/test_doxygen/compound_includes_strip_from_path/project/include/Library/Library.h
index 0000000000000000000000000000000000000000,fd1088cb3fdf0ad263f2749b1894ce9a7fab3612..fd1088cb3fdf0ad263f2749b1894ce9a7fab3612
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/compound_includes_strip_from_path/project/include/Library/Library.h
+++ b/m.css/documentation/test_doxygen/compound_includes_strip_from_path/project/include/Library/Library.h

diff --cc m.css/documentation/test_doxygen/compound_includes_strip_from_path/structLibrary_1_1Struct.html
index 0000000000000000000000000000000000000000,7b28afdfed56bc912873882106d504b840d09cb2..7b28afdfed56bc912873882106d504b840d09cb2
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/compound_includes_strip_from_path/structLibrary_1_1Struct.html
+++ b/m.css/documentation/test_doxygen/compound_includes_strip_from_path/structLibrary_1_1Struct.html

diff --cc m.css/documentation/test_doxygen/compound_includes_undocumented_files/First.h
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_includes_undocumented_files/Second.h
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_inline_namespace/File.h
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_inline_namespace/File_8h.html
index 0000000000000000000000000000000000000000,551cb5205663ea38b5a0f278fdbd2bd10f162417..551cb5205663ea38b5a0f278fdbd2bd10f162417
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/compound_inline_namespace/File_8h.html
+++ b/m.css/documentation/test_doxygen/compound_inline_namespace/File_8h.html

diff --cc m.css/documentation/test_doxygen/compound_listing/Directory/Sub/Class.h
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_listing/Doxyfile
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_listing/Doxyfile-strip-from-path
index 0000000000000000000000000000000000000000,25a75dca30a117734f9925c59f8ff1402c51d1c1..25a75dca30a117734f9925c59f8ff1402c51d1c1
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/compound_listing/Doxyfile-strip-from-path
+++ b/m.css/documentation/test_doxygen/compound_listing/Doxyfile-strip-from-path

diff --cc m.css/documentation/test_doxygen/compound_listing/classRoot_1_1Directory_1_1Sub_1_1Class.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_modules_in_namespace/file3_8h-stupid.html
index 0000000000000000000000000000000000000000,11a3fc905930cdd574667cc2a327916fa15b68b2..11a3fc905930cdd574667cc2a327916fa15b68b2
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/compound_modules_in_namespace/file3_8h-stupid.html
+++ b/m.css/documentation/test_doxygen/compound_modules_in_namespace/file3_8h-stupid.html

diff --cc m.css/documentation/test_doxygen/compound_modules_in_namespace/namespaceNamespace-stupid.html
index 0000000000000000000000000000000000000000,3f1d12a7afcb667f7f966ca36972c7ec067736ac..3f1d12a7afcb667f7f966ca36972c7ec067736ac
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/compound_modules_in_namespace/namespaceNamespace-stupid.html
+++ b/m.css/documentation/test_doxygen/compound_modules_in_namespace/namespaceNamespace-stupid.html

diff --cc m.css/documentation/test_doxygen/compound_no_full_path_names/doc/Doxyfile
index 0000000000000000000000000000000000000000,68aadcf4744da3420fb08695e8e4913bbd0e3820..68aadcf4744da3420fb08695e8e4913bbd0e3820
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/compound_no_full_path_names/doc/Doxyfile
+++ b/m.css/documentation/test_doxygen/compound_no_full_path_names/doc/Doxyfile

diff --cc m.css/documentation/test_doxygen/compound_no_full_path_names/files.html
index 0000000000000000000000000000000000000000,4e07d8c64feb03a2febeb989931cd9f4102ab59f..4e07d8c64feb03a2febeb989931cd9f4102ab59f
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/compound_no_full_path_names/files.html
+++ b/m.css/documentation/test_doxygen/compound_no_full_path_names/files.html

diff --cc m.css/documentation/test_doxygen/compound_no_full_path_names/project/directory/sub.h
index 0000000000000000000000000000000000000000,2d98ffa19b0b89b3dea5180a18ff681125d063dd..2d98ffa19b0b89b3dea5180a18ff681125d063dd
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/compound_no_full_path_names/project/directory/sub.h
+++ b/m.css/documentation/test_doxygen/compound_no_full_path_names/project/directory/sub.h

diff --cc m.css/documentation/test_doxygen/compound_no_full_path_names/project/root.h
index 0000000000000000000000000000000000000000,793c3e70349e7be6b77b1587d1e2b6ee7593e6d8..793c3e70349e7be6b77b1587d1e2b6ee7593e6d8
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/compound_no_full_path_names/project/root.h
+++ b/m.css/documentation/test_doxygen/compound_no_full_path_names/project/root.h

diff --cc m.css/documentation/test_doxygen/contents_anchor_in_both_group_and_namespace/group__fizzbuzz.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_anchor_in_both_group_and_namespace/namespaceFoo-stupid.html
index 0000000000000000000000000000000000000000,aa4dd52b07aa70abab4a71c99f45cb93c426a482..aa4dd52b07aa70abab4a71c99f45cb93c426a482
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_anchor_in_both_group_and_namespace/namespaceFoo-stupid.html
+++ b/m.css/documentation/test_doxygen/contents_anchor_in_both_group_and_namespace/namespaceFoo-stupid.html

diff --cc m.css/documentation/test_doxygen/contents_autobrief_blockquote/File_8h-111.html
index 0000000000000000000000000000000000000000,65d2e34e39102617321bf6f51bb9e89a7ce440c2..65d2e34e39102617321bf6f51bb9e89a7ce440c2
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_autobrief_blockquote/File_8h-111.html
+++ b/m.css/documentation/test_doxygen/contents_autobrief_blockquote/File_8h-111.html

diff --cc m.css/documentation/test_doxygen/contents_autobrief_blockquote/File_8h.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_blockquote/index-pygments29.html
index 0000000000000000000000000000000000000000,350ff819c53ffc60f655b4ad34e205ec58797daf..350ff819c53ffc60f655b4ad34e205ec58797daf
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_blockquote/index-pygments29.html
+++ b/m.css/documentation/test_doxygen/contents_blockquote/index-pygments29.html

diff --cc m.css/documentation/test_doxygen/contents_blockquote/index.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_blocks/index.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_blocks/input.dox
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_code/index-pygments29.html
index 0000000000000000000000000000000000000000,4d8ef825940b0d49ecd4abfe65f99ccc22fc91fa..4d8ef825940b0d49ecd4abfe65f99ccc22fc91fa
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_code/index-pygments29.html
+++ b/m.css/documentation/test_doxygen/contents_code/index-pygments29.html

diff --cc m.css/documentation/test_doxygen/contents_code/index.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_code/warnings-pygments29.html
index 0000000000000000000000000000000000000000,f578422a988c5dc94e30caa39ab79776216a5406..f578422a988c5dc94e30caa39ab79776216a5406
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_code/warnings-pygments29.html
+++ b/m.css/documentation/test_doxygen/contents_code/warnings-pygments29.html

diff --cc m.css/documentation/test_doxygen/contents_code/warnings.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_code_filters/index-pygments210.html
index 0000000000000000000000000000000000000000,c8d5dc86c383d0fe303f7ca254e949eb43ffe646..c8d5dc86c383d0fe303f7ca254e949eb43ffe646
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_code_filters/index-pygments210.html
+++ b/m.css/documentation/test_doxygen/contents_code_filters/index-pygments210.html

diff --cc m.css/documentation/test_doxygen/contents_code_filters/index.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_code_language/index-pygments213.html
index 0000000000000000000000000000000000000000,164451ca70af9173bc780a68ff4d5a550e613389..164451ca70af9173bc780a68ff4d5a550e613389
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_code_language/index-pygments213.html
+++ b/m.css/documentation/test_doxygen/contents_code_language/index-pygments213.html

diff --cc m.css/documentation/test_doxygen/contents_code_language/index-pygments29.html
index 0000000000000000000000000000000000000000,a4609029a61b722342354ec749855ae8b1918a59..a4609029a61b722342354ec749855ae8b1918a59
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_code_language/index-pygments29.html
+++ b/m.css/documentation/test_doxygen/contents_code_language/index-pygments29.html

diff --cc m.css/documentation/test_doxygen/contents_code_language/index.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_custom/dot-2.html
index 0000000000000000000000000000000000000000,153e4ebf88f1e6a0bf9a102febe4380d42e86bbe..153e4ebf88f1e6a0bf9a102febe4380d42e86bbe
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_custom/dot-2.html
+++ b/m.css/documentation/test_doxygen/contents_custom/dot-2.html

diff --cc m.css/documentation/test_doxygen/contents_custom/dot.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_custom/index-pygments29.html
index 0000000000000000000000000000000000000000,d27e67f1b9c9737b84eea10b24cc98f53098a1d8..d27e67f1b9c9737b84eea10b24cc98f53098a1d8
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_custom/index-pygments29.html
+++ b/m.css/documentation/test_doxygen/contents_custom/index-pygments29.html

diff --cc m.css/documentation/test_doxygen/contents_custom/index.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_custom/math.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_dot/index-2.html
index 0000000000000000000000000000000000000000,7ebadebfaa926a69b6c682cf0613f4e6648f5983..7ebadebfaa926a69b6c682cf0613f4e6648f5983
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_dot/index-2.html
+++ b/m.css/documentation/test_doxygen/contents_dot/index-2.html

diff --cc m.css/documentation/test_doxygen/contents_dot/index.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_html_escape/Doxyfile
index 0000000000000000000000000000000000000000,a511c1f6f097855b070295c6817a6c31682884af..a511c1f6f097855b070295c6817a6c31682884af
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_html_escape/Doxyfile
+++ b/m.css/documentation/test_doxygen/contents_html_escape/Doxyfile

diff --cc m.css/documentation/test_doxygen/contents_html_escape/Fi&le.h
index 0000000000000000000000000000000000000000,4f67459918a8897e61cd42d1266147a506eee41a..4f67459918a8897e61cd42d1266147a506eee41a
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_html_escape/Fi&le.h
+++ b/m.css/documentation/test_doxygen/contents_html_escape/Fi&le.h

diff --cc m.css/documentation/test_doxygen/contents_html_escape/Fi_6le_8h.html
index 0000000000000000000000000000000000000000,2a961c839e4d3c7a54ce90807bc19e2b71624b7c..2a961c839e4d3c7a54ce90807bc19e2b71624b7c
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_html_escape/Fi_6le_8h.html
+++ b/m.css/documentation/test_doxygen/contents_html_escape/Fi_6le_8h.html

diff --cc m.css/documentation/test_doxygen/contents_html_escape/annotated.html
index 0000000000000000000000000000000000000000,a82c6f7b2c0a70ed0b95815f3cf245a2188ef348..a82c6f7b2c0a70ed0b95815f3cf245a2188ef348
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_html_escape/annotated.html
+++ b/m.css/documentation/test_doxygen/contents_html_escape/annotated.html

diff --cc m.css/documentation/test_doxygen/contents_html_escape/files.html
index 0000000000000000000000000000000000000000,8d66fad8bcb1ffd3e401b1fefc0e69caf1fe8b44..8d66fad8bcb1ffd3e401b1fefc0e69caf1fe8b44
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_html_escape/files.html
+++ b/m.css/documentation/test_doxygen/contents_html_escape/files.html

diff --cc m.css/documentation/test_doxygen/contents_html_escape/page-1820.html
index 0000000000000000000000000000000000000000,e4b4bdc03de1bbb543baaa7fcc2656826d13e659..e4b4bdc03de1bbb543baaa7fcc2656826d13e659
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_html_escape/page-1820.html
+++ b/m.css/documentation/test_doxygen/contents_html_escape/page-1820.html

diff --cc m.css/documentation/test_doxygen/contents_html_escape/page.dox
index 0000000000000000000000000000000000000000,113cd8b7b8cc97461661f25a0dbef5d0bda80dac..113cd8b7b8cc97461661f25a0dbef5d0bda80dac
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_html_escape/page.dox
+++ b/m.css/documentation/test_doxygen/contents_html_escape/page.dox

diff --cc m.css/documentation/test_doxygen/contents_html_escape/page.html
index 0000000000000000000000000000000000000000,8e3cfa227375109e4cace1a1748bbeddd841923c..8e3cfa227375109e4cace1a1748bbeddd841923c
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_html_escape/page.html
+++ b/m.css/documentation/test_doxygen/contents_html_escape/page.html

diff --cc m.css/documentation/test_doxygen/contents_html_escape/pages.html
index 0000000000000000000000000000000000000000,c328f2389fb437fd735043644d9afe41bea576d3..c328f2389fb437fd735043644d9afe41bea576d3
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_html_escape/pages.html
+++ b/m.css/documentation/test_doxygen/contents_html_escape/pages.html

diff --cc m.css/documentation/test_doxygen/contents_html_escape/structClass.html
index 0000000000000000000000000000000000000000,c492ef9acbece0ea3193fe34b74b40ec31c36f3e..c492ef9acbece0ea3193fe34b74b40ec31c36f3e
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_html_escape/structClass.html
+++ b/m.css/documentation/test_doxygen/contents_html_escape/structClass.html

diff --cc m.css/documentation/test_doxygen/contents_html_escape/structSub_3_01char_00_01T_01_4.html
index 0000000000000000000000000000000000000000,849c147cf7e14199d4b689a12f0d32b558915dab..849c147cf7e14199d4b689a12f0d32b558915dab
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_html_escape/structSub_3_01char_00_01T_01_4.html
+++ b/m.css/documentation/test_doxygen/contents_html_escape/structSub_3_01char_00_01T_01_4.html

diff --cc m.css/documentation/test_doxygen/contents_html_escape/structSub_3_01char_00_01T_01_4_1_1Nested.html
index 0000000000000000000000000000000000000000,a95dec43fc113f55d90284bfd83bafc69ded40f4..a95dec43fc113f55d90284bfd83bafc69ded40f4
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_html_escape/structSub_3_01char_00_01T_01_4_1_1Nested.html
+++ b/m.css/documentation/test_doxygen/contents_html_escape/structSub_3_01char_00_01T_01_4_1_1Nested.html

diff --cc m.css/documentation/test_doxygen/contents_html_escape/tiny.png
index 0000000000000000000000000000000000000000,79abd3ca51e64ea5682caa21e1bbe86fe54dc212..79abd3ca51e64ea5682caa21e1bbe86fe54dc212
mode 000000,120000..120000
--- /dev/null
--- 2/documentation/test_doxygen/contents_html_escape/tiny.png
+++ b/m.css/documentation/test_doxygen/contents_html_escape/tiny.png

diff --cc m.css/documentation/test_doxygen/contents_htmlonly_htmlinclude/warnings.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_image/index-1820.html
index 0000000000000000000000000000000000000000,52b00053d4f29f915be2f5409a571f15bbbe7f26..52b00053d4f29f915be2f5409a571f15bbbe7f26
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_image/index-1820.html
+++ b/m.css/documentation/test_doxygen/contents_image/index-1820.html

diff --cc m.css/documentation/test_doxygen/contents_image/index.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_image/input.dox
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_math_cached/math-197.html
index 0000000000000000000000000000000000000000,26b4db20df104d0be8dcdc3bc007435c216eed4b..26b4db20df104d0be8dcdc3bc007435c216eed4b
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_math_cached/math-197.html
+++ b/m.css/documentation/test_doxygen/contents_math_cached/math-197.html

diff --cc m.css/documentation/test_doxygen/contents_math_cached/math.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_math_code_fallback/Doxyfile
index 0000000000000000000000000000000000000000,fa824055b1858e785c275a3b43597aa92103ce28..fa824055b1858e785c275a3b43597aa92103ce28
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_math_code_fallback/Doxyfile
+++ b/m.css/documentation/test_doxygen/contents_math_code_fallback/Doxyfile

diff --cc m.css/documentation/test_doxygen/contents_math_code_fallback/index-191.html
index 0000000000000000000000000000000000000000,5b84e7a52cc45311e8e675df903122d0e157b8d4..5b84e7a52cc45311e8e675df903122d0e157b8d4
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_math_code_fallback/index-191.html
+++ b/m.css/documentation/test_doxygen/contents_math_code_fallback/index-191.html

diff --cc m.css/documentation/test_doxygen/contents_math_code_fallback/index.html
index 0000000000000000000000000000000000000000,f4a0fcef245921b08e4bd71cc284167799e56dbb..f4a0fcef245921b08e4bd71cc284167799e56dbb
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_math_code_fallback/index.html
+++ b/m.css/documentation/test_doxygen/contents_math_code_fallback/index.html

diff --cc m.css/documentation/test_doxygen/contents_math_code_fallback/input.dox
index 0000000000000000000000000000000000000000,a6be00a8334d201fdf153f9c52b6f55cc0c3c0af..a6be00a8334d201fdf153f9c52b6f55cc0c3c0af
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_math_code_fallback/input.dox
+++ b/m.css/documentation/test_doxygen/contents_math_code_fallback/input.dox

diff --cc m.css/documentation/test_doxygen/contents_sections_headings/Warnings.h
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_sections_headings/Warnings_8h-110.html
index 0000000000000000000000000000000000000000,67834d3d9165526855764aa6ae2b867d48280978..67834d3d9165526855764aa6ae2b867d48280978
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_sections_headings/Warnings_8h-110.html
+++ b/m.css/documentation/test_doxygen/contents_sections_headings/Warnings_8h-110.html

diff --cc m.css/documentation/test_doxygen/contents_sections_headings/Warnings_8h.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_sections_headings/index.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_sections_headings/warnings-110.html
index 0000000000000000000000000000000000000000,b36b46080d0bfad10d6ea5b126db9dcc440dc2e2..b36b46080d0bfad10d6ea5b126db9dcc440dc2e2
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_sections_headings/warnings-110.html
+++ b/m.css/documentation/test_doxygen/contents_sections_headings/warnings-110.html

diff --cc m.css/documentation/test_doxygen/contents_sections_headings/warnings.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_tagfile/index-pygments29.html
index 0000000000000000000000000000000000000000,60048eb33cde2ebd5f6edbd69454d318d9a773bf..60048eb33cde2ebd5f6edbd69454d318d9a773bf
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_tagfile/index-pygments29.html
+++ b/m.css/documentation/test_doxygen/contents_tagfile/index-pygments29.html

diff --cc m.css/documentation/test_doxygen/contents_tagfile/index.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_tagfile/input.dox
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_typography/index.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_typography/indexpage_1817.xml
index 0000000000000000000000000000000000000000,e4487105731e60d909f6f6444b1246d2e0f541ca..e4487105731e60d909f6f6444b1246d2e0f541ca
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_typography/indexpage_1817.xml
+++ b/m.css/documentation/test_doxygen/contents_typography/indexpage_1817.xml

diff --cc m.css/documentation/test_doxygen/contents_typography/input.dox
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_unexpected_sections/File_8h.html
Simple merge

diff --cc m.css/documentation/test_doxygen/cpp_enum/Doxyfile
Simple merge

diff --cc m.css/documentation/test_doxygen/cpp_enum/File.h
Simple merge

diff --cc m.css/documentation/test_doxygen/cpp_enum/File_8h.html
Simple merge

diff --cc m.css/documentation/test_doxygen/cpp_function_variable_attributes/Doxyfile
Simple merge

diff --cc m.css/documentation/test_doxygen/cpp_function_variable_attributes/classBase.html
Simple merge

diff --cc m.css/documentation/test_doxygen/cpp_function_variable_attributes/classDerived.html
Simple merge

diff --cc m.css/documentation/test_doxygen/cpp_function_variable_attributes/input.h
Simple merge

diff --cc m.css/documentation/test_doxygen/cpp_function_variable_attributes/structFinal.html
Simple merge

diff --cc m.css/documentation/test_doxygen/cpp_function_variable_attributes/structFoo.html
Simple merge

diff --cc m.css/documentation/test_doxygen/example/path-prefix_2CMakeLists_8txt-example-pygments210.html
index 0000000000000000000000000000000000000000,65d0cebc79f8553709afc7a2dfd882f17fd876a5..65d0cebc79f8553709afc7a2dfd882f17fd876a5
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/example/path-prefix_2CMakeLists_8txt-example-pygments210.html
+++ b/m.css/documentation/test_doxygen/example/path-prefix_2CMakeLists_8txt-example-pygments210.html

diff --cc m.css/documentation/test_doxygen/example/path-prefix_2CMakeLists_8txt-example.html
Simple merge

diff --cc m.css/documentation/test_doxygen/example/path-prefix_2main_8cpp-example-pygments29.html
index 0000000000000000000000000000000000000000,948e5bf073ee43f3ad2a58057d605569ead832fe..948e5bf073ee43f3ad2a58057d605569ead832fe
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/example/path-prefix_2main_8cpp-example-pygments29.html
+++ b/m.css/documentation/test_doxygen/example/path-prefix_2main_8cpp-example-pygments29.html

diff --cc m.css/documentation/test_doxygen/example/path-prefix_2main_8cpp-example.html
Simple merge

diff --cc m.css/documentation/test_doxygen/ignored_languages/Doxyfile
index 0000000000000000000000000000000000000000,5d5a7d375a27d7b78a73bd1a9f959cf81e41bf42..5d5a7d375a27d7b78a73bd1a9f959cf81e41bf42
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/ignored_languages/Doxyfile
+++ b/m.css/documentation/test_doxygen/ignored_languages/Doxyfile

diff --cc m.css/documentation/test_doxygen/ignored_languages/file.c
index 0000000000000000000000000000000000000000,c22bc1dfc8b466f650e3dbdd6de8e894e11ad2a6..c22bc1dfc8b466f650e3dbdd6de8e894e11ad2a6
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/ignored_languages/file.c
+++ b/m.css/documentation/test_doxygen/ignored_languages/file.c

diff --cc m.css/documentation/test_doxygen/ignored_languages/file.cs
index 0000000000000000000000000000000000000000,72766808d61b3092ac653555fa9c21bd5b8c9ebf..72766808d61b3092ac653555fa9c21bd5b8c9ebf
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/ignored_languages/file.cs
+++ b/m.css/documentation/test_doxygen/ignored_languages/file.cs

diff --cc m.css/documentation/test_doxygen/ignored_languages/file.java
index 0000000000000000000000000000000000000000,654be44a86da64288a884dfc10da970a6f6a9780..654be44a86da64288a884dfc10da970a6f6a9780
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/ignored_languages/file.java
+++ b/m.css/documentation/test_doxygen/ignored_languages/file.java

diff --cc m.css/documentation/test_doxygen/ignored_languages/file.py
index 0000000000000000000000000000000000000000,2feed9478d30386065c5ea2532d9bf1101d2f5e4..2feed9478d30386065c5ea2532d9bf1101d2f5e4
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/ignored_languages/file.py
+++ b/m.css/documentation/test_doxygen/ignored_languages/file.py

diff --cc m.css/documentation/test_doxygen/ignored_languages/file_8c.html
index 0000000000000000000000000000000000000000,fa99fe2d32e328e72cdc16244ab2d9152c8bd1da..fa99fe2d32e328e72cdc16244ab2d9152c8bd1da
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/ignored_languages/file_8c.html
+++ b/m.css/documentation/test_doxygen/ignored_languages/file_8c.html

diff --cc m.css/documentation/test_doxygen/search_long_suffix_length/File.h
Simple merge

diff --cc m.css/documentation/test_doxygen/test_compound.py
Simple merge

diff --cc m.css/documentation/test_doxygen/test_contents.py
Simple merge

diff --cc m.css/documentation/test_doxygen/test_cpp.py
Simple merge

diff --cc m.css/documentation/test_doxygen/test_doxyfile.py
Simple merge

diff --cc m.css/documentation/test_doxygen/test_example.py
Simple merge

diff --cc m.css/documentation/test_doxygen/test_ignored.py
Simple merge

diff --cc m.css/documentation/test_doxygen/test_layout.py
Simple merge

diff --cc m.css/documentation/test_doxygen/test_page.py
Simple merge

diff --cc m.css/documentation/test_doxygen/test_search.py
Simple merge

diff --cc m.css/documentation/test_doxygen/test_undocumented.py
Simple merge

diff --cc m.css/documentation/test_doxygen/test_utility.py
Simple merge

diff --cc m.css/documentation/test_doxygen/undocumented/Directory/File.h
Simple merge

diff --cc m.css/documentation/test_doxygen/undocumented/File_8h-stupid.html
index 0000000000000000000000000000000000000000,4b7df5c2194407421e2718adbdc422bc18b57790..4b7df5c2194407421e2718adbdc422bc18b57790
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/undocumented/File_8h-stupid.html
+++ b/m.css/documentation/test_doxygen/undocumented/File_8h-stupid.html

diff --cc m.css/documentation/test_doxygen/undocumented/namespaceNamespace-stupid.html
index 0000000000000000000000000000000000000000,c9dea0343a35a51e6d300c9edb10bf5f1d42b14d..c9dea0343a35a51e6d300c9edb10bf5f1d42b14d
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/undocumented/namespaceNamespace-stupid.html
+++ b/m.css/documentation/test_doxygen/undocumented/namespaceNamespace-stupid.html

diff --cc m.css/documentation/test_python/CMakeLists.txt
Simple merge

diff --cc m.css/documentation/test_python/__init__.py
Simple merge

diff --cc m.css/documentation/test_python/content_html_escape/content_html_escape.Class.html
index 0000000000000000000000000000000000000000,4d7e0b77a8a84750c28b819d0d98f86f7e52acf4..4d7e0b77a8a84750c28b819d0d98f86f7e52acf4
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/content_html_escape/content_html_escape.Class.html
+++ b/m.css/documentation/test_python/content_html_escape/content_html_escape.Class.html

diff --cc m.css/documentation/test_python/content_html_escape/content_html_escape.html
index 0000000000000000000000000000000000000000,5d63da287297ba679de86ed931d02f30f2378058..5d63da287297ba679de86ed931d02f30f2378058
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/content_html_escape/content_html_escape.html
+++ b/m.css/documentation/test_python/content_html_escape/content_html_escape.html

diff --cc m.css/documentation/test_python/content_html_escape/content_html_escape.pybind.html
index 0000000000000000000000000000000000000000,12f29771a1bd33e3984256df93713ba11bb67410..12f29771a1bd33e3984256df93713ba11bb67410
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/content_html_escape/content_html_escape.pybind.html
+++ b/m.css/documentation/test_python/content_html_escape/content_html_escape.pybind.html

diff --cc m.css/documentation/test_python/content_html_escape/content_html_escape/__init__.py
index 0000000000000000000000000000000000000000,d51eedcea42540792d933ca4e4642f829eb6abee..d51eedcea42540792d933ca4e4642f829eb6abee
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/content_html_escape/content_html_escape/__init__.py
+++ b/m.css/documentation/test_python/content_html_escape/content_html_escape/__init__.py

diff --cc m.css/documentation/test_python/content_html_escape/content_html_escape/pybind.cpp
index 0000000000000000000000000000000000000000,9c6df58ddaaa9b5228cab3e5db2517f561f4478d..9c6df58ddaaa9b5228cab3e5db2517f561f4478d
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/content_html_escape/content_html_escape/pybind.cpp
+++ b/m.css/documentation/test_python/content_html_escape/content_html_escape/pybind.cpp

diff --cc m.css/documentation/test_python/content_html_escape/page.html
index 0000000000000000000000000000000000000000,d3c619665a5d00a9f762265b44a32bb601cf3158..d3c619665a5d00a9f762265b44a32bb601cf3158
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/content_html_escape/page.html
+++ b/m.css/documentation/test_python/content_html_escape/page.html

diff --cc m.css/documentation/test_python/content_html_escape/page.rst
index 0000000000000000000000000000000000000000,22a87341e162217f3a893ee1c852a49f96e99fed..22a87341e162217f3a893ee1c852a49f96e99fed
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/content_html_escape/page.rst
+++ b/m.css/documentation/test_python/content_html_escape/page.rst

diff --cc m.css/documentation/test_python/content_html_escape/pages.html
index 0000000000000000000000000000000000000000,e52b68231cb93a50b37a80d971b8738dc23489cc..e52b68231cb93a50b37a80d971b8738dc23489cc
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/content_html_escape/pages.html
+++ b/m.css/documentation/test_python/content_html_escape/pages.html

diff --cc m.css/documentation/test_python/content_html_escape/stubs/content_html_escape/__init__.pyi
index 0000000000000000000000000000000000000000,b2fd29b42a447382b33337f9e02f701376e763b4..b2fd29b42a447382b33337f9e02f701376e763b4
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/content_html_escape/stubs/content_html_escape/__init__.pyi
+++ b/m.css/documentation/test_python/content_html_escape/stubs/content_html_escape/__init__.pyi

diff --cc m.css/documentation/test_python/content_html_escape/stubs/content_html_escape/pybind.pyi
index 0000000000000000000000000000000000000000,55f92fe731062f6c6038d65010840f3eaae2b863..55f92fe731062f6c6038d65010840f3eaae2b863
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/content_html_escape/stubs/content_html_escape/pybind.pyi
+++ b/m.css/documentation/test_python/content_html_escape/stubs/content_html_escape/pybind.pyi

diff --cc m.css/documentation/test_python/inspect_all_property/inspect_all_property.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_all_property/inspect_all_property/__init__.py
Simple merge

diff --cc m.css/documentation/test_python/inspect_annotations/inspect_annotations-py37+38.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_annotations/inspect_annotations.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_annotations/inspect_annotations.py
Simple merge

diff --cc m.css/documentation/test_python/inspect_annotations/stubs/inspect_annotations-py36.pyi
index 0000000000000000000000000000000000000000,9868aabb472df2ed01cfe8518560bcae6ce17233..9868aabb472df2ed01cfe8518560bcae6ce17233
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/inspect_annotations/stubs/inspect_annotations-py36.pyi
+++ b/m.css/documentation/test_python/inspect_annotations/stubs/inspect_annotations-py36.pyi

diff --cc m.css/documentation/test_python/inspect_annotations/stubs/inspect_annotations-py37+38.pyi
index 0000000000000000000000000000000000000000,7a8d420391c375b0b21fe5366d2af7400f33542e..7a8d420391c375b0b21fe5366d2af7400f33542e
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/inspect_annotations/stubs/inspect_annotations-py37+38.pyi
+++ b/m.css/documentation/test_python/inspect_annotations/stubs/inspect_annotations-py37+38.pyi

diff --cc m.css/documentation/test_python/inspect_annotations/stubs/inspect_annotations.pyi
index 0000000000000000000000000000000000000000,42c2f30bf1812273a248c3b1ad5e021dadaa7cd4..42c2f30bf1812273a248c3b1ad5e021dadaa7cd4
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/inspect_annotations/stubs/inspect_annotations.pyi
+++ b/m.css/documentation/test_python/inspect_annotations/stubs/inspect_annotations.pyi

diff --cc m.css/documentation/test_python/inspect_attrs/docs.rst
Simple merge

diff --cc m.css/documentation/test_python/inspect_attrs/inspect_attrs.MySlotClass-attrs193.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_attrs/inspect_attrs.MySlotClass.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_attrs/stubs/inspect_attrs.pyi
index 0000000000000000000000000000000000000000,9acd8843b6a595df51008ed9efe946748fd4b9b0..9acd8843b6a595df51008ed9efe946748fd4b9b0
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/inspect_attrs/stubs/inspect_attrs.pyi
+++ b/m.css/documentation/test_python/inspect_attrs/stubs/inspect_attrs.pyi

diff --cc m.css/documentation/test_python/inspect_builtin/docs.rst
index 0000000000000000000000000000000000000000,48e606ecc65852b38162ce08f779148ee1eb42a1..48e606ecc65852b38162ce08f779148ee1eb42a1
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/inspect_builtin/docs.rst
+++ b/m.css/documentation/test_python/inspect_builtin/docs.rst

diff --cc m.css/documentation/test_python/inspect_builtin/inspect_builtin.BaseException-310.html
index 0000000000000000000000000000000000000000,2514edc4441b596551cc05fd2a30b8361b3cac4c..2514edc4441b596551cc05fd2a30b8361b3cac4c
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/inspect_builtin/inspect_builtin.BaseException-310.html
+++ b/m.css/documentation/test_python/inspect_builtin/inspect_builtin.BaseException-310.html

diff --cc m.css/documentation/test_python/inspect_builtin/inspect_builtin.BaseException.html
index 0000000000000000000000000000000000000000,7bee1af895fa63c89f37b4ddb3f5df9a1d5e469f..7bee1af895fa63c89f37b4ddb3f5df9a1d5e469f
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/inspect_builtin/inspect_builtin.BaseException.html
+++ b/m.css/documentation/test_python/inspect_builtin/inspect_builtin.BaseException.html

diff --cc m.css/documentation/test_python/inspect_builtin/inspect_builtin.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_builtin/inspect_builtin.py
index 0000000000000000000000000000000000000000,e7fe13e1764a95e88aa88be34500fa4524d42970..e7fe13e1764a95e88aa88be34500fa4524d42970
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/inspect_builtin/inspect_builtin.py
+++ b/m.css/documentation/test_python/inspect_builtin/inspect_builtin.py

diff --cc m.css/documentation/test_python/inspect_builtin/inspect_builtin36.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_builtin/inspect_builtin39.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_builtin/stubs/inspect_builtin-310.pyi
index 0000000000000000000000000000000000000000,35fcc671c5fa93d1254879596da31b5d20c6f76e..35fcc671c5fa93d1254879596da31b5d20c6f76e
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/inspect_builtin/stubs/inspect_builtin-310.pyi
+++ b/m.css/documentation/test_python/inspect_builtin/stubs/inspect_builtin-310.pyi

diff --cc m.css/documentation/test_python/inspect_builtin/stubs/inspect_builtin-36.pyi
index 0000000000000000000000000000000000000000,e7adbb7f6492f5569b05f8a546f235e2bc77d9a2..e7adbb7f6492f5569b05f8a546f235e2bc77d9a2
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/inspect_builtin/stubs/inspect_builtin-36.pyi
+++ b/m.css/documentation/test_python/inspect_builtin/stubs/inspect_builtin-36.pyi

diff --cc m.css/documentation/test_python/inspect_builtin/stubs/inspect_builtin.pyi
index 0000000000000000000000000000000000000000,acd0dd30b377cd1a84be617046eb3434c05d1d7e..acd0dd30b377cd1a84be617046eb3434c05d1d7e
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/inspect_builtin/stubs/inspect_builtin.pyi
+++ b/m.css/documentation/test_python/inspect_builtin/stubs/inspect_builtin.pyi

diff --cc m.css/documentation/test_python/inspect_name_mapping/stubs/inspect_name_mapping/__init__.py
index 0000000000000000000000000000000000000000,d09cdbc1c7865b21fbfb572a35ff1ac8776e1279..d09cdbc1c7865b21fbfb572a35ff1ac8776e1279
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/inspect_name_mapping/stubs/inspect_name_mapping/__init__.py
+++ b/m.css/documentation/test_python/inspect_name_mapping/stubs/inspect_name_mapping/__init__.py

diff --cc m.css/documentation/test_python/inspect_name_mapping/stubs/inspect_name_mapping/submodule.py
index 0000000000000000000000000000000000000000,1b9d468624f3b5804cd0c6a33b7f2762f8fe9457..1b9d468624f3b5804cd0c6a33b7f2762f8fe9457
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/inspect_name_mapping/stubs/inspect_name_mapping/submodule.py
+++ b/m.css/documentation/test_python/inspect_name_mapping/stubs/inspect_name_mapping/submodule.py

diff --cc m.css/documentation/test_python/inspect_string/classes.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_string/inspect_string.DerivedException-310.html
index 0000000000000000000000000000000000000000,28d58e3be6fd46eba1051d7048991386a60e4e3c..28d58e3be6fd46eba1051d7048991386a60e4e3c
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/inspect_string/inspect_string.DerivedException-310.html
+++ b/m.css/documentation/test_python/inspect_string/inspect_string.DerivedException-310.html

diff --cc m.css/documentation/test_python/inspect_string/inspect_string.DerivedException.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_string/inspect_string.Foo.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_string/inspect_string.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_string/inspect_string.subpackage.html
index 0000000000000000000000000000000000000000,01330eab1ec4a7f2a0153d5d2d6fa8a83f98041f..01330eab1ec4a7f2a0153d5d2d6fa8a83f98041f
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/inspect_string/inspect_string.subpackage.html
+++ b/m.css/documentation/test_python/inspect_string/inspect_string.subpackage.html

diff --cc m.css/documentation/test_python/inspect_string/inspect_string.subpackage.inner.html
index 0000000000000000000000000000000000000000,7de76e9474718564626ab20a1751b2be15a5e490..7de76e9474718564626ab20a1751b2be15a5e490
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/inspect_string/inspect_string.subpackage.inner.html
+++ b/m.css/documentation/test_python/inspect_string/inspect_string.subpackage.inner.html

diff --cc m.css/documentation/test_python/inspect_string/inspect_string/__init__.py
Simple merge

diff --cc m.css/documentation/test_python/inspect_string/inspect_string/subpackage/inner.py
index 0000000000000000000000000000000000000000,5154660792c1ce5a422552db170069c476adfcd5..5154660792c1ce5a422552db170069c476adfcd5
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/inspect_string/inspect_string/subpackage/inner.py
+++ b/m.css/documentation/test_python/inspect_string/inspect_string/subpackage/inner.py

diff --cc m.css/documentation/test_python/inspect_string/modules.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_string/stubs/inspect_string/__init__-310.pyi
index 0000000000000000000000000000000000000000,a23171dd05990ea9e1986ab9e553f5011bab839c..a23171dd05990ea9e1986ab9e553f5011bab839c
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/inspect_string/stubs/inspect_string/__init__-310.pyi
+++ b/m.css/documentation/test_python/inspect_string/stubs/inspect_string/__init__-310.pyi

diff --cc m.css/documentation/test_python/inspect_string/stubs/inspect_string/__init__.pyi
index 0000000000000000000000000000000000000000,0a8cb2d1825135ea63a9eb8e443c33f4c8d19a8e..0a8cb2d1825135ea63a9eb8e443c33f4c8d19a8e
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/inspect_string/stubs/inspect_string/__init__.pyi
+++ b/m.css/documentation/test_python/inspect_string/stubs/inspect_string/__init__.pyi

diff --cc m.css/documentation/test_python/inspect_string/stubs/inspect_string/another_module.pyi
index 0000000000000000000000000000000000000000,e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/page_empty_index/input.dox
+++ b/m.css/documentation/test_python/inspect_string/stubs/inspect_string/another_module.pyi

diff --cc m.css/documentation/test_python/inspect_string/stubs/inspect_string/subpackage/inner.pyi
index 0000000000000000000000000000000000000000,e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/page_empty_index/input.dox
+++ b/m.css/documentation/test_python/inspect_string/stubs/inspect_string/subpackage/inner.pyi

diff --cc m.css/documentation/test_python/inspect_type_links/inspect_type_links.second.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_value_formatting/inspect_value_formatting.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_value_formatting/inspect_value_formatting.py
Simple merge

diff --cc m.css/documentation/test_python/inspect_value_formatting/stubs/inspect_value_formatting.pyi
index 0000000000000000000000000000000000000000,2e7a05dcbe76bd8aebc23531a34feb4fe474fd65..2e7a05dcbe76bd8aebc23531a34feb4fe474fd65
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/inspect_value_formatting/stubs/inspect_value_formatting.pyi
+++ b/m.css/documentation/test_python/inspect_value_formatting/stubs/inspect_value_formatting.pyi

diff --cc m.css/documentation/test_python/page_plugins/dot-2.html
index 0000000000000000000000000000000000000000,289e5ab723f40f004a03f4e8e1a5c8e82714d563..289e5ab723f40f004a03f4e8e1a5c8e82714d563
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/page_plugins/dot-2.html
+++ b/m.css/documentation/test_python/page_plugins/dot-2.html

diff --cc m.css/documentation/test_python/page_plugins/dot.html
Simple merge

diff --cc m.css/documentation/test_python/page_plugins/plots-35.html
Simple merge

diff --cc m.css/documentation/test_python/page_plugins/plots.html
Simple merge

diff --cc m.css/documentation/test_python/page_plugins/plugins/fancyline.py
Simple merge

diff --cc m.css/documentation/test_python/pybind_enums/stubs/pybind_enums.pyi
index 0000000000000000000000000000000000000000,67d751aa22e549a2e9a8c1947520ea9d130d7f66..67d751aa22e549a2e9a8c1947520ea9d130d7f66
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/pybind_enums/stubs/pybind_enums.pyi
+++ b/m.css/documentation/test_python/pybind_enums/stubs/pybind_enums.pyi

diff --cc m.css/documentation/test_python/pybind_external_overload_docs/docs.rst
Simple merge

diff --cc m.css/documentation/test_python/pybind_external_overload_docs/pybind_external_overload_docs.html
Simple merge

diff --cc m.css/documentation/test_python/pybind_name_mapping/stubs/pybind_name_mapping/__init__.py
index 0000000000000000000000000000000000000000,30aa55414a3a9334a5da21eca3bb16feee39ff09..30aa55414a3a9334a5da21eca3bb16feee39ff09
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/pybind_name_mapping/stubs/pybind_name_mapping/__init__.py
+++ b/m.css/documentation/test_python/pybind_name_mapping/stubs/pybind_name_mapping/__init__.py

diff --cc m.css/documentation/test_python/pybind_name_mapping/stubs/pybind_name_mapping/submodule.py
index 0000000000000000000000000000000000000000,689bcc6f72fbeabecf3810330da7596141eb1ebe..689bcc6f72fbeabecf3810330da7596141eb1ebe
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/pybind_name_mapping/stubs/pybind_name_mapping/submodule.py
+++ b/m.css/documentation/test_python/pybind_name_mapping/stubs/pybind_name_mapping/submodule.py

diff --cc m.css/documentation/test_python/pybind_signatures/pybind_signatures.MyClass.html
Simple merge

diff --cc m.css/documentation/test_python/pybind_signatures/pybind_signatures.cpp
Simple merge

diff --cc m.css/documentation/test_python/pybind_signatures/pybind_signatures.html
Simple merge

diff --cc m.css/documentation/test_python/pybind_signatures/stubs/pybind_signatures/__init__-pybind22.pyi
index 0000000000000000000000000000000000000000,a9621047c070b28f9a27e699bee1ceddbdb0b962..a9621047c070b28f9a27e699bee1ceddbdb0b962
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/pybind_signatures/stubs/pybind_signatures/__init__-pybind22.pyi
+++ b/m.css/documentation/test_python/pybind_signatures/stubs/pybind_signatures/__init__-pybind22.pyi

diff --cc m.css/documentation/test_python/pybind_signatures/stubs/pybind_signatures/__init__-pybind25.pyi
index 0000000000000000000000000000000000000000,dc12283c4e026d9adbfa067abd94879269872212..dc12283c4e026d9adbfa067abd94879269872212
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/pybind_signatures/stubs/pybind_signatures/__init__-pybind25.pyi
+++ b/m.css/documentation/test_python/pybind_signatures/stubs/pybind_signatures/__init__-pybind25.pyi

diff --cc m.css/documentation/test_python/pybind_signatures/stubs/pybind_signatures/__init__.pyi
index 0000000000000000000000000000000000000000,ce8bfcb6dfc58e250cbd5f754bb7c145afea4d68..ce8bfcb6dfc58e250cbd5f754bb7c145afea4d68
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/pybind_signatures/stubs/pybind_signatures/__init__.pyi
+++ b/m.css/documentation/test_python/pybind_signatures/stubs/pybind_signatures/__init__.pyi

diff --cc m.css/documentation/test_python/pybind_signatures/stubs/pybind_signatures/just_overloads.pyi
index 0000000000000000000000000000000000000000,646e5d4148e723cba67238d50c7d531cc53abf73..646e5d4148e723cba67238d50c7d531cc53abf73
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/pybind_signatures/stubs/pybind_signatures/just_overloads.pyi
+++ b/m.css/documentation/test_python/pybind_signatures/stubs/pybind_signatures/just_overloads.pyi

diff --cc m.css/documentation/test_python/pybind_type_links/pybind_type_links.cpp
Simple merge

diff --cc m.css/documentation/test_python/pybind_type_links/pybind_type_links.html
Simple merge

diff --cc m.css/documentation/test_python/stubs_custom_header_extension/stubs/stubs_custom_header_extension/__init__.custom.py
index 0000000000000000000000000000000000000000,c58b90446cbbcc59090a750f4855ddc4b0e61981..c58b90446cbbcc59090a750f4855ddc4b0e61981
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/stubs_custom_header_extension/stubs/stubs_custom_header_extension/__init__.custom.py
+++ b/m.css/documentation/test_python/stubs_custom_header_extension/stubs/stubs_custom_header_extension/__init__.custom.py

diff --cc m.css/documentation/test_python/stubs_custom_header_extension/stubs/stubs_custom_header_extension/sub.custom.py
index 0000000000000000000000000000000000000000,c58b90446cbbcc59090a750f4855ddc4b0e61981..c58b90446cbbcc59090a750f4855ddc4b0e61981
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/stubs_custom_header_extension/stubs/stubs_custom_header_extension/__init__.custom.py
+++ b/m.css/documentation/test_python/stubs_custom_header_extension/stubs/stubs_custom_header_extension/sub.custom.py

diff --cc m.css/documentation/test_python/stubs_custom_header_extension/stubs_custom_header_extension/__init__.py
index 0000000000000000000000000000000000000000,9ded2a2e2fbb6792fa945740ae3a1287f79f1f84..9ded2a2e2fbb6792fa945740ae3a1287f79f1f84
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/stubs_custom_header_extension/stubs_custom_header_extension/__init__.py
+++ b/m.css/documentation/test_python/stubs_custom_header_extension/stubs_custom_header_extension/__init__.py

diff --cc m.css/documentation/test_python/stubs_custom_header_extension/stubs_custom_header_extension/sub.py
index 0000000000000000000000000000000000000000,e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/page_empty_index/input.dox
+++ b/m.css/documentation/test_python/stubs_custom_header_extension/stubs_custom_header_extension/sub.py

diff --cc m.css/documentation/test_python/stubs_module_dependencies/another_module.py
index 0000000000000000000000000000000000000000,d95cb049595cdddf6f9bc76b28280f442ba4fa79..d95cb049595cdddf6f9bc76b28280f442ba4fa79
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/stubs_module_dependencies/another_module.py
+++ b/m.css/documentation/test_python/stubs_module_dependencies/another_module.py

diff --cc m.css/documentation/test_python/stubs_module_dependencies/stubs/stubs_module_dependencies/__init__.py
index 0000000000000000000000000000000000000000,c98490cc8367a88fef2994384b1191acbfb0ac4d..c98490cc8367a88fef2994384b1191acbfb0ac4d
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/stubs_module_dependencies/stubs/stubs_module_dependencies/__init__.py
+++ b/m.css/documentation/test_python/stubs_module_dependencies/stubs/stubs_module_dependencies/__init__.py

diff --cc m.css/documentation/test_python/stubs_module_dependencies/stubs/stubs_module_dependencies/pybind/__init__.py
index 0000000000000000000000000000000000000000,11437d0d233eacfa0e7ddc53b6ff5c07b2150f61..11437d0d233eacfa0e7ddc53b6ff5c07b2150f61
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/stubs_module_dependencies/stubs/stubs_module_dependencies/pybind/__init__.py
+++ b/m.css/documentation/test_python/stubs_module_dependencies/stubs/stubs_module_dependencies/pybind/__init__.py

diff --cc m.css/documentation/test_python/stubs_module_dependencies/stubs/stubs_module_dependencies/sub/inner.py
index 0000000000000000000000000000000000000000,0ae63444d54ae160811614af19faa7dace3dc21f..0ae63444d54ae160811614af19faa7dace3dc21f
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/stubs_module_dependencies/stubs/stubs_module_dependencies/sub/inner.py
+++ b/m.css/documentation/test_python/stubs_module_dependencies/stubs/stubs_module_dependencies/sub/inner.py

diff --cc m.css/documentation/test_python/stubs_module_dependencies/stubs_module_dependencies/__init__.py
index 0000000000000000000000000000000000000000,b3a7497dcc687558d541fec38332ed4d4b0bf41f..b3a7497dcc687558d541fec38332ed4d4b0bf41f
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/stubs_module_dependencies/stubs_module_dependencies/__init__.py
+++ b/m.css/documentation/test_python/stubs_module_dependencies/stubs_module_dependencies/__init__.py

diff --cc m.css/documentation/test_python/stubs_module_dependencies/stubs_module_dependencies/pybind.cpp
index 0000000000000000000000000000000000000000,efe84f571908b8795f8b437b10d156cd8e5e5c7a..efe84f571908b8795f8b437b10d156cd8e5e5c7a
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/stubs_module_dependencies/stubs_module_dependencies/pybind.cpp
+++ b/m.css/documentation/test_python/stubs_module_dependencies/stubs_module_dependencies/pybind.cpp

diff --cc m.css/documentation/test_python/stubs_module_dependencies/stubs_module_dependencies/sub/__init__.py
index 0000000000000000000000000000000000000000,475004c003c5026ab5a880c27c892a7c892cfd26..475004c003c5026ab5a880c27c892a7c892cfd26
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/stubs_module_dependencies/stubs_module_dependencies/sub/__init__.py
+++ b/m.css/documentation/test_python/stubs_module_dependencies/stubs_module_dependencies/sub/__init__.py

diff --cc m.css/documentation/test_python/stubs_module_dependencies/stubs_module_dependencies/sub/inner.py
index 0000000000000000000000000000000000000000,cf441e766e17445e096da25143549c60a5b730e9..cf441e766e17445e096da25143549c60a5b730e9
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/stubs_module_dependencies/stubs_module_dependencies/sub/inner.py
+++ b/m.css/documentation/test_python/stubs_module_dependencies/stubs_module_dependencies/sub/inner.py

diff --cc m.css/documentation/test_python/stubs_module_dependencies/unparsed_enum_module.py
index 0000000000000000000000000000000000000000,5cc3cd60199a66295e33b2effd71eee3e6c6d3b1..5cc3cd60199a66295e33b2effd71eee3e6c6d3b1
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/stubs_module_dependencies/unparsed_enum_module.py
+++ b/m.css/documentation/test_python/stubs_module_dependencies/unparsed_enum_module.py

diff --cc m.css/documentation/test_python/stubs_module_dependencies/unparsed_module.py
index 0000000000000000000000000000000000000000,66fbf525976cebc2e5d3942ca951c8cbf108dbce..66fbf525976cebc2e5d3942ca951c8cbf108dbce
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/stubs_module_dependencies/unparsed_module.py
+++ b/m.css/documentation/test_python/stubs_module_dependencies/unparsed_module.py

diff --cc m.css/documentation/test_python/stubs_nested_classes/stubs_nested_classes.Class.Inner.html
index 0000000000000000000000000000000000000000,938f17a90f621e300738ca138a093bd2da1027b5..938f17a90f621e300738ca138a093bd2da1027b5
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/stubs_nested_classes/stubs_nested_classes.Class.Inner.html
+++ b/m.css/documentation/test_python/stubs_nested_classes/stubs_nested_classes.Class.Inner.html

diff --cc m.css/documentation/test_python/stubs_nested_classes/stubs_nested_classes.Class.InnerAnother.AndAnother.YetAnother.html
index 0000000000000000000000000000000000000000,bdccf3a2e987b7a5b3a6b41a73ddde6ac0dee2e5..bdccf3a2e987b7a5b3a6b41a73ddde6ac0dee2e5
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/stubs_nested_classes/stubs_nested_classes.Class.InnerAnother.AndAnother.YetAnother.html
+++ b/m.css/documentation/test_python/stubs_nested_classes/stubs_nested_classes.Class.InnerAnother.AndAnother.YetAnother.html

diff --cc m.css/documentation/test_python/stubs_nested_classes/stubs_nested_classes.Class.InnerAnother.AndAnother.html
index 0000000000000000000000000000000000000000,5d1627f790d330c1ac23a277f65a8ad4ec10ede2..5d1627f790d330c1ac23a277f65a8ad4ec10ede2
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/stubs_nested_classes/stubs_nested_classes.Class.InnerAnother.AndAnother.html
+++ b/m.css/documentation/test_python/stubs_nested_classes/stubs_nested_classes.Class.InnerAnother.AndAnother.html

diff --cc m.css/documentation/test_python/stubs_nested_classes/stubs_nested_classes.Class.html
index 0000000000000000000000000000000000000000,cdd4c42294c8d20a1533f8c2d912e7fc4286c9ac..cdd4c42294c8d20a1533f8c2d912e7fc4286c9ac
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/stubs_nested_classes/stubs_nested_classes.Class.html
+++ b/m.css/documentation/test_python/stubs_nested_classes/stubs_nested_classes.Class.html

diff --cc m.css/documentation/test_python/stubs_nested_classes/stubs_nested_classes.html
index 0000000000000000000000000000000000000000,6db3268b9ec5cd2307b48dbbade348695a57f542..6db3268b9ec5cd2307b48dbbade348695a57f542
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/stubs_nested_classes/stubs_nested_classes.html
+++ b/m.css/documentation/test_python/stubs_nested_classes/stubs_nested_classes.html

diff --cc m.css/documentation/test_python/stubs_nested_classes/stubs_nested_classes.py
index 0000000000000000000000000000000000000000,e2820d056cd274478929a33cfbd151dd2b1093ab..e2820d056cd274478929a33cfbd151dd2b1093ab
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/stubs_nested_classes/stubs_nested_classes.py
+++ b/m.css/documentation/test_python/stubs_nested_classes/stubs_nested_classes.py

diff --cc m.css/documentation/test_python/stubs_spacing/empty_module.py
index 0000000000000000000000000000000000000000,e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/page_empty_index/input.dox
+++ b/m.css/documentation/test_python/stubs_spacing/empty_module.py

diff --cc m.css/documentation/test_python/stubs_spacing/stubs_spacing.py
index 0000000000000000000000000000000000000000,f49e1a31566e62151ed34bd67fbe08716641c619..f49e1a31566e62151ed34bd67fbe08716641c619
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/stubs_spacing/stubs_spacing.py
+++ b/m.css/documentation/test_python/stubs_spacing/stubs_spacing.py

diff --cc m.css/documentation/test_python/stubs_spacing/stubs_spacing.rst
index 0000000000000000000000000000000000000000,8b137891791fe96927ad78e64b0aad7bded08bdc..8b137891791fe96927ad78e64b0aad7bded08bdc
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/page_empty_page/subdir/otherinput.md
+++ b/m.css/documentation/test_python/stubs_spacing/stubs_spacing.rst

diff --cc m.css/documentation/test_python/test_content.py
Simple merge

diff --cc m.css/documentation/test_python/test_inspect.py
Simple merge

diff --cc m.css/documentation/test_python/test_layout.py
Simple merge

diff --cc m.css/documentation/test_python/test_link_formatting.py
Simple merge

diff --cc m.css/documentation/test_python/test_page.py
Simple merge

diff --cc m.css/documentation/test_python/test_pybind.py
Simple merge

diff --cc m.css/documentation/test_python/test_search.py
Simple merge

diff --cc m.css/documentation/test_python/test_stubs.py
index 0000000000000000000000000000000000000000,e84e04cb0f2b8c8657de0846cf2df632e634042e..e84e04cb0f2b8c8657de0846cf2df632e634042e
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/test_stubs.py
+++ b/m.css/documentation/test_python/test_stubs.py

diff --cc m.css/package/ci/circleci.yml
Simple merge

diff --cc m.css/pelican-theme/test/__init__.py
Simple merge

diff --cc m.css/pelican-theme/test/test_blog.py
Simple merge

diff --cc m.css/pelican-theme/test/test_layout.py
Simple merge

diff --cc m.css/pelican-theme/test/test_page.py
Simple merge

diff --cc m.css/plugins/ansilexer.py
Simple merge

diff --cc m.css/plugins/dot2svg.py
Simple merge

diff --cc m.css/plugins/latex2svg.py
Simple merge

diff --cc m.css/plugins/latex2svgextra.py
Simple merge

diff --cc m.css/plugins/m/__init__.py
Simple merge

diff --cc m.css/plugins/m/abbr.py
Simple merge

diff --cc m.css/plugins/m/alias.py
Simple merge

diff --cc m.css/plugins/m/code.py
Simple merge

diff --cc m.css/plugins/m/components.py
Simple merge

diff --cc m.css/plugins/m/dot.py
Simple merge

diff --cc m.css/plugins/m/dox.py
Simple merge

diff --cc m.css/plugins/m/filesize.py
Simple merge

diff --cc m.css/plugins/m/gh.py
Simple merge

diff --cc m.css/plugins/m/gl.py
Simple merge

diff --cc m.css/plugins/m/htmlsanity.py
Simple merge

diff --cc m.css/plugins/m/images.py
Simple merge

diff --cc m.css/plugins/m/link.py
Simple merge

diff --cc m.css/plugins/m/math.py
Simple merge

diff --cc m.css/plugins/m/metadata.py
Simple merge

diff --cc m.css/plugins/m/plots.py
Simple merge

diff --cc m.css/plugins/m/qr.py
Simple merge

diff --cc m.css/plugins/m/sphinx.py
Simple merge

diff --cc m.css/plugins/m/test/__init__.py
Simple merge

diff --cc m.css/plugins/m/test/code/ansi.html
index 0000000000000000000000000000000000000000,541239a146394f6b8f35d0753139f6697bd02381..541239a146394f6b8f35d0753139f6697bd02381
mode 000000,100644..100644
--- /dev/null
--- 2/plugins/m/test/code/ansi.html
+++ b/m.css/plugins/m/test/code/ansi.html

diff --cc m.css/plugins/m/test/code/ansi.rst
index 0000000000000000000000000000000000000000,aeffd366c79d1745881fe9021e6921adda33e7cf..aeffd366c79d1745881fe9021e6921adda33e7cf
mode 000000,100644..100644
--- /dev/null
--- 2/plugins/m/test/code/ansi.rst
+++ b/m.css/plugins/m/test/code/ansi.rst

diff --cc m.css/plugins/m/test/code/page-210.html
index 0000000000000000000000000000000000000000,779360cd90a7de9551b556a80f49194bdf80fd22..779360cd90a7de9551b556a80f49194bdf80fd22
mode 000000,100644..100644
--- /dev/null
--- 2/plugins/m/test/code/page-210.html
+++ b/m.css/plugins/m/test/code/page-210.html

diff --cc m.css/plugins/m/test/code/page-29.html
index 0000000000000000000000000000000000000000,56c8ed9320e875e0e6718e4c57fef346887dfeee..56c8ed9320e875e0e6718e4c57fef346887dfeee
mode 000000,100644..100644
--- /dev/null
--- 2/plugins/m/test/code/page-29.html
+++ b/m.css/plugins/m/test/code/page-29.html

diff --cc m.css/plugins/m/test/code/page.html
Simple merge

diff --cc m.css/plugins/m/test/code/page.rst
Simple merge

diff --cc m.css/plugins/m/test/dot/page-2.html
index 0000000000000000000000000000000000000000,32c7f6ab861df94dd7eb51611b3b60bff86f7a1f..32c7f6ab861df94dd7eb51611b3b60bff86f7a1f
mode 000000,100644..100644
--- /dev/null
--- 2/plugins/m/test/dot/page-2.html
+++ b/m.css/plugins/m/test/dot/page-2.html

diff --cc m.css/plugins/m/test/dot/page.html
Simple merge

diff --cc m.css/plugins/m/test/math/page-code-fallback.html
Simple merge

diff --cc m.css/plugins/m/test/plots/page-35.html
index 0000000000000000000000000000000000000000,b01ee2532eb6480232d581a5bc7e389cc99768b1..b01ee2532eb6480232d581a5bc7e389cc99768b1
mode 000000,100644..100644
--- /dev/null
--- 2/plugins/m/test/plots/page-35.html
+++ b/m.css/plugins/m/test/plots/page-35.html

diff --cc m.css/plugins/m/test/plots/page.html
Simple merge

diff --cc m.css/plugins/m/test/qr/page-73.html
index 0000000000000000000000000000000000000000,4cb9e2c6dfa57ce24a65b14e607f425c4e8848ab..4cb9e2c6dfa57ce24a65b14e607f425c4e8848ab
mode 000000,100644..100644
--- /dev/null
--- 2/plugins/m/test/qr/page-73.html
+++ b/m.css/plugins/m/test/qr/page-73.html

diff --cc m.css/plugins/m/test/qr/page.html
Simple merge

diff --cc m.css/plugins/m/test/test.py
index 0000000000000000000000000000000000000000,105bac27cdfdd4b1915283645509e405322b2268..105bac27cdfdd4b1915283645509e405322b2268
mode 000000,100644..100644
--- /dev/null
--- 2/plugins/m/test/test.py
+++ b/m.css/plugins/m/test/test.py

diff --cc m.css/plugins/m/test/test_abbr.py
Simple merge

diff --cc m.css/plugins/m/test/test_alias.py
Simple merge

diff --cc m.css/plugins/m/test/test_code.py
Simple merge

diff --cc m.css/plugins/m/test/test_components.py
Simple merge

diff --cc m.css/plugins/m/test/test_dot.py
Simple merge

diff --cc m.css/plugins/m/test/test_dox.py
Simple merge

diff --cc m.css/plugins/m/test/test_filesize.py
Simple merge

diff --cc m.css/plugins/m/test/test_gh.py
Simple merge

diff --cc m.css/plugins/m/test/test_gl.py
Simple merge

diff --cc m.css/plugins/m/test/test_htmlsanity.py
Simple merge

diff --cc m.css/plugins/m/test/test_images.py
Simple merge

diff --cc m.css/plugins/m/test/test_link.py
Simple merge

diff --cc m.css/plugins/m/test/test_math.py
Simple merge

diff --cc m.css/plugins/m/test/test_metadata.py
Simple merge

diff --cc m.css/plugins/m/test/test_plots.py
Simple merge

diff --cc m.css/plugins/m/test/test_qr.py
Simple merge

diff --cc m.css/plugins/m/test/test_sphinx.py
Simple merge

diff --cc m.css/plugins/m/test/test_vk.py
Simple merge

diff --cc m.css/plugins/m/vk.py
Simple merge

diff --cc m.css/site/pelicanconf.py
Simple merge

diff --cc m.css/site/publishconf.py
Simple merge