From: Colin Watson Date: Mon, 13 May 2024 09:29:34 +0000 (+0100) Subject: Merge commit '523506668a61646603ed299e1b60b7f77a8ebd77' X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=415d44103f836faa03f031b4237de1575aa5a501;p=blog.git Merge commit '523506668a61646603ed299e1b60b7f77a8ebd77' --- 415d44103f836faa03f031b4237de1575aa5a501 diff --cc m.css/documentation/test/js-test-data/empty-ns1-ri2-fo3.bin index 00000000,d13e176c..d13e176c mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/empty-ns1-ri2-fo4.bin index 00000000,3803349e..3803349e mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/empty-ns1-ri3-fo3.bin index 00000000,4d98643a..4d98643a mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/empty-ns1-ri3-fo4.bin index 00000000,8b484e18..8b484e18 mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/empty-ns1-ri4-fo3.bin index 00000000,abbc4d41..abbc4d41 mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/empty-ns1-ri4-fo4.bin index 00000000,4fbe1f52..4fbe1f52 mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/empty-ns2-ri2-fo3.bin index 00000000,f856f5b4..f856f5b4 mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/empty-ns2-ri2-fo4.bin index 00000000,cd7ce16e..cd7ce16e mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/empty-ns2-ri3-fo3.bin index 00000000,81f31146..81f31146 mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/empty-ns2-ri3-fo4.bin index 00000000,ef2ee650..ef2ee650 mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/empty-ns2-ri4-fo3.bin index 00000000,9f94c887..9f94c887 mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/empty-ns2-ri4-fo4.bin index 00000000,90c4aa8d..90c4aa8d mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/manyresults-ns1-ri2-fo3.bin index 00000000,23e1735b..23e1735b mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/manyresults-ns1-ri2-fo4.bin index 00000000,ea42fbcf..ea42fbcf mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/manyresults-ns1-ri3-fo3.bin index 00000000,52c1637f..52c1637f mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/manyresults-ns1-ri3-fo4.bin index 00000000,56dfd9e6..56dfd9e6 mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/manyresults-ns1-ri4-fo3.bin index 00000000,c8d6c8bd..c8d6c8bd mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/manyresults-ns1-ri4-fo4.bin index 00000000,6b1c4941..6b1c4941 mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/manyresults-ns2-ri2-fo3.bin index 00000000,62ecdcde..62ecdcde mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/manyresults-ns2-ri2-fo4.bin index 00000000,858d4566..858d4566 mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/manyresults-ns2-ri3-fo3.bin index 00000000,4e3f2840..4e3f2840 mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/manyresults-ns2-ri3-fo4.bin index 00000000,c280a6da..c280a6da mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/manyresults-ns2-ri4-fo3.bin index 00000000,9b295b7a..9b295b7a mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/manyresults-ns2-ri4-fo4.bin index 00000000,8097294a..8097294a mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/nested.bin index 6a92cb9c,7079b87b..7079b87b Binary files differ diff --cc m.css/documentation/test/js-test-data/searchdata-ns1-ri2-fo3.b85 index 00000000,c49bb8cc..c49bb8cc mode 000000,100644..100644 --- a/m.css/documentation/test/js-test-data/searchdata-ns1-ri2-fo3.b85 +++ b/m.css/documentation/test/js-test-data/searchdata-ns1-ri2-fo3.b85 diff --cc m.css/documentation/test/js-test-data/searchdata-ns1-ri2-fo3.bin index 00000000,1274c391..1274c391 mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/searchdata-ns1-ri2-fo4.bin index 00000000,9b67dce2..9b67dce2 mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/searchdata-ns1-ri3-fo3.bin index 00000000,c7dd8dbd..c7dd8dbd mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/searchdata-ns1-ri3-fo4.bin index 00000000,18993857..18993857 mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/searchdata-ns1-ri4-fo3.bin index 00000000,6b91fb41..6b91fb41 mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/searchdata-ns1-ri4-fo4.bin index 00000000,8e5acd73..8e5acd73 mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/searchdata-ns2-ri2-fo3.bin index 00000000,9d4a372c..9d4a372c mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/searchdata-ns2-ri2-fo4.bin index 00000000,a48977fb..a48977fb mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/searchdata-ns2-ri3-fo3.bin index 00000000,c30d3d9a..c30d3d9a mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/searchdata-ns2-ri3-fo4.bin index 00000000,eec2ab15..eec2ab15 mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/searchdata-ns2-ri4-fo3.bin index 00000000,c53ec70e..c53ec70e mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/searchdata-ns2-ri4-fo4.bin index 00000000,16b08a6d..16b08a6d mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/unicode.bin index 132cec99,d72ae17f..d72ae17f Binary files differ diff --cc m.css/documentation/test/js-test-data/wrong-magic.bin index 6a3dd03e,3e367023..3e367023 Binary files differ diff --cc m.css/documentation/test/js-test-data/wrong-result-id-bytes.bin index 00000000,3e99537d..3e99537d mode 000000,100644..100644 Binary files differ diff --cc m.css/documentation/test/js-test-data/wrong-version.bin index 9b66517f,f555f700..f555f700 Binary files differ diff --cc m.css/documentation/test_doxygen/compound_listing/structRoot_1_1Directory_1_1Sub_1_1Warning.html index 00000000,846e3da5..846e3da5 mode 000000,100644..100644 --- a/m.css/documentation/test_doxygen/compound_listing/structRoot_1_1Directory_1_1Sub_1_1Warning.html +++ b/m.css/documentation/test_doxygen/compound_listing/structRoot_1_1Directory_1_1Sub_1_1Warning.html diff --cc m.css/documentation/test_doxygen/contents_autobrief_blockquote/Doxyfile index 00000000,bf3f5a30..bf3f5a30 mode 000000,100644..100644 --- a/m.css/documentation/test_doxygen/contents_autobrief_blockquote/Doxyfile +++ b/m.css/documentation/test_doxygen/contents_autobrief_blockquote/Doxyfile diff --cc m.css/documentation/test_doxygen/contents_autobrief_blockquote/File.h index 00000000,ab5607e7..ab5607e7 mode 000000,100644..100644 --- a/m.css/documentation/test_doxygen/contents_autobrief_blockquote/File.h +++ b/m.css/documentation/test_doxygen/contents_autobrief_blockquote/File.h diff --cc m.css/documentation/test_doxygen/contents_autobrief_blockquote/File_8h.html index 00000000,65d2e34e..65d2e34e mode 000000,100644..100644 --- a/m.css/documentation/test_doxygen/contents_autobrief_blockquote/File_8h.html +++ b/m.css/documentation/test_doxygen/contents_autobrief_blockquote/File_8h.html diff --cc m.css/documentation/test_doxygen/contents_autobrief_heading/namespaceNamespace_1814.html index 00000000,b8734d1f..b8734d1f mode 000000,100644..100644 --- a/m.css/documentation/test_doxygen/contents_autobrief_heading/namespaceNamespace_1814.html +++ b/m.css/documentation/test_doxygen/contents_autobrief_heading/namespaceNamespace_1814.html diff --cc m.css/documentation/test_doxygen/contents_autobrief_hr/namespaceNamespace_1814.html index 00000000,75ca144b..75ca144b mode 000000,100644..100644 --- a/m.css/documentation/test_doxygen/contents_autobrief_hr/namespaceNamespace_1814.html +++ b/m.css/documentation/test_doxygen/contents_autobrief_hr/namespaceNamespace_1814.html diff --cc m.css/documentation/test_doxygen/contents_blockquote/Doxyfile index 00000000,07979766..07979766 mode 000000,100644..100644 --- a/m.css/documentation/test_doxygen/contents_blockquote/Doxyfile +++ b/m.css/documentation/test_doxygen/contents_blockquote/Doxyfile diff --cc m.css/documentation/test_doxygen/contents_blockquote/index.html index 00000000,350ff819..350ff819 mode 000000,100644..100644 --- a/m.css/documentation/test_doxygen/contents_blockquote/index.html +++ b/m.css/documentation/test_doxygen/contents_blockquote/index.html diff --cc m.css/documentation/test_doxygen/contents_blockquote/input.dox index 00000000,e22ba418..e22ba418 mode 000000,100644..100644 --- a/m.css/documentation/test_doxygen/contents_blockquote/input.dox +++ b/m.css/documentation/test_doxygen/contents_blockquote/input.dox diff --cc m.css/documentation/test_doxygen/contents_blocks/old_1818.html index 00000000,acb3c1c0..acb3c1c0 mode 000000,100644..100644 --- a/m.css/documentation/test_doxygen/contents_blocks/old_1818.html +++ b/m.css/documentation/test_doxygen/contents_blocks/old_1818.html diff --cc m.css/documentation/test_doxygen/contents_brief_multiline_ingroup/Doxyfile index 00000000,7e9ad922..7e9ad922 mode 000000,100644..100644 --- a/m.css/documentation/test_doxygen/contents_brief_multiline_ingroup/Doxyfile +++ b/m.css/documentation/test_doxygen/contents_brief_multiline_ingroup/Doxyfile diff --cc m.css/documentation/test_doxygen/contents_brief_multiline_ingroup/File.h index 00000000,deb92f4b..deb92f4b mode 000000,100644..100644 --- a/m.css/documentation/test_doxygen/contents_brief_multiline_ingroup/File.h +++ b/m.css/documentation/test_doxygen/contents_brief_multiline_ingroup/File.h diff --cc m.css/documentation/test_doxygen/contents_brief_multiline_ingroup/group__thatgroup.html index 00000000,cf0a91e1..cf0a91e1 mode 000000,100644..100644 --- a/m.css/documentation/test_doxygen/contents_brief_multiline_ingroup/group__thatgroup.html +++ b/m.css/documentation/test_doxygen/contents_brief_multiline_ingroup/group__thatgroup.html diff --cc m.css/documentation/test_doxygen/contents_brief_multiline_ingroup/group__thatgroup_1815.html index 00000000,13e9cf2a..13e9cf2a mode 000000,100644..100644 --- a/m.css/documentation/test_doxygen/contents_brief_multiline_ingroup/group__thatgroup_1815.html +++ b/m.css/documentation/test_doxygen/contents_brief_multiline_ingroup/group__thatgroup_1815.html diff --cc m.css/documentation/test_doxygen/contents_dot/warnings_1815.html index 00000000,56bb6222..56bb6222 mode 000000,100644..100644 --- a/m.css/documentation/test_doxygen/contents_dot/warnings_1815.html +++ b/m.css/documentation/test_doxygen/contents_dot/warnings_1815.html diff --cc m.css/documentation/test_doxygen/contents_htmlonly_htmlinclude/html-only.html index 00000000,eda570c5..eda570c5 mode 000000,100644..100644 --- a/m.css/documentation/test_doxygen/contents_htmlonly_htmlinclude/html-only.html +++ b/m.css/documentation/test_doxygen/contents_htmlonly_htmlinclude/html-only.html diff --cc m.css/documentation/test_doxygen/contents_htmlonly_htmlinclude/input.dox index 00000000,e6636970..e6636970 mode 000000,100644..100644 --- a/m.css/documentation/test_doxygen/contents_htmlonly_htmlinclude/input.dox +++ b/m.css/documentation/test_doxygen/contents_htmlonly_htmlinclude/input.dox diff --cc m.css/documentation/test_doxygen/contents_sections_headings/Warnings.h index 00000000,ce4a8a81..ce4a8a81 mode 000000,100644..100644 --- a/m.css/documentation/test_doxygen/contents_sections_headings/Warnings.h +++ b/m.css/documentation/test_doxygen/contents_sections_headings/Warnings.h diff --cc m.css/documentation/test_doxygen/contents_sections_headings/Warnings_8h.html index 00000000,51c0aef4..51c0aef4 mode 000000,100644..100644 --- a/m.css/documentation/test_doxygen/contents_sections_headings/Warnings_8h.html +++ b/m.css/documentation/test_doxygen/contents_sections_headings/Warnings_8h.html diff --cc m.css/documentation/test_doxygen/contents_typography/doxygen1817.html index 00000000,44de0020..44de0020 mode 000000,100644..100644 --- a/m.css/documentation/test_doxygen/contents_typography/doxygen1817.html +++ b/m.css/documentation/test_doxygen/contents_typography/doxygen1817.html diff --cc m.css/documentation/test_doxygen/cpp_friends/structWarning.html index 00000000,c28c927e..c28c927e mode 000000,100644..100644 --- a/m.css/documentation/test_doxygen/cpp_friends/structWarning.html +++ b/m.css/documentation/test_doxygen/cpp_friends/structWarning.html diff --cc m.css/documentation/test_doxygen/cpp_mishandled_macro_call/Doxyfile index 00000000,7e7e2ceb..7e7e2ceb mode 000000,100644..100644 --- a/m.css/documentation/test_doxygen/cpp_mishandled_macro_call/Doxyfile +++ b/m.css/documentation/test_doxygen/cpp_mishandled_macro_call/Doxyfile diff --cc m.css/documentation/test_doxygen/cpp_mishandled_macro_call/File.h index 00000000,1700633c..1700633c mode 000000,100644..100644 --- a/m.css/documentation/test_doxygen/cpp_mishandled_macro_call/File.h +++ b/m.css/documentation/test_doxygen/cpp_mishandled_macro_call/File.h diff --cc m.css/documentation/test_doxygen/cpp_mishandled_macro_call/File_8h.html index 00000000,3e27ba5c..3e27ba5c mode 000000,100644..100644 --- a/m.css/documentation/test_doxygen/cpp_mishandled_macro_call/File_8h.html +++ b/m.css/documentation/test_doxygen/cpp_mishandled_macro_call/File_8h.html diff --cc m.css/documentation/test_doxygen/ignored_xmls/Doxyfile index 00000000,da7ab9e8..da7ab9e8 mode 000000,100644..100644 --- a/m.css/documentation/test_doxygen/ignored_xmls/Doxyfile +++ b/m.css/documentation/test_doxygen/ignored_xmls/Doxyfile diff --cc m.css/documentation/test_doxygen/ignored_xmls/Doxyfile.xml index 00000000,b44092d8..b44092d8 mode 000000,100644..100644 --- a/m.css/documentation/test_doxygen/ignored_xmls/Doxyfile.xml +++ b/m.css/documentation/test_doxygen/ignored_xmls/Doxyfile.xml diff --cc m.css/documentation/test_doxygen/ignored_xmls/Foxydile.xml index 00000000,a681f325..a681f325 mode 000000,100644..100644 --- a/m.css/documentation/test_doxygen/ignored_xmls/Foxydile.xml +++ b/m.css/documentation/test_doxygen/ignored_xmls/Foxydile.xml diff --cc m.css/documentation/test_doxygen/ignored_xmls/broken.xml index 00000000,87476671..87476671 mode 000000,100644..100644 --- a/m.css/documentation/test_doxygen/ignored_xmls/broken.xml +++ b/m.css/documentation/test_doxygen/ignored_xmls/broken.xml diff --cc m.css/documentation/test_doxygen/ignored_xmls/index.xml index 00000000,98fb054a..98fb054a mode 000000,100644..100644 --- a/m.css/documentation/test_doxygen/ignored_xmls/index.xml +++ b/m.css/documentation/test_doxygen/ignored_xmls/index.xml diff --cc m.css/documentation/test_doxygen/ignored_xmls/pages.html index 00000000,b75eb47b..b75eb47b mode 000000,100644..100644 --- a/m.css/documentation/test_doxygen/ignored_xmls/pages.html +++ b/m.css/documentation/test_doxygen/ignored_xmls/pages.html diff --cc m.css/documentation/test_doxygen/ignored_xmls/thingsgotcrazy.xml index 00000000,bbb19abd..bbb19abd mode 000000,100644..100644 --- a/m.css/documentation/test_doxygen/ignored_xmls/thingsgotcrazy.xml +++ b/m.css/documentation/test_doxygen/ignored_xmls/thingsgotcrazy.xml diff --cc m.css/documentation/test_doxygen/test_ignored_xmls.py index 00000000,4a7d4cec..4a7d4cec mode 000000,100644..100644 --- a/m.css/documentation/test_doxygen/test_ignored_xmls.py +++ b/m.css/documentation/test_doxygen/test_ignored_xmls.py diff --cc m.css/documentation/test_python/inspect_annotations/inspect_annotations-py37+38.html index 00000000,c47f8b86..c47f8b86 mode 000000,100644..100644 --- a/m.css/documentation/test_python/inspect_annotations/inspect_annotations-py37+38.html +++ b/m.css/documentation/test_python/inspect_annotations/inspect_annotations-py37+38.html diff --cc m.css/documentation/test_python/inspect_annotations/inspect_annotations.AContainer-py36-38.html index 00000000,9aa98a55..9aa98a55 mode 000000,100644..100644 --- a/m.css/documentation/test_python/inspect_annotations/inspect_annotations.AContainer-py36-38.html +++ b/m.css/documentation/test_python/inspect_annotations/inspect_annotations.AContainer-py36-38.html diff --cc m.css/documentation/test_python/inspect_attrs/inspect_attrs.MyClassAutoAttribs-attrs193.html index 00000000,9739d2bb..9739d2bb mode 000000,100644..100644 --- a/m.css/documentation/test_python/inspect_attrs/inspect_attrs.MyClassAutoAttribs-attrs193.html +++ b/m.css/documentation/test_python/inspect_attrs/inspect_attrs.MyClassAutoAttribs-attrs193.html diff --cc m.css/documentation/test_python/inspect_attrs/inspect_attrs.MySlotClass-attrs193.html index 00000000,5056f3d8..5056f3d8 mode 000000,100644..100644 --- a/m.css/documentation/test_python/inspect_attrs/inspect_attrs.MySlotClass-attrs193.html +++ b/m.css/documentation/test_python/inspect_attrs/inspect_attrs.MySlotClass-attrs193.html diff --cc m.css/documentation/test_python/page_plugins/plots-32.html index 00000000,c1f9746c..c1f9746c mode 000000,100644..100644 --- a/m.css/documentation/test_python/page_plugins/plots-32.html +++ b/m.css/documentation/test_python/page_plugins/plots-32.html diff --cc m.css/documentation/test_python/page_plugins/plots-34.html index 00000000,a0b54cf8..a0b54cf8 mode 000000,100644..100644 --- a/m.css/documentation/test_python/page_plugins/plots-34.html +++ b/m.css/documentation/test_python/page_plugins/plots-34.html diff --cc m.css/documentation/test_python/pybind_external_overload_docs/pybind_external_overload_docs.Class26.html index 00000000,2a742e79..2a742e79 mode 000000,100644..100644 --- a/m.css/documentation/test_python/pybind_external_overload_docs/pybind_external_overload_docs.Class26.html +++ b/m.css/documentation/test_python/pybind_external_overload_docs/pybind_external_overload_docs.Class26.html diff --cc m.css/documentation/test_python/pybind_signatures/pybind_signatures.MyClass26.html index 00000000,f2f55656..f2f55656 mode 000000,100644..100644 --- a/m.css/documentation/test_python/pybind_signatures/pybind_signatures.MyClass26.html +++ b/m.css/documentation/test_python/pybind_signatures/pybind_signatures.MyClass26.html diff --cc m.css/plugins/m/test/dox/stl.tag index 00000000,893b16e2..893b16e2 mode 000000,100644..100644 --- a/m.css/plugins/m/test/dox/stl.tag +++ b/m.css/plugins/m/test/dox/stl.tag diff --cc m.css/plugins/m/test/plots/page-34.html index 00000000,87863bad..87863bad mode 000000,100644..100644 --- a/m.css/plugins/m/test/plots/page-34.html +++ b/m.css/plugins/m/test/plots/page-34.html diff --cc m.css/plugins/m/test/qr/page-py37.html index 00000000,9cc637ca..9cc637ca mode 000000,100644..100644 --- a/m.css/plugins/m/test/qr/page-py37.html +++ b/m.css/plugins/m/test/qr/page-py37.html