From e6eaf84751512116132b9771cd73ce62b032f253 Mon Sep 17 00:00:00 2001 From: Mark Gillard Date: Fri, 28 Jul 2023 16:11:39 +0300 Subject: [PATCH] flattening package structure --- pyproject.toml | 33 ++++++------- .../cppreference-doxygen-web.tag.xml | 0 src/poxy/{data => }/css/m-special.css | 0 src/poxy/{data => }/css/m-theme-dark.css | 0 src/poxy/{data => }/css/m-theme-light.css | 0 src/poxy/{data => }/css/poxy-overrides.css | 0 src/poxy/{data => }/css/poxy-pygments.css | 0 src/poxy/{data => }/css/poxy-theme-dark.css | 0 src/poxy/{data => }/css/poxy-theme-light.css | 0 src/poxy/{data => }/css/poxy.css | 24 +++++----- ...a12ac32e258617e37a0030dc54f789b894368b.css | 0 src/poxy/{data => }/generated/emoji.json | 0 ...K1dSBYKcSV-LCoeQqfX1RYOo3qPZ7jsDJT9g.woff2 | Bin ...K1dSBYKcSV-LCoeQqfX1RYOo3qPZ7ksDJT9g.woff2 | Bin .../6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7nsDI.woff2 | Bin ...K1dSBYKcSV-LCoeQqfX1RYOo3qPZ7osDJT9g.woff2 | Bin ...K1dSBYKcSV-LCoeQqfX1RYOo3qPZ7psDJT9g.woff2 | Bin ...K1dSBYKcSV-LCoeQqfX1RYOo3qPZ7qsDJT9g.woff2 | Bin ...K1dSBYKcSV-LCoeQqfX1RYOo3qPZ7rsDJT9g.woff2 | Bin .../6xK3dSBYKcSV-LCoeQqfX1RYOo3qN67lqDY.woff2 | Bin .../6xK3dSBYKcSV-LCoeQqfX1RYOo3qNK7lqDY.woff2 | Bin .../6xK3dSBYKcSV-LCoeQqfX1RYOo3qNa7lqDY.woff2 | Bin .../6xK3dSBYKcSV-LCoeQqfX1RYOo3qNq7lqDY.woff2 | Bin .../6xK3dSBYKcSV-LCoeQqfX1RYOo3qO67lqDY.woff2 | Bin .../6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7l.woff2 | Bin .../6xK3dSBYKcSV-LCoeQqfX1RYOo3qPK7lqDY.woff2 | Bin ...BYKcSV-LCoeQqfX1RYOo3qPZY4lCdg18Smxg.woff2 | Bin ...BYKcSV-LCoeQqfX1RYOo3qPZY4lCdh18Smxg.woff2 | Bin ...BYKcSV-LCoeQqfX1RYOo3qPZY4lCdi18Smxg.woff2 | Bin ...BYKcSV-LCoeQqfX1RYOo3qPZY4lCdj18Smxg.woff2 | Bin ...BYKcSV-LCoeQqfX1RYOo3qPZY4lCdo18Smxg.woff2 | Bin ...wdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCds18Q.woff2 | Bin ...BYKcSV-LCoeQqfX1RYOo3qPZY4lCdv18Smxg.woff2 | Bin ...ydSBYKcSV-LCoeQqfX1RYOo3i54rwkxduz8A.woff2 | Bin ...ydSBYKcSV-LCoeQqfX1RYOo3i54rwlBduz8A.woff2 | Bin ...6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlxdu.woff2 | Bin ...ydSBYKcSV-LCoeQqfX1RYOo3i54rwmBduz8A.woff2 | Bin ...ydSBYKcSV-LCoeQqfX1RYOo3i54rwmRduz8A.woff2 | Bin ...ydSBYKcSV-LCoeQqfX1RYOo3i54rwmhduz8A.woff2 | Bin ...ydSBYKcSV-LCoeQqfX1RYOo3i54rwmxduz8A.woff2 | Bin .../HI_SiYsKILxRpg3hIP6sJ7fM7PqlM-vWjMY.woff2 | Bin .../HI_SiYsKILxRpg3hIP6sJ7fM7PqlMOvWjMY.woff2 | Bin .../HI_SiYsKILxRpg3hIP6sJ7fM7PqlMevWjMY.woff2 | Bin .../HI_SiYsKILxRpg3hIP6sJ7fM7PqlMuvWjMY.woff2 | Bin .../HI_SiYsKILxRpg3hIP6sJ7fM7PqlOevWjMY.woff2 | Bin .../HI_SiYsKILxRpg3hIP6sJ7fM7PqlPevW.woff2 | Bin .../HI_SiYsKILxRpg3hIP6sJ7fM7PqlPuvWjMY.woff2 | Bin ...sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bQ10YVJg.woff2 | Bin ...sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bQF0YVJg.woff2 | Bin ...sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bQV0YVJg.woff2 | Bin ...sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bQl0YVJg.woff2 | Bin ...sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bSl0YVJg.woff2 | Bin ...sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bTV0YVJg.woff2 | Bin ...IP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bTl0Y.woff2 | Bin src/poxy/{data => }/generated/poxy.css | 8 ++-- src/poxy/{data => img}/poxy-badge-c++03.svg | 0 src/poxy/{data => img}/poxy-badge-c++11.svg | 0 src/poxy/{data => img}/poxy-badge-c++14.svg | 0 src/poxy/{data => img}/poxy-badge-c++17.svg | 0 src/poxy/{data => img}/poxy-badge-c++20.svg | 0 src/poxy/{data => img}/poxy-badge-c++23.svg | 0 src/poxy/{data => img}/poxy-badge-c++26.svg | 0 src/poxy/{data => img}/poxy-badge-c++29.svg | 0 src/poxy/{data => img}/poxy-badge-c++98.svg | 0 .../poxy-badge-license-apache_2.svg | 0 .../poxy-badge-license-bsd_2_clause.svg | 0 .../poxy-badge-license-bsd_3_clause.svg | 0 .../{data => img}/poxy-badge-license-gpl.svg | 0 .../poxy-badge-license-gpl_2.svg | 0 .../poxy-badge-license-gpl_3.svg | 0 .../{data => img}/poxy-badge-license-lgpl.svg | 0 .../poxy-badge-license-lgpl_2.svg | 0 .../poxy-badge-license-lgpl_2_1.svg | 0 .../poxy-badge-license-lgpl_3.svg | 0 .../{data => img}/poxy-badge-license-mit.svg | 0 src/poxy/{data => img}/poxy-icon-email.svg | 0 src/poxy/{data => img}/poxy-icon-github.svg | 0 src/poxy/{data => img}/poxy-icon-gitlab.svg | 0 src/poxy/{data => img}/poxy-icon-sponsor.svg | 0 src/poxy/{data => img}/poxy-icon-theme.svg | 0 src/poxy/{data => img}/poxy-icon-twitter.svg | 0 .../{data => js}/jquery-3.6.0.slim.min.js | 0 src/poxy/{data => js}/poxy.js | 0 .../{data/m.css => mcss}/CONTRIBUTING.rst | 0 src/poxy/{data/m.css => mcss}/COPYING | 0 src/poxy/{data/m.css => mcss}/CREDITS.rst | 0 src/poxy/{data/m.css => mcss}/README.rst | 0 .../{data/m.css => mcss}/css/m-components.css | 0 src/poxy/{data/m.css => mcss}/css/m-debug.css | 0 .../m.css => mcss}/css/m-documentation.css | 0 src/poxy/{data/m.css => mcss}/css/m-grid.css | 0 .../{data/m.css => mcss}/css/m-layout.css | 0 .../m.css => mcss}/css/pygments-console.css | 0 .../m.css => mcss}/css/pygments-dark.css | 0 .../m.css => mcss}/documentation/__init__.py | 0 .../m.css => mcss}/documentation/_search.py | 0 .../m.css => mcss}/documentation/doxygen.py | 0 .../documentation/favicon-dark.png | Bin .../documentation/favicon-light.png | Bin .../m.css => mcss}/documentation/python.py | 0 .../m.css => mcss}/documentation/search.js | 0 .../templates/doxygen/annotated.html | 0 .../doxygen/base-class-reference.html | 0 .../templates/doxygen/base-index.html | 0 .../templates/doxygen/base-reference.html | 0 .../documentation/templates/doxygen/base.html | 0 .../templates/doxygen/class.html | 0 .../templates/doxygen/concept.html | 0 .../templates/doxygen/concepts.html | 0 .../templates/doxygen/details-define.html | 0 .../templates/doxygen/details-enum.html | 0 .../templates/doxygen/details-func.html | 0 .../templates/doxygen/details-typedef.html | 0 .../templates/doxygen/details-var.html | 0 .../documentation/templates/doxygen/dir.html | 0 .../templates/doxygen/entry-class.html | 0 .../templates/doxygen/entry-concept.html | 0 .../templates/doxygen/entry-define.html | 0 .../templates/doxygen/entry-dir.html | 0 .../templates/doxygen/entry-enum.html | 0 .../templates/doxygen/entry-file.html | 0 .../templates/doxygen/entry-func.html | 0 .../templates/doxygen/entry-module.html | 0 .../templates/doxygen/entry-namespace.html | 0 .../templates/doxygen/entry-typedef.html | 0 .../templates/doxygen/entry-var.html | 0 .../templates/doxygen/example.html | 0 .../documentation/templates/doxygen/file.html | 0 .../templates/doxygen/files.html | 0 .../templates/doxygen/group.html | 0 .../templates/doxygen/modules.html | 0 .../templates/doxygen/namespace.html | 0 .../templates/doxygen/namespaces.html | 0 .../templates/doxygen/opensearch.xml | 0 .../documentation/templates/doxygen/page.html | 0 .../templates/doxygen/pages.html | 0 .../templates/doxygen/struct.html | 0 .../templates/doxygen/union.html | 0 .../{data/m.css => mcss}/plugins/ansilexer.py | 0 .../{data/m.css => mcss}/plugins/dot2svg.py | 0 .../{data/m.css => mcss}/plugins/latex2svg.py | 0 .../m.css => mcss}/plugins/latex2svgextra.py | 0 .../m.css => mcss}/plugins/m/__init__.py | 0 .../{data/m.css => mcss}/plugins/m/abbr.py | 0 .../{data/m.css => mcss}/plugins/m/alias.py | 0 .../{data/m.css => mcss}/plugins/m/code.py | 0 .../m.css => mcss}/plugins/m/components.py | 0 .../{data/m.css => mcss}/plugins/m/dot.py | 0 .../{data/m.css => mcss}/plugins/m/dox.py | 0 .../m.css => mcss}/plugins/m/filesize.py | 0 src/poxy/{data/m.css => mcss}/plugins/m/gh.py | 0 src/poxy/{data/m.css => mcss}/plugins/m/gl.py | 0 .../m.css => mcss}/plugins/m/htmlsanity.py | 0 .../{data/m.css => mcss}/plugins/m/images.py | 0 .../{data/m.css => mcss}/plugins/m/link.py | 0 .../{data/m.css => mcss}/plugins/m/math.py | 0 .../m.css => mcss}/plugins/m/metadata.py | 0 .../{data/m.css => mcss}/plugins/m/plots.py | 0 src/poxy/{data/m.css => mcss}/plugins/m/qr.py | 0 .../{data/m.css => mcss}/plugins/m/sphinx.py | 0 src/poxy/{data/m.css => mcss}/plugins/m/vk.py | 0 src/poxy/paths.py | 13 +++-- src/poxy/project.py | 45 ++++++++++-------- src/poxy/run.py | 11 +++-- tests/regenerate_tests.py | 8 ++-- .../expected_html/annotated.html | 6 +-- .../expected_html/concepts.html | 6 +-- .../expected_html/files.html | 6 +-- .../expected_html/index.html | 6 +-- .../expected_html/modules.html | 6 +-- .../expected_html/namespaces.html | 6 +-- .../expected_html/pages.html | 6 +-- .../test_project/expected_html/annotated.html | 6 +-- .../expected_html/classtest_1_1class__1.html | 6 +-- .../classtest_1_1template__class__1.html | 6 +-- tests/test_project/expected_html/code_8h.html | 6 +-- .../test_project/expected_html/concepts.html | 6 +-- .../concepttest_1_1concept__1.html | 6 +-- .../concepttest_1_1nested_1_1concept__2.html | 6 +-- .../dir_68267d1309a1af8e8297ef4c3efbcdba.html | 6 +-- .../dir_ed64655242b001a1b5d7ddadcfdd4bf2.html | 6 +-- tests/test_project/expected_html/files.html | 6 +-- tests/test_project/expected_html/index.html | 6 +-- tests/test_project/expected_html/modules.html | 6 +-- .../expected_html/namespaces.html | 6 +-- .../expected_html/namespacetest.html | 6 +-- .../expected_html/namespacetest_1_1empty.html | 6 +-- .../namespacetest_1_1nested.html | 6 +-- tests/test_project/expected_html/pages.html | 6 +-- .../structtest_1_1struct__1.html | 6 +-- ...cttest_1_1struct__1_1_1nested__struct.html | 6 +-- .../expected_html/subfolder_2code_8h.html | 6 +-- .../expected_xml/classtest_1_1class__1.xml | 4 +- tests/test_project/expected_xml/code_8h.xml | 2 +- .../concepttest_1_1concept__1.xml | 4 +- .../concepttest_1_1nested_1_1concept__2.xml | 4 +- .../expected_xml/namespacetest.xml | 2 +- theme_sandbox/index.html | 4 +- 198 files changed, 164 insertions(+), 160 deletions(-) rename src/poxy/{data => }/cppreference-doxygen-web.tag.xml (100%) rename src/poxy/{data => }/css/m-special.css (100%) rename src/poxy/{data => }/css/m-theme-dark.css (100%) rename src/poxy/{data => }/css/m-theme-light.css (100%) rename src/poxy/{data => }/css/poxy-overrides.css (100%) rename src/poxy/{data => }/css/poxy-pygments.css (100%) rename src/poxy/{data => }/css/poxy-theme-dark.css (100%) rename src/poxy/{data => }/css/poxy-theme-light.css (100%) rename src/poxy/{data => }/css/poxy.css (61%) rename src/poxy/{data => }/generated/6aa12ac32e258617e37a0030dc54f789b894368b.css (100%) rename src/poxy/{data => }/generated/emoji.json (100%) rename src/poxy/{data => }/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7jsDJT9g.woff2 (100%) rename src/poxy/{data => }/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7ksDJT9g.woff2 (100%) rename src/poxy/{data => }/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7nsDI.woff2 (100%) rename src/poxy/{data => }/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7osDJT9g.woff2 (100%) rename src/poxy/{data => }/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7psDJT9g.woff2 (100%) rename src/poxy/{data => }/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7qsDJT9g.woff2 (100%) rename src/poxy/{data => }/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7rsDJT9g.woff2 (100%) rename src/poxy/{data => }/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qN67lqDY.woff2 (100%) rename src/poxy/{data => }/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qNK7lqDY.woff2 (100%) rename src/poxy/{data => }/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qNa7lqDY.woff2 (100%) rename src/poxy/{data => }/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qNq7lqDY.woff2 (100%) rename src/poxy/{data => }/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qO67lqDY.woff2 (100%) rename src/poxy/{data => }/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7l.woff2 (100%) rename src/poxy/{data => }/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qPK7lqDY.woff2 (100%) rename src/poxy/{data => }/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCdg18Smxg.woff2 (100%) rename src/poxy/{data => }/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCdh18Smxg.woff2 (100%) rename src/poxy/{data => }/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCdi18Smxg.woff2 (100%) rename src/poxy/{data => }/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCdj18Smxg.woff2 (100%) rename src/poxy/{data => }/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCdo18Smxg.woff2 (100%) rename src/poxy/{data => }/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCds18Q.woff2 (100%) rename src/poxy/{data => }/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCdv18Smxg.woff2 (100%) rename src/poxy/{data => }/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwkxduz8A.woff2 (100%) rename src/poxy/{data => }/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlBduz8A.woff2 (100%) rename src/poxy/{data => }/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlxdu.woff2 (100%) rename src/poxy/{data => }/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwmBduz8A.woff2 (100%) rename src/poxy/{data => }/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwmRduz8A.woff2 (100%) rename src/poxy/{data => }/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwmhduz8A.woff2 (100%) rename src/poxy/{data => }/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwmxduz8A.woff2 (100%) rename src/poxy/{data => }/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlM-vWjMY.woff2 (100%) rename src/poxy/{data => }/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlMOvWjMY.woff2 (100%) rename src/poxy/{data => }/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlMevWjMY.woff2 (100%) rename src/poxy/{data => }/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlMuvWjMY.woff2 (100%) rename src/poxy/{data => }/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlOevWjMY.woff2 (100%) rename src/poxy/{data => }/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlPevW.woff2 (100%) rename src/poxy/{data => }/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlPuvWjMY.woff2 (100%) rename src/poxy/{data => }/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bQ10YVJg.woff2 (100%) rename src/poxy/{data => }/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bQF0YVJg.woff2 (100%) rename src/poxy/{data => }/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bQV0YVJg.woff2 (100%) rename src/poxy/{data => }/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bQl0YVJg.woff2 (100%) rename src/poxy/{data => }/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bSl0YVJg.woff2 (100%) rename src/poxy/{data => }/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bTV0YVJg.woff2 (100%) rename src/poxy/{data => }/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bTl0Y.woff2 (100%) rename src/poxy/{data => }/generated/poxy.css (99%) rename src/poxy/{data => img}/poxy-badge-c++03.svg (100%) rename src/poxy/{data => img}/poxy-badge-c++11.svg (100%) rename src/poxy/{data => img}/poxy-badge-c++14.svg (100%) rename src/poxy/{data => img}/poxy-badge-c++17.svg (100%) rename src/poxy/{data => img}/poxy-badge-c++20.svg (100%) rename src/poxy/{data => img}/poxy-badge-c++23.svg (100%) rename src/poxy/{data => img}/poxy-badge-c++26.svg (100%) rename src/poxy/{data => img}/poxy-badge-c++29.svg (100%) rename src/poxy/{data => img}/poxy-badge-c++98.svg (100%) rename src/poxy/{data => img}/poxy-badge-license-apache_2.svg (100%) rename src/poxy/{data => img}/poxy-badge-license-bsd_2_clause.svg (100%) rename src/poxy/{data => img}/poxy-badge-license-bsd_3_clause.svg (100%) rename src/poxy/{data => img}/poxy-badge-license-gpl.svg (100%) rename src/poxy/{data => img}/poxy-badge-license-gpl_2.svg (100%) rename src/poxy/{data => img}/poxy-badge-license-gpl_3.svg (100%) rename src/poxy/{data => img}/poxy-badge-license-lgpl.svg (100%) rename src/poxy/{data => img}/poxy-badge-license-lgpl_2.svg (100%) rename src/poxy/{data => img}/poxy-badge-license-lgpl_2_1.svg (100%) rename src/poxy/{data => img}/poxy-badge-license-lgpl_3.svg (100%) rename src/poxy/{data => img}/poxy-badge-license-mit.svg (100%) rename src/poxy/{data => img}/poxy-icon-email.svg (100%) rename src/poxy/{data => img}/poxy-icon-github.svg (100%) rename src/poxy/{data => img}/poxy-icon-gitlab.svg (100%) rename src/poxy/{data => img}/poxy-icon-sponsor.svg (100%) rename src/poxy/{data => img}/poxy-icon-theme.svg (100%) rename src/poxy/{data => img}/poxy-icon-twitter.svg (100%) rename src/poxy/{data => js}/jquery-3.6.0.slim.min.js (100%) rename src/poxy/{data => js}/poxy.js (100%) rename src/poxy/{data/m.css => mcss}/CONTRIBUTING.rst (100%) rename src/poxy/{data/m.css => mcss}/COPYING (100%) rename src/poxy/{data/m.css => mcss}/CREDITS.rst (100%) rename src/poxy/{data/m.css => mcss}/README.rst (100%) rename src/poxy/{data/m.css => mcss}/css/m-components.css (100%) rename src/poxy/{data/m.css => mcss}/css/m-debug.css (100%) rename src/poxy/{data/m.css => mcss}/css/m-documentation.css (100%) rename src/poxy/{data/m.css => mcss}/css/m-grid.css (100%) rename src/poxy/{data/m.css => mcss}/css/m-layout.css (100%) rename src/poxy/{data/m.css => mcss}/css/pygments-console.css (100%) rename src/poxy/{data/m.css => mcss}/css/pygments-dark.css (100%) rename src/poxy/{data/m.css => mcss}/documentation/__init__.py (100%) rename src/poxy/{data/m.css => mcss}/documentation/_search.py (100%) rename src/poxy/{data/m.css => mcss}/documentation/doxygen.py (100%) rename src/poxy/{data/m.css => mcss}/documentation/favicon-dark.png (100%) rename src/poxy/{data/m.css => mcss}/documentation/favicon-light.png (100%) rename src/poxy/{data/m.css => mcss}/documentation/python.py (100%) rename src/poxy/{data/m.css => mcss}/documentation/search.js (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/annotated.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/base-class-reference.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/base-index.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/base-reference.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/base.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/class.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/concept.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/concepts.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/details-define.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/details-enum.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/details-func.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/details-typedef.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/details-var.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/dir.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/entry-class.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/entry-concept.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/entry-define.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/entry-dir.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/entry-enum.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/entry-file.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/entry-func.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/entry-module.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/entry-namespace.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/entry-typedef.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/entry-var.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/example.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/file.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/files.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/group.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/modules.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/namespace.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/namespaces.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/opensearch.xml (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/page.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/pages.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/struct.html (100%) rename src/poxy/{data/m.css => mcss}/documentation/templates/doxygen/union.html (100%) rename src/poxy/{data/m.css => mcss}/plugins/ansilexer.py (100%) rename src/poxy/{data/m.css => mcss}/plugins/dot2svg.py (100%) rename src/poxy/{data/m.css => mcss}/plugins/latex2svg.py (100%) rename src/poxy/{data/m.css => mcss}/plugins/latex2svgextra.py (100%) rename src/poxy/{data/m.css => mcss}/plugins/m/__init__.py (100%) rename src/poxy/{data/m.css => mcss}/plugins/m/abbr.py (100%) rename src/poxy/{data/m.css => mcss}/plugins/m/alias.py (100%) rename src/poxy/{data/m.css => mcss}/plugins/m/code.py (100%) rename src/poxy/{data/m.css => mcss}/plugins/m/components.py (100%) rename src/poxy/{data/m.css => mcss}/plugins/m/dot.py (100%) rename src/poxy/{data/m.css => mcss}/plugins/m/dox.py (100%) rename src/poxy/{data/m.css => mcss}/plugins/m/filesize.py (100%) rename src/poxy/{data/m.css => mcss}/plugins/m/gh.py (100%) rename src/poxy/{data/m.css => mcss}/plugins/m/gl.py (100%) rename src/poxy/{data/m.css => mcss}/plugins/m/htmlsanity.py (100%) rename src/poxy/{data/m.css => mcss}/plugins/m/images.py (100%) rename src/poxy/{data/m.css => mcss}/plugins/m/link.py (100%) rename src/poxy/{data/m.css => mcss}/plugins/m/math.py (100%) rename src/poxy/{data/m.css => mcss}/plugins/m/metadata.py (100%) rename src/poxy/{data/m.css => mcss}/plugins/m/plots.py (100%) rename src/poxy/{data/m.css => mcss}/plugins/m/qr.py (100%) rename src/poxy/{data/m.css => mcss}/plugins/m/sphinx.py (100%) rename src/poxy/{data/m.css => mcss}/plugins/m/vk.py (100%) diff --git a/pyproject.toml b/pyproject.toml index 4a50440..c22ec3d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -61,29 +61,26 @@ readme = { file = [ [tool.setuptools.packages.find] where = ["src"] -# namespaces = true +include = ["poxy*"] -# [tool.setuptools.package-data] -# "*" = ['*.txt', '*.hpp', '.clang-format'] - -[tool.setuptools.exclude-package-data] +[tool.setuptools.package-data] "*" = [ - 'meson.build', - '.git*', - '.istanbul.yaml', + '*.css', + '*.woff', + '*.woff2', + '*.json', '*.rst', - '*.pyc', - 'data/m.css/artwork/*', - 'data/m.css/doc/*', - 'data/m.css/documentation/test/*', - 'data/m.css/documentation/test_doxygen/*', - 'data/m.css/documentation/test_python/*', - 'data/m.css/documentation/templates/python/*', - 'data/m.css/package/*', - 'data/m.css/plugins/m/test/*', - 'data/m.css/site/*', + '*.html', + '*.xml', + '*.png', + '*.js', + '*.svg', + '*.txt', ] +[tool.setuptools.exclude-package-data] +"*" = ['meson.build', '.git*', '.istanbul.yaml', '*.pyc'] + [tool.black] line-length = 120 target-version = ['py37'] diff --git a/src/poxy/data/cppreference-doxygen-web.tag.xml b/src/poxy/cppreference-doxygen-web.tag.xml similarity index 100% rename from src/poxy/data/cppreference-doxygen-web.tag.xml rename to src/poxy/cppreference-doxygen-web.tag.xml diff --git a/src/poxy/data/css/m-special.css b/src/poxy/css/m-special.css similarity index 100% rename from src/poxy/data/css/m-special.css rename to src/poxy/css/m-special.css diff --git a/src/poxy/data/css/m-theme-dark.css b/src/poxy/css/m-theme-dark.css similarity index 100% rename from src/poxy/data/css/m-theme-dark.css rename to src/poxy/css/m-theme-dark.css diff --git a/src/poxy/data/css/m-theme-light.css b/src/poxy/css/m-theme-light.css similarity index 100% rename from src/poxy/data/css/m-theme-light.css rename to src/poxy/css/m-theme-light.css diff --git a/src/poxy/data/css/poxy-overrides.css b/src/poxy/css/poxy-overrides.css similarity index 100% rename from src/poxy/data/css/poxy-overrides.css rename to src/poxy/css/poxy-overrides.css diff --git a/src/poxy/data/css/poxy-pygments.css b/src/poxy/css/poxy-pygments.css similarity index 100% rename from src/poxy/data/css/poxy-pygments.css rename to src/poxy/css/poxy-pygments.css diff --git a/src/poxy/data/css/poxy-theme-dark.css b/src/poxy/css/poxy-theme-dark.css similarity index 100% rename from src/poxy/data/css/poxy-theme-dark.css rename to src/poxy/css/poxy-theme-dark.css diff --git a/src/poxy/data/css/poxy-theme-light.css b/src/poxy/css/poxy-theme-light.css similarity index 100% rename from src/poxy/data/css/poxy-theme-light.css rename to src/poxy/css/poxy-theme-light.css diff --git a/src/poxy/data/css/poxy.css b/src/poxy/css/poxy.css similarity index 61% rename from src/poxy/data/css/poxy.css rename to src/poxy/css/poxy.css index 4283074..390e4c1 100644 --- a/src/poxy/data/css/poxy.css +++ b/src/poxy/css/poxy.css @@ -19,23 +19,23 @@ */ /* base font */ -@import url('https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,600i%7CSource+Code+Pro:400,400i,600'); +@import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,600i%7CSource+Code+Pro:400,400i,600"); /* vars for dark theme */ -@import url('m-theme-dark.css'); -@import url('poxy-theme-dark.css'); +@import url("m-theme-dark.css"); +@import url("poxy-theme-dark.css"); /* vars for light theme */ -@import url('m-theme-light.css'); -@import url('poxy-theme-light.css'); +@import url("m-theme-light.css"); +@import url("poxy-theme-light.css"); /* m.css */ -@import url('../m.css/css/m-grid.css'); -@import url('../m.css/css/m-components.css'); -@import url('m-special.css'); -@import url('../m.css/css/m-layout.css'); -@import url('poxy-pygments.css'); -@import url('../m.css/css/m-documentation.css'); +@import url("../mcss/css/m-grid.css"); +@import url("../mcss/css/m-components.css"); +@import url("m-special.css"); +@import url("../mcss/css/m-layout.css"); +@import url("poxy-pygments.css"); +@import url("../mcss/css/m-documentation.css"); /* poxy overrides */ -@import url('poxy-overrides.css'); +@import url("poxy-overrides.css"); diff --git a/src/poxy/data/generated/6aa12ac32e258617e37a0030dc54f789b894368b.css b/src/poxy/generated/6aa12ac32e258617e37a0030dc54f789b894368b.css similarity index 100% rename from src/poxy/data/generated/6aa12ac32e258617e37a0030dc54f789b894368b.css rename to src/poxy/generated/6aa12ac32e258617e37a0030dc54f789b894368b.css diff --git a/src/poxy/data/generated/emoji.json b/src/poxy/generated/emoji.json similarity index 100% rename from src/poxy/data/generated/emoji.json rename to src/poxy/generated/emoji.json diff --git a/src/poxy/data/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7jsDJT9g.woff2 b/src/poxy/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7jsDJT9g.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7jsDJT9g.woff2 rename to src/poxy/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7jsDJT9g.woff2 diff --git a/src/poxy/data/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7ksDJT9g.woff2 b/src/poxy/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7ksDJT9g.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7ksDJT9g.woff2 rename to src/poxy/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7ksDJT9g.woff2 diff --git a/src/poxy/data/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7nsDI.woff2 b/src/poxy/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7nsDI.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7nsDI.woff2 rename to src/poxy/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7nsDI.woff2 diff --git a/src/poxy/data/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7osDJT9g.woff2 b/src/poxy/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7osDJT9g.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7osDJT9g.woff2 rename to src/poxy/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7osDJT9g.woff2 diff --git a/src/poxy/data/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7psDJT9g.woff2 b/src/poxy/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7psDJT9g.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7psDJT9g.woff2 rename to src/poxy/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7psDJT9g.woff2 diff --git a/src/poxy/data/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7qsDJT9g.woff2 b/src/poxy/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7qsDJT9g.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7qsDJT9g.woff2 rename to src/poxy/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7qsDJT9g.woff2 diff --git a/src/poxy/data/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7rsDJT9g.woff2 b/src/poxy/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7rsDJT9g.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7rsDJT9g.woff2 rename to src/poxy/generated/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7rsDJT9g.woff2 diff --git a/src/poxy/data/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qN67lqDY.woff2 b/src/poxy/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qN67lqDY.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qN67lqDY.woff2 rename to src/poxy/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qN67lqDY.woff2 diff --git a/src/poxy/data/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qNK7lqDY.woff2 b/src/poxy/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qNK7lqDY.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qNK7lqDY.woff2 rename to src/poxy/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qNK7lqDY.woff2 diff --git a/src/poxy/data/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qNa7lqDY.woff2 b/src/poxy/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qNa7lqDY.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qNa7lqDY.woff2 rename to src/poxy/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qNa7lqDY.woff2 diff --git a/src/poxy/data/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qNq7lqDY.woff2 b/src/poxy/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qNq7lqDY.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qNq7lqDY.woff2 rename to src/poxy/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qNq7lqDY.woff2 diff --git a/src/poxy/data/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qO67lqDY.woff2 b/src/poxy/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qO67lqDY.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qO67lqDY.woff2 rename to src/poxy/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qO67lqDY.woff2 diff --git a/src/poxy/data/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7l.woff2 b/src/poxy/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7l.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7l.woff2 rename to src/poxy/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7l.woff2 diff --git a/src/poxy/data/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qPK7lqDY.woff2 b/src/poxy/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qPK7lqDY.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qPK7lqDY.woff2 rename to src/poxy/generated/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qPK7lqDY.woff2 diff --git a/src/poxy/data/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCdg18Smxg.woff2 b/src/poxy/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCdg18Smxg.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCdg18Smxg.woff2 rename to src/poxy/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCdg18Smxg.woff2 diff --git a/src/poxy/data/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCdh18Smxg.woff2 b/src/poxy/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCdh18Smxg.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCdh18Smxg.woff2 rename to src/poxy/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCdh18Smxg.woff2 diff --git a/src/poxy/data/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCdi18Smxg.woff2 b/src/poxy/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCdi18Smxg.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCdi18Smxg.woff2 rename to src/poxy/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCdi18Smxg.woff2 diff --git a/src/poxy/data/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCdj18Smxg.woff2 b/src/poxy/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCdj18Smxg.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCdj18Smxg.woff2 rename to src/poxy/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCdj18Smxg.woff2 diff --git a/src/poxy/data/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCdo18Smxg.woff2 b/src/poxy/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCdo18Smxg.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCdo18Smxg.woff2 rename to src/poxy/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCdo18Smxg.woff2 diff --git a/src/poxy/data/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCds18Q.woff2 b/src/poxy/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCds18Q.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCds18Q.woff2 rename to src/poxy/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCds18Q.woff2 diff --git a/src/poxy/data/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCdv18Smxg.woff2 b/src/poxy/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCdv18Smxg.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCdv18Smxg.woff2 rename to src/poxy/generated/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCdv18Smxg.woff2 diff --git a/src/poxy/data/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwkxduz8A.woff2 b/src/poxy/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwkxduz8A.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwkxduz8A.woff2 rename to src/poxy/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwkxduz8A.woff2 diff --git a/src/poxy/data/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlBduz8A.woff2 b/src/poxy/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlBduz8A.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlBduz8A.woff2 rename to src/poxy/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlBduz8A.woff2 diff --git a/src/poxy/data/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlxdu.woff2 b/src/poxy/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlxdu.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlxdu.woff2 rename to src/poxy/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlxdu.woff2 diff --git a/src/poxy/data/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwmBduz8A.woff2 b/src/poxy/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwmBduz8A.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwmBduz8A.woff2 rename to src/poxy/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwmBduz8A.woff2 diff --git a/src/poxy/data/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwmRduz8A.woff2 b/src/poxy/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwmRduz8A.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwmRduz8A.woff2 rename to src/poxy/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwmRduz8A.woff2 diff --git a/src/poxy/data/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwmhduz8A.woff2 b/src/poxy/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwmhduz8A.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwmhduz8A.woff2 rename to src/poxy/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwmhduz8A.woff2 diff --git a/src/poxy/data/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwmxduz8A.woff2 b/src/poxy/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwmxduz8A.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwmxduz8A.woff2 rename to src/poxy/generated/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwmxduz8A.woff2 diff --git a/src/poxy/data/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlM-vWjMY.woff2 b/src/poxy/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlM-vWjMY.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlM-vWjMY.woff2 rename to src/poxy/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlM-vWjMY.woff2 diff --git a/src/poxy/data/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlMOvWjMY.woff2 b/src/poxy/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlMOvWjMY.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlMOvWjMY.woff2 rename to src/poxy/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlMOvWjMY.woff2 diff --git a/src/poxy/data/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlMevWjMY.woff2 b/src/poxy/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlMevWjMY.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlMevWjMY.woff2 rename to src/poxy/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlMevWjMY.woff2 diff --git a/src/poxy/data/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlMuvWjMY.woff2 b/src/poxy/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlMuvWjMY.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlMuvWjMY.woff2 rename to src/poxy/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlMuvWjMY.woff2 diff --git a/src/poxy/data/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlOevWjMY.woff2 b/src/poxy/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlOevWjMY.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlOevWjMY.woff2 rename to src/poxy/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlOevWjMY.woff2 diff --git a/src/poxy/data/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlPevW.woff2 b/src/poxy/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlPevW.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlPevW.woff2 rename to src/poxy/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlPevW.woff2 diff --git a/src/poxy/data/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlPuvWjMY.woff2 b/src/poxy/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlPuvWjMY.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlPuvWjMY.woff2 rename to src/poxy/generated/fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlPuvWjMY.woff2 diff --git a/src/poxy/data/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bQ10YVJg.woff2 b/src/poxy/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bQ10YVJg.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bQ10YVJg.woff2 rename to src/poxy/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bQ10YVJg.woff2 diff --git a/src/poxy/data/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bQF0YVJg.woff2 b/src/poxy/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bQF0YVJg.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bQF0YVJg.woff2 rename to src/poxy/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bQF0YVJg.woff2 diff --git a/src/poxy/data/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bQV0YVJg.woff2 b/src/poxy/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bQV0YVJg.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bQV0YVJg.woff2 rename to src/poxy/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bQV0YVJg.woff2 diff --git a/src/poxy/data/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bQl0YVJg.woff2 b/src/poxy/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bQl0YVJg.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bQl0YVJg.woff2 rename to src/poxy/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bQl0YVJg.woff2 diff --git a/src/poxy/data/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bSl0YVJg.woff2 b/src/poxy/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bSl0YVJg.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bSl0YVJg.woff2 rename to src/poxy/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bSl0YVJg.woff2 diff --git a/src/poxy/data/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bTV0YVJg.woff2 b/src/poxy/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bTV0YVJg.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bTV0YVJg.woff2 rename to src/poxy/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bTV0YVJg.woff2 diff --git a/src/poxy/data/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bTl0Y.woff2 b/src/poxy/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bTl0Y.woff2 similarity index 100% rename from src/poxy/data/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bTl0Y.woff2 rename to src/poxy/generated/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1bTl0Y.woff2 diff --git a/src/poxy/data/generated/poxy.css b/src/poxy/generated/poxy.css similarity index 99% rename from src/poxy/data/generated/poxy.css rename to src/poxy/generated/poxy.css index c73c7af..9704ce6 100644 --- a/src/poxy/data/generated/poxy.css +++ b/src/poxy/generated/poxy.css @@ -673,7 +673,7 @@ calc(var(--special-luminosity) * 1.4) --detail-section-background-color: rgba(255, 255, 255, 0.3); --sponsor-color: #f8c8dc; } -/*==== ../m.css/css/m-grid.css =======================================================================================*/ +/*==== ../mcss/css/m-grid.css ========================================================================================*/ *, ::before, ::after { box-sizing: border-box; } body { margin: 0; } .m-container { width: 100%; margin: auto; padding-left: 1rem; padding-right: 1rem; } @@ -882,7 +882,7 @@ body { margin: 0; } .m-show-l { display: block; } .m-col-l-none { width: auto; float: none; } } -/*==== ../m.css/css/m-components.css =================================================================================*/ +/*==== ../mcss/css/m-components.css ==================================================================================*/ html { font-size: var(--font-size); background-color: var(--background-color); } body { font-family: var(--font); font-size: 1rem; line-height: var(--line-height); color: var(--color); } h1, h2, h3, h4, h5, h6 { margin-top: 0; font-weight: var(--heading-font-weight); } @@ -1936,7 +1936,7 @@ div.m-plot svg .m-bar.m-special, .m-graph g.m-node.m-special polyline, .m-graph g.m-cluster.m-special polygon { stroke: var(--special-color); } .m-container-inflatable section:target .m-note.m-info { border-color: var(--info-color); } -/*==== ../m.css/css/m-layout.css =====================================================================================*/ +/*==== ../mcss/css/m-layout.css ======================================================================================*/ body > header > nav { width: 100%; background-color: var(--header-background-color); min-height: 3rem; } body > header > nav.m-navbar-landing, body > header > nav.m-navbar-cover { background-color: transparent; position: relative; } @@ -2462,7 +2462,7 @@ border-left-width: 0.125rem; .m-console .go { color: var(--console-color); } .m-console .gp { color: #16a085; font-weight: bold } .m-console .w { color: var(--console-color); } -/*==== ../m.css/css/m-documentation.css ==============================================================================*/ +/*==== ../mcss/css/m-documentation.css ===============================================================================*/ a.m-doc, a.m-doc-self, a.m-doc-external, ul.m-doc li.m-doc-expansible > a:first-child, ul.m-doc li.m-doc-collapsible > a:first-child, .m-code.m-inverted.m-doc-include > a { text-decoration: none; } diff --git a/src/poxy/data/poxy-badge-c++03.svg b/src/poxy/img/poxy-badge-c++03.svg similarity index 100% rename from src/poxy/data/poxy-badge-c++03.svg rename to src/poxy/img/poxy-badge-c++03.svg diff --git a/src/poxy/data/poxy-badge-c++11.svg b/src/poxy/img/poxy-badge-c++11.svg similarity index 100% rename from src/poxy/data/poxy-badge-c++11.svg rename to src/poxy/img/poxy-badge-c++11.svg diff --git a/src/poxy/data/poxy-badge-c++14.svg b/src/poxy/img/poxy-badge-c++14.svg similarity index 100% rename from src/poxy/data/poxy-badge-c++14.svg rename to src/poxy/img/poxy-badge-c++14.svg diff --git a/src/poxy/data/poxy-badge-c++17.svg b/src/poxy/img/poxy-badge-c++17.svg similarity index 100% rename from src/poxy/data/poxy-badge-c++17.svg rename to src/poxy/img/poxy-badge-c++17.svg diff --git a/src/poxy/data/poxy-badge-c++20.svg b/src/poxy/img/poxy-badge-c++20.svg similarity index 100% rename from src/poxy/data/poxy-badge-c++20.svg rename to src/poxy/img/poxy-badge-c++20.svg diff --git a/src/poxy/data/poxy-badge-c++23.svg b/src/poxy/img/poxy-badge-c++23.svg similarity index 100% rename from src/poxy/data/poxy-badge-c++23.svg rename to src/poxy/img/poxy-badge-c++23.svg diff --git a/src/poxy/data/poxy-badge-c++26.svg b/src/poxy/img/poxy-badge-c++26.svg similarity index 100% rename from src/poxy/data/poxy-badge-c++26.svg rename to src/poxy/img/poxy-badge-c++26.svg diff --git a/src/poxy/data/poxy-badge-c++29.svg b/src/poxy/img/poxy-badge-c++29.svg similarity index 100% rename from src/poxy/data/poxy-badge-c++29.svg rename to src/poxy/img/poxy-badge-c++29.svg diff --git a/src/poxy/data/poxy-badge-c++98.svg b/src/poxy/img/poxy-badge-c++98.svg similarity index 100% rename from src/poxy/data/poxy-badge-c++98.svg rename to src/poxy/img/poxy-badge-c++98.svg diff --git a/src/poxy/data/poxy-badge-license-apache_2.svg b/src/poxy/img/poxy-badge-license-apache_2.svg similarity index 100% rename from src/poxy/data/poxy-badge-license-apache_2.svg rename to src/poxy/img/poxy-badge-license-apache_2.svg diff --git a/src/poxy/data/poxy-badge-license-bsd_2_clause.svg b/src/poxy/img/poxy-badge-license-bsd_2_clause.svg similarity index 100% rename from src/poxy/data/poxy-badge-license-bsd_2_clause.svg rename to src/poxy/img/poxy-badge-license-bsd_2_clause.svg diff --git a/src/poxy/data/poxy-badge-license-bsd_3_clause.svg b/src/poxy/img/poxy-badge-license-bsd_3_clause.svg similarity index 100% rename from src/poxy/data/poxy-badge-license-bsd_3_clause.svg rename to src/poxy/img/poxy-badge-license-bsd_3_clause.svg diff --git a/src/poxy/data/poxy-badge-license-gpl.svg b/src/poxy/img/poxy-badge-license-gpl.svg similarity index 100% rename from src/poxy/data/poxy-badge-license-gpl.svg rename to src/poxy/img/poxy-badge-license-gpl.svg diff --git a/src/poxy/data/poxy-badge-license-gpl_2.svg b/src/poxy/img/poxy-badge-license-gpl_2.svg similarity index 100% rename from src/poxy/data/poxy-badge-license-gpl_2.svg rename to src/poxy/img/poxy-badge-license-gpl_2.svg diff --git a/src/poxy/data/poxy-badge-license-gpl_3.svg b/src/poxy/img/poxy-badge-license-gpl_3.svg similarity index 100% rename from src/poxy/data/poxy-badge-license-gpl_3.svg rename to src/poxy/img/poxy-badge-license-gpl_3.svg diff --git a/src/poxy/data/poxy-badge-license-lgpl.svg b/src/poxy/img/poxy-badge-license-lgpl.svg similarity index 100% rename from src/poxy/data/poxy-badge-license-lgpl.svg rename to src/poxy/img/poxy-badge-license-lgpl.svg diff --git a/src/poxy/data/poxy-badge-license-lgpl_2.svg b/src/poxy/img/poxy-badge-license-lgpl_2.svg similarity index 100% rename from src/poxy/data/poxy-badge-license-lgpl_2.svg rename to src/poxy/img/poxy-badge-license-lgpl_2.svg diff --git a/src/poxy/data/poxy-badge-license-lgpl_2_1.svg b/src/poxy/img/poxy-badge-license-lgpl_2_1.svg similarity index 100% rename from src/poxy/data/poxy-badge-license-lgpl_2_1.svg rename to src/poxy/img/poxy-badge-license-lgpl_2_1.svg diff --git a/src/poxy/data/poxy-badge-license-lgpl_3.svg b/src/poxy/img/poxy-badge-license-lgpl_3.svg similarity index 100% rename from src/poxy/data/poxy-badge-license-lgpl_3.svg rename to src/poxy/img/poxy-badge-license-lgpl_3.svg diff --git a/src/poxy/data/poxy-badge-license-mit.svg b/src/poxy/img/poxy-badge-license-mit.svg similarity index 100% rename from src/poxy/data/poxy-badge-license-mit.svg rename to src/poxy/img/poxy-badge-license-mit.svg diff --git a/src/poxy/data/poxy-icon-email.svg b/src/poxy/img/poxy-icon-email.svg similarity index 100% rename from src/poxy/data/poxy-icon-email.svg rename to src/poxy/img/poxy-icon-email.svg diff --git a/src/poxy/data/poxy-icon-github.svg b/src/poxy/img/poxy-icon-github.svg similarity index 100% rename from src/poxy/data/poxy-icon-github.svg rename to src/poxy/img/poxy-icon-github.svg diff --git a/src/poxy/data/poxy-icon-gitlab.svg b/src/poxy/img/poxy-icon-gitlab.svg similarity index 100% rename from src/poxy/data/poxy-icon-gitlab.svg rename to src/poxy/img/poxy-icon-gitlab.svg diff --git a/src/poxy/data/poxy-icon-sponsor.svg b/src/poxy/img/poxy-icon-sponsor.svg similarity index 100% rename from src/poxy/data/poxy-icon-sponsor.svg rename to src/poxy/img/poxy-icon-sponsor.svg diff --git a/src/poxy/data/poxy-icon-theme.svg b/src/poxy/img/poxy-icon-theme.svg similarity index 100% rename from src/poxy/data/poxy-icon-theme.svg rename to src/poxy/img/poxy-icon-theme.svg diff --git a/src/poxy/data/poxy-icon-twitter.svg b/src/poxy/img/poxy-icon-twitter.svg similarity index 100% rename from src/poxy/data/poxy-icon-twitter.svg rename to src/poxy/img/poxy-icon-twitter.svg diff --git a/src/poxy/data/jquery-3.6.0.slim.min.js b/src/poxy/js/jquery-3.6.0.slim.min.js similarity index 100% rename from src/poxy/data/jquery-3.6.0.slim.min.js rename to src/poxy/js/jquery-3.6.0.slim.min.js diff --git a/src/poxy/data/poxy.js b/src/poxy/js/poxy.js similarity index 100% rename from src/poxy/data/poxy.js rename to src/poxy/js/poxy.js diff --git a/src/poxy/data/m.css/CONTRIBUTING.rst b/src/poxy/mcss/CONTRIBUTING.rst similarity index 100% rename from src/poxy/data/m.css/CONTRIBUTING.rst rename to src/poxy/mcss/CONTRIBUTING.rst diff --git a/src/poxy/data/m.css/COPYING b/src/poxy/mcss/COPYING similarity index 100% rename from src/poxy/data/m.css/COPYING rename to src/poxy/mcss/COPYING diff --git a/src/poxy/data/m.css/CREDITS.rst b/src/poxy/mcss/CREDITS.rst similarity index 100% rename from src/poxy/data/m.css/CREDITS.rst rename to src/poxy/mcss/CREDITS.rst diff --git a/src/poxy/data/m.css/README.rst b/src/poxy/mcss/README.rst similarity index 100% rename from src/poxy/data/m.css/README.rst rename to src/poxy/mcss/README.rst diff --git a/src/poxy/data/m.css/css/m-components.css b/src/poxy/mcss/css/m-components.css similarity index 100% rename from src/poxy/data/m.css/css/m-components.css rename to src/poxy/mcss/css/m-components.css diff --git a/src/poxy/data/m.css/css/m-debug.css b/src/poxy/mcss/css/m-debug.css similarity index 100% rename from src/poxy/data/m.css/css/m-debug.css rename to src/poxy/mcss/css/m-debug.css diff --git a/src/poxy/data/m.css/css/m-documentation.css b/src/poxy/mcss/css/m-documentation.css similarity index 100% rename from src/poxy/data/m.css/css/m-documentation.css rename to src/poxy/mcss/css/m-documentation.css diff --git a/src/poxy/data/m.css/css/m-grid.css b/src/poxy/mcss/css/m-grid.css similarity index 100% rename from src/poxy/data/m.css/css/m-grid.css rename to src/poxy/mcss/css/m-grid.css diff --git a/src/poxy/data/m.css/css/m-layout.css b/src/poxy/mcss/css/m-layout.css similarity index 100% rename from src/poxy/data/m.css/css/m-layout.css rename to src/poxy/mcss/css/m-layout.css diff --git a/src/poxy/data/m.css/css/pygments-console.css b/src/poxy/mcss/css/pygments-console.css similarity index 100% rename from src/poxy/data/m.css/css/pygments-console.css rename to src/poxy/mcss/css/pygments-console.css diff --git a/src/poxy/data/m.css/css/pygments-dark.css b/src/poxy/mcss/css/pygments-dark.css similarity index 100% rename from src/poxy/data/m.css/css/pygments-dark.css rename to src/poxy/mcss/css/pygments-dark.css diff --git a/src/poxy/data/m.css/documentation/__init__.py b/src/poxy/mcss/documentation/__init__.py similarity index 100% rename from src/poxy/data/m.css/documentation/__init__.py rename to src/poxy/mcss/documentation/__init__.py diff --git a/src/poxy/data/m.css/documentation/_search.py b/src/poxy/mcss/documentation/_search.py similarity index 100% rename from src/poxy/data/m.css/documentation/_search.py rename to src/poxy/mcss/documentation/_search.py diff --git a/src/poxy/data/m.css/documentation/doxygen.py b/src/poxy/mcss/documentation/doxygen.py similarity index 100% rename from src/poxy/data/m.css/documentation/doxygen.py rename to src/poxy/mcss/documentation/doxygen.py diff --git a/src/poxy/data/m.css/documentation/favicon-dark.png b/src/poxy/mcss/documentation/favicon-dark.png similarity index 100% rename from src/poxy/data/m.css/documentation/favicon-dark.png rename to src/poxy/mcss/documentation/favicon-dark.png diff --git a/src/poxy/data/m.css/documentation/favicon-light.png b/src/poxy/mcss/documentation/favicon-light.png similarity index 100% rename from src/poxy/data/m.css/documentation/favicon-light.png rename to src/poxy/mcss/documentation/favicon-light.png diff --git a/src/poxy/data/m.css/documentation/python.py b/src/poxy/mcss/documentation/python.py similarity index 100% rename from src/poxy/data/m.css/documentation/python.py rename to src/poxy/mcss/documentation/python.py diff --git a/src/poxy/data/m.css/documentation/search.js b/src/poxy/mcss/documentation/search.js similarity index 100% rename from src/poxy/data/m.css/documentation/search.js rename to src/poxy/mcss/documentation/search.js diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/annotated.html b/src/poxy/mcss/documentation/templates/doxygen/annotated.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/annotated.html rename to src/poxy/mcss/documentation/templates/doxygen/annotated.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/base-class-reference.html b/src/poxy/mcss/documentation/templates/doxygen/base-class-reference.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/base-class-reference.html rename to src/poxy/mcss/documentation/templates/doxygen/base-class-reference.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/base-index.html b/src/poxy/mcss/documentation/templates/doxygen/base-index.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/base-index.html rename to src/poxy/mcss/documentation/templates/doxygen/base-index.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/base-reference.html b/src/poxy/mcss/documentation/templates/doxygen/base-reference.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/base-reference.html rename to src/poxy/mcss/documentation/templates/doxygen/base-reference.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/base.html b/src/poxy/mcss/documentation/templates/doxygen/base.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/base.html rename to src/poxy/mcss/documentation/templates/doxygen/base.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/class.html b/src/poxy/mcss/documentation/templates/doxygen/class.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/class.html rename to src/poxy/mcss/documentation/templates/doxygen/class.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/concept.html b/src/poxy/mcss/documentation/templates/doxygen/concept.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/concept.html rename to src/poxy/mcss/documentation/templates/doxygen/concept.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/concepts.html b/src/poxy/mcss/documentation/templates/doxygen/concepts.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/concepts.html rename to src/poxy/mcss/documentation/templates/doxygen/concepts.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/details-define.html b/src/poxy/mcss/documentation/templates/doxygen/details-define.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/details-define.html rename to src/poxy/mcss/documentation/templates/doxygen/details-define.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/details-enum.html b/src/poxy/mcss/documentation/templates/doxygen/details-enum.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/details-enum.html rename to src/poxy/mcss/documentation/templates/doxygen/details-enum.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/details-func.html b/src/poxy/mcss/documentation/templates/doxygen/details-func.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/details-func.html rename to src/poxy/mcss/documentation/templates/doxygen/details-func.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/details-typedef.html b/src/poxy/mcss/documentation/templates/doxygen/details-typedef.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/details-typedef.html rename to src/poxy/mcss/documentation/templates/doxygen/details-typedef.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/details-var.html b/src/poxy/mcss/documentation/templates/doxygen/details-var.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/details-var.html rename to src/poxy/mcss/documentation/templates/doxygen/details-var.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/dir.html b/src/poxy/mcss/documentation/templates/doxygen/dir.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/dir.html rename to src/poxy/mcss/documentation/templates/doxygen/dir.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/entry-class.html b/src/poxy/mcss/documentation/templates/doxygen/entry-class.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/entry-class.html rename to src/poxy/mcss/documentation/templates/doxygen/entry-class.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/entry-concept.html b/src/poxy/mcss/documentation/templates/doxygen/entry-concept.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/entry-concept.html rename to src/poxy/mcss/documentation/templates/doxygen/entry-concept.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/entry-define.html b/src/poxy/mcss/documentation/templates/doxygen/entry-define.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/entry-define.html rename to src/poxy/mcss/documentation/templates/doxygen/entry-define.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/entry-dir.html b/src/poxy/mcss/documentation/templates/doxygen/entry-dir.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/entry-dir.html rename to src/poxy/mcss/documentation/templates/doxygen/entry-dir.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/entry-enum.html b/src/poxy/mcss/documentation/templates/doxygen/entry-enum.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/entry-enum.html rename to src/poxy/mcss/documentation/templates/doxygen/entry-enum.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/entry-file.html b/src/poxy/mcss/documentation/templates/doxygen/entry-file.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/entry-file.html rename to src/poxy/mcss/documentation/templates/doxygen/entry-file.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/entry-func.html b/src/poxy/mcss/documentation/templates/doxygen/entry-func.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/entry-func.html rename to src/poxy/mcss/documentation/templates/doxygen/entry-func.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/entry-module.html b/src/poxy/mcss/documentation/templates/doxygen/entry-module.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/entry-module.html rename to src/poxy/mcss/documentation/templates/doxygen/entry-module.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/entry-namespace.html b/src/poxy/mcss/documentation/templates/doxygen/entry-namespace.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/entry-namespace.html rename to src/poxy/mcss/documentation/templates/doxygen/entry-namespace.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/entry-typedef.html b/src/poxy/mcss/documentation/templates/doxygen/entry-typedef.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/entry-typedef.html rename to src/poxy/mcss/documentation/templates/doxygen/entry-typedef.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/entry-var.html b/src/poxy/mcss/documentation/templates/doxygen/entry-var.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/entry-var.html rename to src/poxy/mcss/documentation/templates/doxygen/entry-var.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/example.html b/src/poxy/mcss/documentation/templates/doxygen/example.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/example.html rename to src/poxy/mcss/documentation/templates/doxygen/example.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/file.html b/src/poxy/mcss/documentation/templates/doxygen/file.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/file.html rename to src/poxy/mcss/documentation/templates/doxygen/file.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/files.html b/src/poxy/mcss/documentation/templates/doxygen/files.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/files.html rename to src/poxy/mcss/documentation/templates/doxygen/files.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/group.html b/src/poxy/mcss/documentation/templates/doxygen/group.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/group.html rename to src/poxy/mcss/documentation/templates/doxygen/group.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/modules.html b/src/poxy/mcss/documentation/templates/doxygen/modules.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/modules.html rename to src/poxy/mcss/documentation/templates/doxygen/modules.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/namespace.html b/src/poxy/mcss/documentation/templates/doxygen/namespace.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/namespace.html rename to src/poxy/mcss/documentation/templates/doxygen/namespace.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/namespaces.html b/src/poxy/mcss/documentation/templates/doxygen/namespaces.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/namespaces.html rename to src/poxy/mcss/documentation/templates/doxygen/namespaces.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/opensearch.xml b/src/poxy/mcss/documentation/templates/doxygen/opensearch.xml similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/opensearch.xml rename to src/poxy/mcss/documentation/templates/doxygen/opensearch.xml diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/page.html b/src/poxy/mcss/documentation/templates/doxygen/page.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/page.html rename to src/poxy/mcss/documentation/templates/doxygen/page.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/pages.html b/src/poxy/mcss/documentation/templates/doxygen/pages.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/pages.html rename to src/poxy/mcss/documentation/templates/doxygen/pages.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/struct.html b/src/poxy/mcss/documentation/templates/doxygen/struct.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/struct.html rename to src/poxy/mcss/documentation/templates/doxygen/struct.html diff --git a/src/poxy/data/m.css/documentation/templates/doxygen/union.html b/src/poxy/mcss/documentation/templates/doxygen/union.html similarity index 100% rename from src/poxy/data/m.css/documentation/templates/doxygen/union.html rename to src/poxy/mcss/documentation/templates/doxygen/union.html diff --git a/src/poxy/data/m.css/plugins/ansilexer.py b/src/poxy/mcss/plugins/ansilexer.py similarity index 100% rename from src/poxy/data/m.css/plugins/ansilexer.py rename to src/poxy/mcss/plugins/ansilexer.py diff --git a/src/poxy/data/m.css/plugins/dot2svg.py b/src/poxy/mcss/plugins/dot2svg.py similarity index 100% rename from src/poxy/data/m.css/plugins/dot2svg.py rename to src/poxy/mcss/plugins/dot2svg.py diff --git a/src/poxy/data/m.css/plugins/latex2svg.py b/src/poxy/mcss/plugins/latex2svg.py similarity index 100% rename from src/poxy/data/m.css/plugins/latex2svg.py rename to src/poxy/mcss/plugins/latex2svg.py diff --git a/src/poxy/data/m.css/plugins/latex2svgextra.py b/src/poxy/mcss/plugins/latex2svgextra.py similarity index 100% rename from src/poxy/data/m.css/plugins/latex2svgextra.py rename to src/poxy/mcss/plugins/latex2svgextra.py diff --git a/src/poxy/data/m.css/plugins/m/__init__.py b/src/poxy/mcss/plugins/m/__init__.py similarity index 100% rename from src/poxy/data/m.css/plugins/m/__init__.py rename to src/poxy/mcss/plugins/m/__init__.py diff --git a/src/poxy/data/m.css/plugins/m/abbr.py b/src/poxy/mcss/plugins/m/abbr.py similarity index 100% rename from src/poxy/data/m.css/plugins/m/abbr.py rename to src/poxy/mcss/plugins/m/abbr.py diff --git a/src/poxy/data/m.css/plugins/m/alias.py b/src/poxy/mcss/plugins/m/alias.py similarity index 100% rename from src/poxy/data/m.css/plugins/m/alias.py rename to src/poxy/mcss/plugins/m/alias.py diff --git a/src/poxy/data/m.css/plugins/m/code.py b/src/poxy/mcss/plugins/m/code.py similarity index 100% rename from src/poxy/data/m.css/plugins/m/code.py rename to src/poxy/mcss/plugins/m/code.py diff --git a/src/poxy/data/m.css/plugins/m/components.py b/src/poxy/mcss/plugins/m/components.py similarity index 100% rename from src/poxy/data/m.css/plugins/m/components.py rename to src/poxy/mcss/plugins/m/components.py diff --git a/src/poxy/data/m.css/plugins/m/dot.py b/src/poxy/mcss/plugins/m/dot.py similarity index 100% rename from src/poxy/data/m.css/plugins/m/dot.py rename to src/poxy/mcss/plugins/m/dot.py diff --git a/src/poxy/data/m.css/plugins/m/dox.py b/src/poxy/mcss/plugins/m/dox.py similarity index 100% rename from src/poxy/data/m.css/plugins/m/dox.py rename to src/poxy/mcss/plugins/m/dox.py diff --git a/src/poxy/data/m.css/plugins/m/filesize.py b/src/poxy/mcss/plugins/m/filesize.py similarity index 100% rename from src/poxy/data/m.css/plugins/m/filesize.py rename to src/poxy/mcss/plugins/m/filesize.py diff --git a/src/poxy/data/m.css/plugins/m/gh.py b/src/poxy/mcss/plugins/m/gh.py similarity index 100% rename from src/poxy/data/m.css/plugins/m/gh.py rename to src/poxy/mcss/plugins/m/gh.py diff --git a/src/poxy/data/m.css/plugins/m/gl.py b/src/poxy/mcss/plugins/m/gl.py similarity index 100% rename from src/poxy/data/m.css/plugins/m/gl.py rename to src/poxy/mcss/plugins/m/gl.py diff --git a/src/poxy/data/m.css/plugins/m/htmlsanity.py b/src/poxy/mcss/plugins/m/htmlsanity.py similarity index 100% rename from src/poxy/data/m.css/plugins/m/htmlsanity.py rename to src/poxy/mcss/plugins/m/htmlsanity.py diff --git a/src/poxy/data/m.css/plugins/m/images.py b/src/poxy/mcss/plugins/m/images.py similarity index 100% rename from src/poxy/data/m.css/plugins/m/images.py rename to src/poxy/mcss/plugins/m/images.py diff --git a/src/poxy/data/m.css/plugins/m/link.py b/src/poxy/mcss/plugins/m/link.py similarity index 100% rename from src/poxy/data/m.css/plugins/m/link.py rename to src/poxy/mcss/plugins/m/link.py diff --git a/src/poxy/data/m.css/plugins/m/math.py b/src/poxy/mcss/plugins/m/math.py similarity index 100% rename from src/poxy/data/m.css/plugins/m/math.py rename to src/poxy/mcss/plugins/m/math.py diff --git a/src/poxy/data/m.css/plugins/m/metadata.py b/src/poxy/mcss/plugins/m/metadata.py similarity index 100% rename from src/poxy/data/m.css/plugins/m/metadata.py rename to src/poxy/mcss/plugins/m/metadata.py diff --git a/src/poxy/data/m.css/plugins/m/plots.py b/src/poxy/mcss/plugins/m/plots.py similarity index 100% rename from src/poxy/data/m.css/plugins/m/plots.py rename to src/poxy/mcss/plugins/m/plots.py diff --git a/src/poxy/data/m.css/plugins/m/qr.py b/src/poxy/mcss/plugins/m/qr.py similarity index 100% rename from src/poxy/data/m.css/plugins/m/qr.py rename to src/poxy/mcss/plugins/m/qr.py diff --git a/src/poxy/data/m.css/plugins/m/sphinx.py b/src/poxy/mcss/plugins/m/sphinx.py similarity index 100% rename from src/poxy/data/m.css/plugins/m/sphinx.py rename to src/poxy/mcss/plugins/m/sphinx.py diff --git a/src/poxy/data/m.css/plugins/m/vk.py b/src/poxy/mcss/plugins/m/vk.py similarity index 100% rename from src/poxy/data/m.css/plugins/m/vk.py rename to src/poxy/mcss/plugins/m/vk.py diff --git a/src/poxy/paths.py b/src/poxy/paths.py index 0cbf7e3..dea2cb8 100644 --- a/src/poxy/paths.py +++ b/src/poxy/paths.py @@ -23,16 +23,19 @@ TESTS = Path(REPOSITORY, r'tests') """The root directory of the repository's tests.""" -DATA = Path(PACKAGE, r'data') -"""The root directory of all package data.""" +IMG = Path(PACKAGE, r'img') +"""The img directory.""" -CSS = Path(DATA, r'css') +CSS = Path(PACKAGE, r'css') """The css directory.""" -MCSS = Path(DATA, r'm.css') +JS = Path(PACKAGE, r'js') +"""The js directory.""" + +MCSS = Path(PACKAGE, r'mcss') """The root directory of the bundled m.css build.""" -GENERATED = Path(DATA, r'generated') +GENERATED = Path(PACKAGE, r'generated') """The root directory of all auto-generated package data.""" FONTS = Path(GENERATED, r'fonts') diff --git a/src/poxy/project.py b/src/poxy/project.py index d19863b..a7e7d85 100644 --- a/src/poxy/project.py +++ b/src/poxy/project.py @@ -1154,11 +1154,12 @@ def __init__( self.now = datetime.datetime.utcnow().replace(microsecond=0, tzinfo=datetime.timezone.utc) self.verbose_value(r'dirs.PACKAGE', paths.PACKAGE) - self.verbose_value(r'dirs.DATA', paths.DATA) - self.verbose_value(r'dirs.MCSS', paths.MCSS) self.verbose_value(r'dirs.CSS', paths.CSS) self.verbose_value(r'dirs.GENERATED', paths.GENERATED) self.verbose_value(r'dirs.FONTS', paths.FONTS) + self.verbose_value(r'dirs.IMG', paths.IMG) + self.verbose_value(r'dirs.JS', paths.JS) + self.verbose_value(r'dirs.MCSS', paths.MCSS) self.verbose_value(r'dirs.TEMP', paths.TEMP) self.verbose_value(r'doxygen.path()', doxygen.path()) @@ -1171,7 +1172,7 @@ def __init__( self.verbose_value(r'Context.output_dir', self.output_dir) assert self.output_dir.is_absolute() self.case_sensitive_paths = not ( - Path(str(paths.DATA).upper()).exists() and Path(str(paths.DATA).lower()).exists() + Path(str(paths.PACKAGE).upper()).exists() and Path(str(paths.PACKAGE).lower()).exists() ) self.verbose_value(r'Context.case_sensitive_paths', self.case_sensitive_paths) @@ -1254,7 +1255,7 @@ def __init__( assert self.mcss_conf_path.is_absolute() # misc - self.cppref_tagfile = coerce_path(paths.DATA, r'cppreference-doxygen-web.tag.xml').resolve() + self.cppref_tagfile = coerce_path(paths.PACKAGE, r'cppreference-doxygen-web.tag.xml').resolve() self.verbose_value(r'Context.cppref_tagfile', self.cppref_tagfile) assert_existing_file(self.cppref_tagfile) assert self.cppref_tagfile.is_absolute() @@ -1266,15 +1267,21 @@ def __init__( self.scripts = [] self.stylesheets = [] - def add_internal_asset(p): + def add_internal_asset(p) -> str: nonlocal extra_files nonlocal self - if not self.copy_assets: - return + assert p is not None p = coerce_path(p) - if not p.is_absolute(): - p = Path(paths.DATA, p) - extra_files.append((p, rf'poxy/{p.name}')) + if self.copy_assets: + if not p.is_absolute(): + for dir in (paths.FONTS, paths.GENERATED, paths.JS, paths.IMG): + new_p = dir / p + if new_p.exists(): + p = new_p + break + assert_existing_file(p) + extra_files.append((p, rf'poxy/{p.name}')) + return rf'poxy/{p.name}' config = dict() if self.config_path.exists(): @@ -1317,12 +1324,11 @@ def add_internal_asset(p): badge = re.sub(r'(?:[.]0+)+$', '', spdx.lower()) # trailing .0, .0.0 etc badge = badge.strip(' \t-._:') # leading + trailing junk badge = re.sub(r'[:;!@#$%^&*\\|/,.<>?`~\[\]{}()_+\-= \t]+', '_', badge) # internal junk - badge = Path(paths.DATA, rf'poxy-badge-license-{badge}.svg') + badge = Path(paths.IMG, rf'poxy-badge-license-{badge}.svg') self.verbose(rf"Finding badge SVG for license '{spdx}'...") if badge.exists(): self.verbose(rf'Badge file found at {badge}') - add_internal_asset(badge) - badges.append((spdx, rf'poxy/{badge.name}', uri)) + badges.append((spdx, add_internal_asset(badge), uri)) self.verbose_value(r'Context.license', self.license) # project repo access level @@ -1402,8 +1408,7 @@ def add_internal_asset(p): elif r'theme' in config: self.theme = str(config[r'theme']) if self.theme != r'custom': - add_internal_asset(Path(paths.DATA, r'generated', r'poxy.css')) - self.stylesheets.append(rf'poxy/poxy.css') + self.stylesheets.append(add_internal_asset(paths.GENERATED / r'poxy.css')) self.verbose_value(r'Context.theme', self.theme) # stylesheets (HTML_EXTRA_STYLESHEETS) @@ -1421,14 +1426,12 @@ def add_internal_asset(p): # jquery if r'jquery' in config and config[r'jquery']: - jquery = enumerate_files(paths.DATA, any=r'jquery*.js')[0] + jquery = enumerate_files(paths.JS, any=r'jquery*.js')[0] if jquery is not None: - add_internal_asset(jquery) - self.scripts.append(rf'poxy/{jquery.name}') + self.scripts.append(add_internal_asset(jquery)) # scripts - add_internal_asset(r'poxy.js') - self.scripts.append(r'poxy/poxy.js') + self.scripts.append(add_internal_asset(paths.JS / r'poxy.js')) if r'scripts' in config: for f in coerce_collection(config[r'scripts']): file = f.strip() @@ -1787,7 +1790,7 @@ def add_internal_asset(p): extra_files.append(Path(file)) # add all the 'icon' svgs as internal assets so they can be used by users if they wish - for f in enumerate_files(paths.DATA, all='poxy-icon-*.svg', recursive=False): + for f in enumerate_files(paths.IMG, all='poxy-icon-*.svg', recursive=False): add_internal_asset(f) # finalize extra_files diff --git a/src/poxy/run.py b/src/poxy/run.py index 55b318d..aa85ddf 100644 --- a/src/poxy/run.py +++ b/src/poxy/run.py @@ -1104,11 +1104,14 @@ def preprocess_mcss_config(context: Context): if 1: # stylesheets for stylesheet in context.stylesheets: + assert stylesheet is not None html_header += f'\n' # scripts for script in context.scripts: + assert script is not None html_header += f'\n' if context.theme != r'custom': + assert context.theme is not None html_header += f'\n' # metadata @@ -1221,7 +1224,7 @@ def add_meta_kvp(key_name, key, content): if not context.repo: bar[i] = None continue - icon_path = Path(paths.DATA, context.repo.icon_filename) + icon_path = Path(paths.IMG, context.repo.icon_filename) if icon_path.exists(): svg = SVG(icon_path, logger=context.verbose_logger, root_id=r'poxy-icon-repo') bar[i] = ( @@ -1234,7 +1237,7 @@ def add_meta_kvp(key_name, key, content): bar[i] = None elif bar[i] == r'theme': svg = SVG( - Path(paths.DATA, r'poxy-icon-theme.svg'), + Path(paths.IMG, r'poxy-icon-theme.svg'), logger=context.verbose_logger, root_id=r'poxy-theme-switch-img', ) @@ -1246,7 +1249,7 @@ def add_meta_kvp(key_name, key, content): ) elif bar[i] == r'twitter': svg = SVG( - Path(paths.DATA, r'poxy-icon-twitter.svg'), + Path(paths.IMG, r'poxy-icon-twitter.svg'), logger=context.verbose_logger, root_id=r'poxy-icon-twitter', ) @@ -1258,7 +1261,7 @@ def add_meta_kvp(key_name, key, content): ) elif bar[i] == r'sponsor': svg = SVG( - Path(paths.DATA, r'poxy-icon-sponsor.svg'), + Path(paths.IMG, r'poxy-icon-sponsor.svg'), logger=context.verbose_logger, root_id=r'poxy-icon-sponsor', ) diff --git a/tests/regenerate_tests.py b/tests/regenerate_tests.py index abdd255..6a56b01 100644 --- a/tests/regenerate_tests.py +++ b/tests/regenerate_tests.py @@ -99,11 +99,9 @@ def regenerate_expected_outputs(): ) for path in files: text = read_all_text_from_file(path) - text = text.replace(r'href="poxy/poxy.css"', r'href="../../../src/poxy/data/css/poxy.css"') - text = text.replace(r'src="poxy/poxy.js"', r'src="../../../src/poxy/data/poxy.js"') - text = text.replace(r'src="search-v2.js"', r'src="../../../src/poxy/data/m.css/documentation/search.js"') - text = text.replace(r'href="poxy/', r'href="../../../src/poxy/data/') - text = text.replace(r'src="poxy/', r'src="../../../src/poxy/data/') + text = text.replace(r'href="poxy/poxy.css"', r'href="../../../src/poxy/css/poxy.css"') + text = text.replace(r'src="poxy/poxy.js"', r'src="../../../src/poxy/js/poxy.js"') + text = text.replace(r'src="search-v2.js"', r'src="../../../src/poxy/mcss/documentation/search.js"') text = re.sub(r'Poxy v[0-9]+[.][0-9]+[.][0-9]+', r'Poxy v0.0.0', text) text = re.sub(r'version="\s*[0-9]+[.][0-9]+[.][0-9]+\s*"', r'version="0.0.0"', text) text = re.sub(r'gitid="\s*[0-9a-fA-F]+\s*"', r'gitid="000000000000000000000000000000000000000"', text) diff --git a/tests/test_empty_project/expected_html/annotated.html b/tests/test_empty_project/expected_html/annotated.html index 3ed4122..dfd38f9 100644 --- a/tests/test_empty_project/expected_html/annotated.html +++ b/tests/test_empty_project/expected_html/annotated.html @@ -5,8 +5,8 @@ - - + + @@ -100,7 +100,7 @@

Classes

- +