fixed crash when tagfile is disabled

also: - fixed non-determinism in XML output formatting - fixed a few syntax highlighting edge-cases - improved performance of syntax highlighting post-process - lots of internal refactoring to simplify working with XML - renamed `theme_test` -> `theme_sandbox` - added sponsor badge to README - minor style fixes
marzer · Oct 16, 2022 · eb7bd61 · eb7bd61
1 parent 1eac6cf
commit eb7bd61
Show file tree

Hide file tree

Showing 48 changed files with 2,044 additions and 1,714 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## v0.10.2 - 2022-10-16
+
+-   fixed crash when tagfile is disabled
+-   fixed a few syntax highlighting edge-cases
+-   fixed non-determinism in XML output formatting
+-   improved performance of syntax highlighting post-process
+-   minor style fixes
+
 ## v0.10.1 - 2022-10-15
 
 -   minor style fixes

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -96,7 +96,7 @@ This will regenerate the amalgamated `poxy.css` that is shipped with documentati
 -   `--update-styles` is implied by `--update-mcss` and `--update-fonts`.
 -   While iterating on styles you **⚠&#xFE0F;do not⚠&#xFE0F;** need to fully regenerate the styles + rebuild some
     documentation to see your changes! That would be monumentally annoying. Instead you should use
-    `theme_test/index.html`, which uses the original version of `poxy.css` (the one that uses `@import`),
+    `theme_sandbox/index.html`, which uses the original version of `poxy.css` (the one that uses `@import`),
     not the amalgamated one.
 
 #### Updating the emoji database

diff --git a/README.md b/README.md
@@ -2,7 +2,8 @@
 
 Documentation generator for C++ based on Doxygen and [mosra/m.css](https://mcss.mosra.cz/).
 
-[![Gitter](https://badges.gitter.im/marzer/poxy.svg)](https://gitter.im/marzer/poxy?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Sponsor](https://img.shields.io/static/v1?label=sponsor&message=%E2%9D%A4&logo=GitHub&color=%23fe8e86&style=flat-square)][sponsor]
+[![Gitter](https://badges.gitter.im/marzer/poxy.svg)][gitter]
 
 -   [Overview](#overview)
 -   [Example](#example)
@@ -167,3 +168,5 @@ Poxy bundles a fork of m.css, used per the [MIT/Expat license](https://github.co
 [configuration options]: https://github.com/marzer/poxy/wiki/Configuration-options
 [feature request]: https://github.com/marzer/poxy/issues/new
 [`currentcolor`]: https://gomakethings.com/currentcolor-and-svgs
+[gitter]: https://gitter.im/marzer/poxy
+[sponsor]: https://github.com/sponsors/marzer
diff --git a/poxy/data/cppreference-doxygen-web.tag.xml b/poxy/data/cppreference-doxygen-web.tag.xml
@@ -29456,8 +29456,6 @@
     <class kind="class">std::experimental::detected_or</class>
     <class kind="class">std::experimental::detected_or_t</class>
     <class kind="class">std::experimental::disjunction</class>
-    <namespace>std::experimental::erase(std</namespace>
-    <namespace>std::experimental::erase_if(std</namespace>
     <class kind="class">std::experimental::erased_type</class>
     <member kind="variable">
       <type>T</type>

diff --git a/poxy/data/css/poxy-overrides.css b/poxy/data/css/poxy-overrides.css
@@ -190,16 +190,16 @@ h1 span.m-thin
 }
 @media (min-width: 992px)
 {
-  svg#poxy-main-banner.poxy-injected-svg
-  {
-    padding: 2rem;
+	svg#poxy-main-banner.poxy-injected-svg
+	{
+		padding: 1.5rem;
 	}
 }
 @media (min-width: 300px) and (max-width: 992px)
 {
-  svg#poxy-main-banner.poxy-injected-svg
-  {
-    padding: 1rem;
+	svg#poxy-main-banner.poxy-injected-svg
+	{
+		padding: 1rem;
 	}
 }
 

diff --git a/poxy/data/css/poxy-pygments.css b/poxy/data/css/poxy-pygments.css
@@ -64,7 +64,7 @@
 .m-code .s1 { color: var(--code-color-strings); } /* Literal.String.Single */
 .m-code .ss { color: var(--code-color-strings); } /* Literal.String.Symbol */
 .m-code .bp { color: var(--code-color-identifiers); font-weight: bold } /* Name.Builtin.Pseudo */
-.m-code .fm { color: var(--code-color-identifiers); } /* Name.Function.Magic */
+.m-code .fm { color: var(--code-color-macros); } /* Name.Function.Magic */
 .m-code .vc { color: var(--code-color-identifiers); } /* Name.Variable.Class */
 .m-code .vg { color: var(--code-color-identifiers); } /* Name.Variable.Global */
 .m-code .vi { color: var(--code-color-identifiers); } /* Name.Variable.Instance */

diff --git a/poxy/data/css/poxy-theme-dark.css b/poxy/data/css/poxy-theme-dark.css
@@ -12,6 +12,7 @@
 	--code-color-strings: #d69d85;
 	--code-color-escapes: #e07cdc;
 	--code-color-preprocessor: #787878;
+	--code-color-macros: #beb7ff;
 
 	--special-color: #b65ad7;
 	--special-link-active-color: #e4a8ff;

diff --git a/poxy/data/css/poxy-theme-light.css b/poxy/data/css/poxy-theme-light.css
@@ -12,6 +12,7 @@
 	--code-color-strings: #a31515;
 	--code-color-escapes: #b776fb;
 	--code-color-preprocessor: #808080;
+	--code-color-macros: #a800d7;
 
 	--special-hue: 284;
 	--special-saturation: 50%;

diff --git a/poxy/data/generated/poxy.css b/poxy/data/generated/poxy.css
@@ -486,6 +486,7 @@ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+
 --code-color-strings: #d69d85;
 --code-color-escapes: #e07cdc;
 --code-color-preprocessor: #787878;
+--code-color-macros: #beb7ff;
 --special-color: #b65ad7;
 --special-link-active-color: #e4a8ff;
 --special-filled-color: #ce97e8;
@@ -647,6 +648,7 @@ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+
 --code-color-strings: #a31515;
 --code-color-escapes: #b776fb;
 --code-color-preprocessor: #808080;
+--code-color-macros: #a800d7;
 --special-hue: 284;
 --special-saturation: 50%;
 --special-luminosity: 60%;
@@ -2405,7 +2407,7 @@ border-left-width: 0.125rem;
 .m-code .s1 { color: var(--code-color-strings); }
 .m-code .ss { color: var(--code-color-strings); }
 .m-code .bp { color: var(--code-color-identifiers); font-weight: bold }
-.m-code .fm { color: var(--code-color-identifiers); }
+.m-code .fm { color: var(--code-color-macros); }
 .m-code .vc { color: var(--code-color-identifiers); }
 .m-code .vg { color: var(--code-color-identifiers); }
 .m-code .vi { color: var(--code-color-identifiers); }
@@ -2688,7 +2690,7 @@ margin-top: -1.75rem !important;
 max-width: calc(100% + 2rem) !important;
 }
 @media (min-width: 992px) {
-svg#poxy-main-banner.poxy-injected-svg { padding: 2rem; }
+svg#poxy-main-banner.poxy-injected-svg { padding: 1.5rem; }
 }
 @media (min-width: 300px) and (max-width: 992px) {
 svg#poxy-main-banner.poxy-injected-svg { padding: 1rem; }

diff --git a/poxy/data/m.css/documentation/doxygen.py b/poxy/data/m.css/documentation/doxygen.py
@@ -348,7 +348,7 @@ def parse_type(state: State, type: ET.Element) -> str:
         if i.tail: out += html.escape(i.tail)
 
     # Remove spacing inside <> and before & and *
-    return fix_type_spacing(out)
+    return fix_type_spacing(out).strip()
 
 def parse_desc_internal(state: State, element: ET.Element, immediate_parent: ET.Element = None, trim = True, add_css_class = None):
     out = Empty()

diff --git a/poxy/data/version.txt b/poxy/data/version.txt
@@ -1 +1 @@
-0.10.1
+0.10.2