Merge branch 'doxygen' into 'main'

Doxygen setup for contionuous documentation See merge request !1

Merge branch 'doxygen' into 'main'
c6ae153e · Sebastian Oberschwendtner · 38b2b202 · d48d655d · c6ae153e · c6ae153e
Commit c6ae153e authored 1 year ago by Sebastian Oberschwendtner
--- a/.gitignore
+++ b/.gitignore
+# Ignore generated Doxygen docs in modules folder
+docs/modules/**/
+
+# Ignore the local docs of the AcXML
+docs/aircraft-xml/
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,17 +15,61 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.

 # === Configure pipeline ===
-image: python:latest
+stages:
+  - build
+  - deploy
+
+# === Build the doxygen documentation ===
+doxygen:
+  image: alpine:latest
+  stage: build
+  tags:
+    - documentation
+  before_script:
+    - apk update && apk --no-cache add git doxygen graphviz ttf-freefont texmf-dist texmf-dist-latexextra texlive texlive-dvi
+  script:
+    - git clone -b feature-aircraftGeometry2 --recurse-submodules https://gitlab-ci-token:${CI_JOB_TOKEN}@git.rwth-aachen.de/unicado/libraries
+    - cd libraries/aircraftGeometry2/doc/ && ( cat Doxyfile ; echo "OUTPUT_DIRECTORY = $CI_PROJECT_DIR/docs/modules/" ) | doxygen -
+  artifacts:
+    paths:
+      - $CI_PROJECT_DIR/docs/modules
+  rules:
+    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+      when: on_success
+    - if: '$CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH'
+      when: manual
+
+# === Build and deploy the website ===
 pages:
+  image: python:latest
  stage: deploy
  tags:
    - documentation
+  before_script:
+    - pip install pipenv
+    - pipenv install
  script:
-    - pip install mkdocs-material
-    - mkdocs build --site-dir public
+    - mkdir $CI_PROJECT_DIR/docs/aircraft-xml
+    - python $CI_PROJECT_DIR/scripts/document_aircraft_xml.py --title General --level 1 $CI_PROJECT_DIR/scripts/CSR-02.xml > $CI_PROJECT_DIR/docs/aircraft-xml/general.md
+    - python $CI_PROJECT_DIR/scripts/document_aircraft_xml.py --title MassesAndLoadings --level 3 $CI_PROJECT_DIR/scripts/CSR-02.xml > $CI_PROJECT_DIR/docs/aircraft-xml/masses.md
+    - python $CI_PROJECT_DIR/scripts/document_aircraft_xml.py --title Geometry --level 6 $CI_PROJECT_DIR/scripts/CSR-02.xml > $CI_PROJECT_DIR/docs/aircraft-xml/geometry.md
+    - python $CI_PROJECT_DIR/scripts/document_aircraft_xml.py --title Structure --level 2 $CI_PROJECT_DIR/scripts/CSR-02.xml > $CI_PROJECT_DIR/docs/aircraft-xml/structure.md
+    - python $CI_PROJECT_DIR/scripts/document_aircraft_xml.py --title Accommodation --level 2 $CI_PROJECT_DIR/scripts/CSR-02.xml > $CI_PROJECT_DIR/docs/aircraft-xml/accommodation.md
+    - python $CI_PROJECT_DIR/scripts/document_aircraft_xml.py --title Propulsion --level 3 $CI_PROJECT_DIR/scripts/CSR-02.xml > $CI_PROJECT_DIR/docs/aircraft-xml/propulsion.md
+    - python $CI_PROJECT_DIR/scripts/document_aircraft_xml.py --title Systems --level 2 $CI_PROJECT_DIR/scripts/CSR-02.xml > $CI_PROJECT_DIR/docs/aircraft-xml/systems.md
+    - python $CI_PROJECT_DIR/scripts/document_aircraft_xml.py --title Aerodynamics --level 2 $CI_PROJECT_DIR/scripts/CSR-02.xml > $CI_PROJECT_DIR/docs/aircraft-xml/aerodynamics.md
+    - python $CI_PROJECT_DIR/scripts/document_aircraft_xml.py --title StabilityAndControlCharacteristics --level 2 $CI_PROJECT_DIR/scripts/CSR-02.xml > $CI_PROJECT_DIR/docs/aircraft-xml/stability.md
+    - python $CI_PROJECT_DIR/scripts/document_aircraft_xml.py --title Performance --level 4 $CI_PROJECT_DIR/scripts/CSR-02.xml > $CI_PROJECT_DIR/docs/aircraft-xml/performance.md
+    - python $CI_PROJECT_DIR/scripts/document_aircraft_xml.py --title MonetaryValues --level 4 $CI_PROJECT_DIR/scripts/CSR-02.xml > $CI_PROJECT_DIR/docs/aircraft-xml/monetary.md
+    - python $CI_PROJECT_DIR/scripts/document_aircraft_xml.py --title EcologicalValues --level 4 $CI_PROJECT_DIR/scripts/CSR-02.xml > $CI_PROJECT_DIR/docs/aircraft-xml/ecological.md
+    - python $CI_PROJECT_DIR/scripts/document_aircraft_xml.py --title Requirements --level 3 $CI_PROJECT_DIR/scripts/CSR-02.xml > $CI_PROJECT_DIR/docs/aircraft-xml/requirements.md
+    - python $CI_PROJECT_DIR/scripts/document_aircraft_xml.py --title DesignSpecification --level 4 $CI_PROJECT_DIR/scripts/CSR-02.xml > $CI_PROJECT_DIR/docs/aircraft-xml/specification.md
+    - pipenv run mkdocs build --site-dir $CI_PROJECT_DIR/public
+  needs:
+    - doxygen
  artifacts:
    paths:
-      - public
+      - $CI_PROJECT_DIR/public
  rules:
    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
      when: on_success

--- a/Pipfile
+++ b/Pipfile
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+mkdocs = "*"
+mkdocs-material = "*"
+mkdocs-glightbox = "*"
+
+[dev-packages]
+
+[requires]
+python_version = "3.11"
--- a/Pipfile.lock
+++ b/Pipfile.lock
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ We are using `mkdocs` as the static site generator to generate the website from

 You can preview the website after cloning it. First you need to install `mkdocs` and the used theme by:
 ```sh
-pip install mkdocs mkdocs-material
+pip install mkdocs mkdocs-material mkdocs-glightbox
 ```

 Then you can change the directory to the repository and run
@@ -17,8 +17,56 @@ mkdocs serve

 This will start a local webserver which you can access with your webbrowser and preview the website.

+### with pipenv
+You can also start the server inside a virtual environment using `pipenv`:
+```sh 
+pipenv run mkdocs serve
+```
+
 ## Further Documentation
 For features of the site generator and its theme please refer to their excellent documentation:

 - [&rdca; MkDocs](https://www.mkdocs.org/user-guide/)
 - [&rdca; MkDocs Material](https://squidfunk.github.io/mkdocs-material/)
+
+## Page Template
+The pages are written in plain *markdown*.
+The site generator has the option the extract some meta data from the content.
+A template might look like this:
+```
+---
+title: Displayed Title of Page
+summary: Summary of the page content.
+authors:
+    - Author 1
+    - Author 2
+date: yyyy-mm-dd
+---
+# MyPage
+
+<Content goes here>
+```
+
+# Tools
+The documentation page uses some custom tools to enable a seamless continuous documentation:
+
+## document_aircraft_xml.py
+> Script
+
+This script is used to document the aircraft exchange file.
+It parses the XML file and creates the documentation for each node using its description.
+
+The usage is explained in the output when calling the script with the `--help` option:
+```sh
+usage: document_aircraft_xml.py [-h] [--title title] [--level level] filename
+
+Converts an aircraft XML file to a markdown file. The output is streamed to stdout and can be piped to a file.
+
+positional arguments:
+  filename       The XML file to convert.
+
+options:
+  -h, --help     show this help message and exit
+  --title title  The title of the output page. This also sets the root node which is used to create the document.
+  --level level  The maximum level nodes to be used as headers.
+```
--- a/docs/assets/css/unicado.css
+++ b/docs/assets/css/unicado.css
+.grid-container {
+  grid-gap: .4rem;
+  display: grid;
+  grid-template-columns: repeat(auto-fit,minmax(16rem,1fr));
+  margin: 1em 0;
+}
+
+.grid-item {
+  border: .05rem solid var(--md-default-fg-color--lightest);
+  border-radius: .1rem;
+  display: block;
+  margin: 0;
+  padding: .8rem;
+  transition: border .25s,box-shadow .25s;
+}
+
+.grid-item:where(:hover, :focus) {
+  border-color: #0000;
+  box-shadow: var(--md-shadow-z2);
+}
+
+.overview-item {
+    min-height: 240px;
+}
+
+.overview-img {
+    width: 200px;
+}
\ No newline at end of file
--- a/docs/assets/images/banner.png
+++ b/docs/assets/images/banner.png
--- a/docs/assets/images/logos/bmwk.png
+++ b/docs/assets/images/logos/bmwk.png
--- a/docs/assets/images/icon.png
+++ b/docs/assets/images/icon.png
--- a/docs/assets/images/logo.png
+++ b/docs/assets/images/logo.png
--- a/docs/assets/images/modules/aerodynamics.svg
+++ b/docs/assets/images/modules/aerodynamics.svg
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="1080"
+   height="1080"
+   viewBox="0 0 1080 1080"
+   version="1.1"
+   id="svg1"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs1" /><path
+     d="m 108.00002,918.00002 v 54 H 1080 V 1080 H 0 V 0 h 108.00002 v 809.99998 c 162,0 324,-108 437.4,-302.39998 162,-270 340.2,-399.59999 534.59998,-399.59999 V 216.00002 C 928.8,216.00002 783.00002,329.4 642.60002,567 502.20002,788.4 307.8,918.00002 108.00002,918.00002 Z"
+     id="path1-4"
+     style="fill:#001c83;fill-opacity:1;stroke-width:53.9998" /><path
+     d="m 880.96709,501.17996 c 0,60.23043 -19.55193,115.86814 -52.4884,161.00816 l 166.12578,166.257 c 16.40263,16.40263 16.40263,43.04049 0,59.44311 -16.40262,16.40263 -43.04048,16.40263 -59.44311,0 l -166.12578,-166.257 c -45.14002,33.06769 -100.77773,52.4884 -161.00816,52.4884 -150.77293,0 -272.93967,-122.16674 -272.93967,-272.93967 0,-150.77293 122.16674,-272.93969 272.93967,-272.93969 150.77293,0 272.93967,122.16676 272.93967,272.93969 z M 608.02742,690.1382 a 188.95824,188.95824 0 1 0 0,-377.91648 188.95824,188.95824 0 1 0 0,377.91648 z"
+     id="path1"
+     style="fill:#4d4d4d;fill-opacity:1;stroke-width:21;stroke-dasharray:none;stroke:#ffffff;stroke-opacity:1" /></svg>
--- a/docs/assets/images/modules/aircraft-geometry.svg
+++ b/docs/assets/images/modules/aircraft-geometry.svg
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="1080"
+   height="1080"
+   viewBox="0 0 1080 1080"
+   version="1.1"
+   id="svg1"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs1" /><path
+     d="m 328.09193,181.23128 c 0,-51.93088 44.03495,-142.27846 97.18059,-142.27846 54.66408,0 97.18059,90.34758 97.18059,142.27846 V 281.9043 l 269.97984,179.93594 c 13.51418,8.95884 21.56195,24.14331 21.56195,40.39069 v 86.09593 c 0,16.55107 -16.24739,28.24311 -32.03923,23.08039 L 522.45311,524.85579 v 121.47574 l 87.46254,65.5969 c 6.07379,4.55534 9.71806,11.84388 9.71806,19.43612 v 63.77476 c 0,11.84389 -9.56622,21.25826 -21.25826,21.25826 -1.97398,0 -3.94796,-0.30369 -5.92194,-0.75923 L 425.27252,767.80727 258.09153,815.63834 c -1.97398,0.60738 -3.94796,0.75923 -5.92194,0.75923 -11.84389,0 -21.25826,-9.56622 -21.25826,-21.25826 v -63.77476 c 0,-7.59224 3.64428,-14.88078 9.71806,-19.43612 l 87.46254,-65.5969 V 524.85579 L 68.589377,611.40725 C 52.797531,616.56997 36.55015,604.87793 36.55015,588.32686 v -86.09593 c 0,-16.24738 8.047768,-31.43185 21.561945,-40.39069 L 328.09193,281.9043 Z"
+     id="path1-3"
+     style="fill:#494949;fill-opacity:1;stroke:#ffffff;stroke-width:21.2583;stroke-dasharray:none;stroke-opacity:1" /><path
+     d="m 583.03161,616.06874 v 295.35737 c 13.69487,7.90632 25.13079,19.34224 33.03711,33.03711 h 295.35736 c 0,-0.14119 0.14119,-0.28237 0.14119,-0.42356 l -6.35329,-11.15355 -45.17895,-79.06316 c -1.97658,0.14119 -3.95316,0.14119 -5.92974,0.14119 -49.83802,0 -90.35789,-40.51987 -90.35789,-90.3579 0,-49.83802 40.51987,-90.35789 90.35789,-90.35789 1.97658,0 3.95316,0 5.92974,0.14118 l 45.17895,-79.06315 6.35329,-11.15356 -0.14119,-0.42355 H 616.06872 c -7.90632,13.69487 -19.34224,25.13079 -33.03711,33.03711 z M 990.06566,899.28427 C 1039.7625,899.56664 1080,939.80414 1080,989.64211 1080,1039.4801 1039.4801,1080 989.64211,1080 c -33.46063,0 -62.68576,-18.2128 -78.21603,-45.1789 H 616.06872 C 600.39727,1061.7872 571.31332,1080 537.85266,1080 c -49.83802,0 -90.35789,-40.5199 -90.35789,-90.35789 0,-33.46066 18.21276,-62.68574 45.17895,-78.216 V 616.06874 c -26.96619,-15.53026 -45.17895,-44.75539 -45.17895,-78.21605 0,-49.83802 40.51987,-90.35789 90.35789,-90.35789 33.46066,0 62.68579,18.21276 78.21606,45.17895 h 295.35736 c 15.67145,-26.96619 44.7554,-45.17895 78.21603,-45.17895 49.83799,0 90.35789,40.51987 90.35789,90.35789 0,49.83803 -40.2375,90.07553 -89.93434,90.3579 l -6.35329,11.15355 -45.17892,79.06316 -3.24724,5.64736 c 5.92974,12.00066 9.17698,25.41316 9.17698,39.67277 0,14.2596 -3.24724,27.6721 -9.17698,39.67276 l 3.24724,5.64737 45.17892,79.06316 z"
+     id="path1-98"
+     style="display:inline;stroke-width:1.41184;fill:#00fff2;fill-opacity:1" /></svg>
--- a/docs/assets/images/modules/aircraft-network.svg
+++ b/docs/assets/images/modules/aircraft-network.svg
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="1080"
+   height="1080"
+   viewBox="0 0 1080 1080"
+   version="1.1"
+   id="svg1"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs1" /><path
+     d="m 328.09193,181.23128 c 0,-51.93088 44.03495,-142.27846 97.18059,-142.27846 54.66408,0 97.18059,90.34758 97.18059,142.27846 V 281.9043 l 269.97984,179.93594 c 13.51418,8.95884 21.56195,24.14331 21.56195,40.39069 v 86.09593 c 0,16.55107 -16.24739,28.24311 -32.03923,23.08039 L 522.45311,524.85579 v 121.47574 l 87.46254,65.5969 c 6.07379,4.55534 9.71806,11.84388 9.71806,19.43612 v 63.77476 c 0,11.84389 -9.56622,21.25826 -21.25826,21.25826 -1.97398,0 -3.94796,-0.30369 -5.92194,-0.75923 L 425.27252,767.80727 258.09153,815.63834 c -1.97398,0.60738 -3.94796,0.75923 -5.92194,0.75923 -11.84389,0 -21.25826,-9.56622 -21.25826,-21.25826 v -63.77476 c 0,-7.59224 3.64428,-14.88078 9.71806,-19.43612 l 87.46254,-65.5969 V 524.85579 L 68.589377,611.40725 C 52.797531,616.56997 36.55015,604.87793 36.55015,588.32686 v -86.09593 c 0,-16.24738 8.047768,-31.43185 21.561945,-40.39069 L 328.09193,281.9043 Z"
+     id="path1-3"
+     style="fill:#494949;fill-opacity:1;stroke:#ffffff;stroke-width:21.2583;stroke-dasharray:none;stroke-opacity:1" /><path
+     d="m 700.49685,447.49479 c -35.10405,0 -63.25052,28.14649 -63.25052,63.25052 v 94.87578 c 0,35.10404 28.14647,63.25052 63.25052,63.25052 h 31.62526 v 63.25052 H 447.49477 v 63.25052 h 126.50104 v 63.25052 h -31.62527 c -35.10403,0 -63.25052,28.14648 -63.25052,63.25052 v 94.87581 c 0,35.104 28.14649,63.2505 63.25052,63.2505 h 126.50105 c 35.10403,0 63.25052,-28.1465 63.25052,-63.2505 v -94.87581 c 0,-35.10404 -28.14649,-63.25052 -63.25052,-63.25052 H 637.24633 V 795.37265 H 890.2484 v 63.25052 h -31.62525 c -35.10404,0 -63.25052,28.14648 -63.25052,63.25052 v 94.87581 c 0,35.104 28.14648,63.2505 63.25052,63.2505 h 126.50106 c 35.10399,0 63.25049,-28.1465 63.25049,-63.2505 v -94.87581 c 0,-35.10404 -28.1465,-63.25052 -63.25049,-63.25052 H 953.49892 V 795.37265 H 1080 V 732.12213 H 795.37263 v -63.25052 h 31.62525 c 35.10404,0 63.25052,-28.14648 63.25052,-63.25052 v -94.87578 c 0,-35.10403 -28.14648,-63.25052 -63.25052,-63.25052 H 700.49685 m 0,63.25052 h 126.50103 v 94.87578 H 700.49685 V 510.74531 M 542.37054,921.87369 h 126.50105 v 94.87581 H 542.37054 v -94.87581 m 316.25261,0 h 126.50106 v 94.87581 H 858.62315 Z"
+     id="path1-6"
+     style="display:inline;stroke-width:31.6253;fill:#00138e;fill-opacity:1" /></svg>
--- a/docs/assets/images/modules/aixml.svg
+++ b/docs/assets/images/modules/aixml.svg
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="1080"
+   height="1080"
+   viewBox="0 0 1080 1080"
+   version="1.1"
+   id="svg1"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs1" /><path
+     d="m 328.09193,181.23128 c 0,-51.93088 44.03495,-142.27846 97.18059,-142.27846 54.66408,0 97.18059,90.34758 97.18059,142.27846 V 281.9043 l 269.97984,179.93594 c 13.51418,8.95884 21.56195,24.14331 21.56195,40.39069 v 86.09593 c 0,16.55107 -16.24739,28.24311 -32.03923,23.08039 L 522.45311,524.85579 v 121.47574 l 87.46254,65.5969 c 6.07379,4.55534 9.71806,11.84388 9.71806,19.43612 v 63.77476 c 0,11.84389 -9.56622,21.25826 -21.25826,21.25826 -1.97398,0 -3.94796,-0.30369 -5.92194,-0.75923 L 425.27252,767.80727 258.09153,815.63834 c -1.97398,0.60738 -3.94796,0.75923 -5.92194,0.75923 -11.84389,0 -21.25826,-9.56622 -21.25826,-21.25826 v -63.77476 c 0,-7.59224 3.64428,-14.88078 9.71806,-19.43612 l 87.46254,-65.5969 V 524.85579 L 68.589377,611.40725 C 52.797531,616.56997 36.55015,604.87793 36.55015,588.32686 v -86.09593 c 0,-16.24738 8.047768,-31.43185 21.561945,-40.39069 L 328.09193,281.9043 Z"
+     id="path1-3"
+     style="fill:#494949;fill-opacity:1;stroke:#ffffff;stroke-width:21.2583;stroke-dasharray:none;stroke-opacity:1" /><path
+     d="m 713.81277,846.97169 c 13.6488,0 26.96469,-0.99868 40.2806,-1.99738 6.32506,-25.30021 16.97777,-49.26883 31.62526,-70.24137 -22.96992,3.66187 -47.27145,5.65926 -71.90586,5.65926 -80.56119,0 -156.46183,-19.97386 -199.73849,-51.59912 v -93.54419 c 48.93593,27.63049 120.17598,45.27405 199.73849,45.27405 79.5625,0 150.80257,-17.64356 199.7385,-45.27405 V 686.848 c 16.64488,-3.99477 33.28976,-6.32506 51.59911,-6.32506 4.99346,0 9.98692,0 14.9804,0.9987 v -134.1577 c 0,-73.57034 -119.17732,-133.159 -266.31801,-133.159 -147.1407,0 -266.318,59.58866 -266.318,133.159 v 332.89751 c 0,73.57034 119.5102,133.15905 266.318,133.15905 21.97123,0 43.60957,-1.3317 63.91632,-3.9949 -11.65141,-19.6409 -20.30675,-41.27922 -25.30021,-64.58203 -12.31721,1.99738 -24.96731,1.99738 -38.61611,1.99738 -128.83133,0 -199.73849,-49.93463 -199.73849,-66.5795 V 806.0253 c 53.59649,25.96601 123.83786,40.94639 199.73849,40.94639 m 0,-366.18724 c 128.83134,0 199.7385,49.93462 199.7385,66.57949 0,16.64488 -70.90716,66.57951 -199.7385,66.57951 -128.83133,0 -199.73849,-49.93463 -199.73849,-66.57951 0,-16.64487 70.90716,-66.57949 199.73849,-66.57949 M 1080,896.90632 c 0,27.29759 -8.3224,52.59781 -22.3041,73.57035 L 1021.41,934.19084 c 5.6594,-11.31851 8.6554,-23.96862 8.6554,-37.28452 a 83.224376,83.224376 0 0 0 -83.22437,-83.22438 v 49.93463 l -74.90194,-74.90194 74.90194,-74.90194 v 49.93463 c 73.57027,0 133.15897,59.58865 133.15897,133.159 M 946.84103,930.19608 1021.743,1005.098 946.84103,1080 v -49.9347 c -73.57036,0 -133.159,-59.58863 -133.159,-133.15898 0,-27.29759 8.32243,-52.5978 22.30413,-73.57035 l 36.28582,36.28583 c -5.65925,11.31852 -8.65534,23.96862 -8.65534,37.28452 a 83.224376,83.224376 0 0 0 83.22439,83.22437 z"
+     id="path1-65"
+     style="display:inline;stroke-width:33.2897;fill:#ff0097;fill-opacity:1" /></svg>
--- a/docs/assets/images/modules/atmosphere.svg
+++ b/docs/assets/images/modules/atmosphere.svg
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="1080"
+   height="1080"
+   viewBox="0 0 1080 1080"
+   version="1.1"
+   id="svg1"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs1" /><path
+     d="m 328.09193,181.23128 c 0,-51.93088 44.03495,-142.27846 97.18059,-142.27846 54.66408,0 97.18059,90.34758 97.18059,142.27846 V 281.9043 l 269.97984,179.93594 c 13.51418,8.95884 21.56195,24.14331 21.56195,40.39069 v 86.09593 c 0,16.55107 -16.24739,28.24311 -32.03923,23.08039 L 522.45311,524.85579 v 121.47574 l 87.46254,65.5969 c 6.07379,4.55534 9.71806,11.84388 9.71806,19.43612 v 63.77476 c 0,11.84389 -9.56622,21.25826 -21.25826,21.25826 -1.97398,0 -3.94796,-0.30369 -5.92194,-0.75923 L 425.27252,767.80727 258.09153,815.63834 c -1.97398,0.60738 -3.94796,0.75923 -5.92194,0.75923 -11.84389,0 -21.25826,-9.56622 -21.25826,-21.25826 v -63.77476 c 0,-7.59224 3.64428,-14.88078 9.71806,-19.43612 l 87.46254,-65.5969 V 524.85579 L 68.589377,611.40725 C 52.797531,616.56997 36.55015,604.87793 36.55015,588.32686 v -86.09593 c 0,-16.24738 8.047768,-31.43185 21.561945,-40.39069 L 328.09193,281.9043 Z"
+     id="path1-3"
+     style="fill:#494949;fill-opacity:1;stroke:#ffffff;stroke-width:21.2583;stroke-dasharray:none;stroke-opacity:1" /><path
+     d="m 738.32641,575.24818 c 5.0406,2.07554 8.59867,6.62196 9.48818,11.95907 l 13.93578,83.71349 83.71349,13.93577 c 5.3371,0.88952 9.88353,4.44759 11.95907,9.48819 2.07554,5.0406 1.48253,10.77305 -1.58137,15.22064 l -38.05158,54.35941 c -2.17438,-0.0988 -4.34875,-0.19767 -6.62197,-0.19767 -23.02862,0 -44.57471,6.12778 -63.25458,16.90083 v -1.08719 c 0,-52.3827 -42.49918,-94.88188 -94.88188,-94.88188 -52.3827,0 -94.88188,42.49918 -94.88188,94.88188 0,52.3827 42.49918,94.88188 94.88188,94.88188 8.00566,0 15.71481,-0.98835 23.12746,-2.86622 -36.17372,17.88918 -62.56274,52.48153 -68.98703,93.79468 l -24.11581,16.802 c -4.44759,3.16273 -10.18004,3.75574 -15.22064,1.58137 -5.0406,-2.17438 -8.59867,-6.62197 -9.48819,-11.95907 L 544.5104,888.25954 460.79691,874.32376 c -5.3371,-0.88951 -9.88352,-4.44758 -11.95907,-9.48818 -2.07554,-5.0406 -1.48252,-10.77305 1.58137,-15.22064 l 49.0223,-69.97538 -49.0223,-69.97539 c -3.16273,-4.44759 -3.75574,-10.18003 -1.58137,-15.22063 2.17438,-5.0406 6.62197,-8.59867 11.95907,-9.48819 l 83.71349,-13.93578 13.93578,-83.71349 c 0.88952,-5.3371 4.44759,-9.88352 9.48819,-11.95907 5.0406,-2.07554 10.77304,-1.48252 15.22063,1.58137 l 69.97539,49.0223 69.97538,-49.0223 c 4.44759,-3.16273 10.18004,-3.75574 15.22064,-1.58137 z M 589.8758,779.63956 a 63.254585,63.254585 0 1 1 126.50917,0 63.254585,63.254585 0 1 1 -126.50917,0 z M 1080,1000.9318 C 1080,1044.617 1044.617,1080 1000.9318,1080 H 732.19862 c -52.38271,0 -94.88188,-42.4992 -94.88188,-94.88188 0,-47.04559 34.19701,-85.9867 79.06823,-93.49818 v -1.28486 c 0,-52.3827 42.49918,-94.88188 94.88188,-94.88188 34.49352,0 64.63828,18.38337 81.24261,45.85958 12.84858,-8.99401 28.46456,-14.23228 45.26656,-14.23228 43.6852,0 79.06828,35.38303 79.06828,79.06823 0,5.83128 -0.5931,11.56373 -1.8779,16.99967 36.9644,6.62196 65.0336,38.9411 65.0336,77.7834 z"
+     id="path1-2"
+     style="display:inline;stroke-width:0.988353;fill:#ffdd00;fill-opacity:1" /></svg>
--- a/docs/assets/images/modules/calculate-emissions.svg
+++ b/docs/assets/images/modules/calculate-emissions.svg
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="1080"
+   height="1080"
+   viewBox="0 0 1080 1080"
+   version="1.1"
+   id="svg1"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs1" /><path
+     d="m 328.09193,181.23128 c 0,-51.93088 44.03495,-142.27846 97.18059,-142.27846 54.66408,0 97.18059,90.34758 97.18059,142.27846 V 281.9043 l 269.97984,179.93594 c 13.51418,8.95884 21.56195,24.14331 21.56195,40.39069 v 86.09593 c 0,16.55107 -16.24739,28.24311 -32.03923,23.08039 L 522.45311,524.85579 v 121.47574 l 87.46254,65.5969 c 6.07379,4.55534 9.71806,11.84388 9.71806,19.43612 v 63.77476 c 0,11.84389 -9.56622,21.25826 -21.25826,21.25826 -1.97398,0 -3.94796,-0.30369 -5.92194,-0.75923 L 425.27252,767.80727 258.09153,815.63834 c -1.97398,0.60738 -3.94796,0.75923 -5.92194,0.75923 -11.84389,0 -21.25826,-9.56622 -21.25826,-21.25826 v -63.77476 c 0,-7.59224 3.64428,-14.88078 9.71806,-19.43612 l 87.46254,-65.5969 V 524.85579 L 68.589377,611.40725 C 52.797531,616.56997 36.55015,604.87793 36.55015,588.32686 v -86.09593 c 0,-16.24738 8.047768,-31.43185 21.561945,-40.39069 L 328.09193,281.9043 Z"
+     id="path1-3"
+     style="fill:#494949;fill-opacity:1;stroke:#ffffff;stroke-width:21.2583;stroke-dasharray:none;stroke-opacity:1" /><path
+     d="M 667.14321,329.18778 A 180.33108,180.33108 0 0 0 500.93759,581.51445 c -35.01182,34.20697 -55.13358,80.88941 -55.13358,129.98648 0,100.60872 80.48698,181.0957 181.09571,181.0957 20.12175,0 40.24349,-4.42679 60.36523,-11.26819 v 172.24216 h 80.48699 V 843.09714 c 20.12174,5.63409 40.24348,9.256 60.36522,9.256 A 221.33919,221.33919 0 0 0 1049.4564,631.01394 221.33919,221.33919 0 0 0 828.11716,409.67475 h -10.4633 c -33.4021,-49.90193 -90.14542,-80.48697 -150.51065,-80.48697 m 0,80.48697 c 53.12141,0 96.98681,41.45079 100.60873,94.57221 18.512,-9.25602 40.24348,-14.08524 60.36522,-14.08524 A 140.85222,140.85222 0 0 1 968.96938,631.01394 140.85222,140.85222 0 0 1 828.11716,771.86615 c -38.63374,0 -75.25532,-15.69495 -102.21845,-43.8654 a 100.24653,100.24653 0 0 1 -98.99899,84.1089 100.60872,100.60872 0 0 1 -100.60873,-100.60872 c 0,-55.53602 32.1948,-78.87725 80.48699,-109.05987 -32.1948,-41.45079 -40.24349,-65.59689 -40.24349,-92.15759 A 100.60872,100.60872 0 0 1 667.14321,409.67475 Z"
+     id="path1-4"
+     style="fill:#529600;fill-opacity:1;stroke:none;stroke-width:40.2435;stroke-opacity:1" /></svg>
--- a/docs/assets/images/modules/calculate-performance.svg
+++ b/docs/assets/images/modules/calculate-performance.svg
--- a/docs/assets/images/modules/calculate-polar.svg
+++ b/docs/assets/images/modules/calculate-polar.svg
--- a/docs/assets/images/modules/cost-estimation.svg
+++ b/docs/assets/images/modules/cost-estimation.svg
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="1080"
+   height="1080"
+   viewBox="0 0 1080 1080"
+   version="1.1"
+   id="svg1"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs1" /><path
+     d="m 328.09193,181.23128 c 0,-51.93088 44.03495,-142.27846 97.18059,-142.27846 54.66408,0 97.18059,90.34758 97.18059,142.27846 V 281.9043 l 269.97984,179.93594 c 13.51418,8.95884 21.56195,24.14331 21.56195,40.39069 v 86.09593 c 0,16.55107 -16.24739,28.24311 -32.03923,23.08039 L 522.45311,524.85579 v 121.47574 l 87.46254,65.5969 c 6.07379,4.55534 9.71806,11.84388 9.71806,19.43612 v 63.77476 c 0,11.84389 -9.56622,21.25826 -21.25826,21.25826 -1.97398,0 -3.94796,-0.30369 -5.92194,-0.75923 L 425.27252,767.80727 258.09153,815.63834 c -1.97398,0.60738 -3.94796,0.75923 -5.92194,0.75923 -11.84389,0 -21.25826,-9.56622 -21.25826,-21.25826 v -63.77476 c 0,-7.59224 3.64428,-14.88078 9.71806,-19.43612 l 87.46254,-65.5969 V 524.85579 L 68.589377,611.40725 C 52.797531,616.56997 36.55015,604.87793 36.55015,588.32686 v -86.09593 c 0,-16.24738 8.047768,-31.43185 21.561945,-40.39069 L 328.09193,281.9043 Z"
+     id="path1-3"
+     style="fill:#494949;fill-opacity:1;stroke:#ffffff;stroke-width:21.2583;stroke-dasharray:none;stroke-opacity:1" /><path
+     d="M 447.49477,574.05344 V 953.51337 H 773.83029 A 201.74619,201.74619 0 0 1 763.71136,890.27004 H 573.9814 A 63.243319,63.243319 0 0 0 510.73809,827.02672 V 700.54007 c 35.10004,0 63.24331,-28.14327 63.24331,-63.24331 H 890.198 a 63.243319,63.243319 0 0 0 63.24335,63.24331 v 1.8973 c 21.18648,0 42.37294,3.79461 63.24335,10.75137 V 574.05344 H 447.49477 m 284.59494,94.86498 c -53.75683,0.94865 -94.86499,41.10816 -94.86499,94.86498 0,53.75682 41.10816,92.96769 94.86499,94.86499 12.01622,0 24.34866,-2.52975 36.04868,-7.273 8.53786,-34.78382 22.76759,-67.67035 57.86763,-99.92444 -3.79459,-42.05681 -43.63787,-83.48118 -93.91631,-82.53253 m 221.35164,63.24331 71.14865,71.14874 -71.14865,71.14874 v -47.43249 c -58.5001,0 -96.76231,61.97845 -70.83255,114.4704 l -34.46761,34.46761 c -55.65412,-84.1136 4.42704,-196.3705 105.30016,-196.3705 v -47.4325 m 0,347.83827 -71.14877,-71.1488 71.14877,-71.14868 v 47.4325 c 58.50005,0 96.76225,-61.97845 70.83245,-114.47042 l 34.4677,-34.46761 c 55.6541,84.11362 -4.4271,196.37041 -105.30015,196.37041 V 1080"
+     id="path1-8"
+     style="display:inline;fill:#ffe400;fill-opacity:1;stroke-width:31.6217" /></svg>
--- a/docs/assets/images/modules/cpacs-interface.svg
+++ b/docs/assets/images/modules/cpacs-interface.svg
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="1080"
+   height="1080"
+   viewBox="0 0 1080 1080"
+   version="1.1"
+   id="svg1"
+   xml:space="preserve"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs1"><color-profile
+       name="sRGB-IEC61966-2.1"
+       xlink:href="data:application/vnd.iccprofile;base64,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"
+       id="color-profile1" /><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath1"><path
+         d="M 0,841.98 H 595.2 V 0 H 0 Z"
+         transform="translate(-2.2918065e-6)"
+         id="path1" /></clipPath></defs><path
+     id="path3"
+     d="m 214.52303,792.82457 c 0,-6.46118 14.8227,-36.10658 44.08804,-88.55615 29.26534,-52.82963 46.74853,-81.7149 52.44956,-86.27573 4.56084,-3.8007 9.12167,-5.70104 12.92236,-5.70104 1.90035,0 8.36153,5.32097 20.52374,15.58284 14.44264,11.78215 28.5052,21.28388 42.1877,27.74506 21.28388,9.8818 43.3279,14.8227 66.8922,14.8227 29.6454,0 54.72998,-10.64194 75.25372,-32.30589 20.52374,-21.28388 31.16568,-47.12859 30.78561,-76.774 0.38007,-30.02548 -10.26187,-55.87019 -30.78561,-77.53414 -20.52374,-22.04402 -45.60832,-32.68596 -75.25372,-32.68596 -49.78908,0 -88.17608,14.8227 -115.161,44.46811 -4.18077,4.9409 -7.60139,7.22132 -9.50174,7.22132 -3.80069,0 -22.80416,-25.08458 -56.63032,-74.87366 -34.58631,-51.30935 -51.68943,-81.33483 -51.68943,-90.07642 0,-6.08111 3.80069,-13.6825 10.64194,-22.80416 24.7045,-31.54576 59.29081,-56.25026 104.13899,-74.11352 40.28735,-16.34298 82.47504,-24.7045 125.42287,-24.7045 95.77747,0 177.1123,33.06603 244.0045,99.57816 66.8922,66.13206 100.3383,147.08682 100.3383,242.48422 0,95.39739 -33.4461,176.73222 -100.3383,243.62442 -66.8922,66.8922 -148.22703,100.3383 -244.0045,100.3383 -96.15753,0 -174.45181,-30.02547 -234.88283,-90.45649 -7.60139,-6.84125 -11.40208,-13.30243 -11.40208,-19.00347"
+     style="fill:#7e7e7e;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6.33449" /><path
+     id="path4"
+     d="m 352.10813,7.9814395 c 96.15754,0 174.83188,30.4055445 235.2629,90.4564955 7.60139,7.221315 11.40208,13.682495 11.40208,19.003465 0,6.84125 -14.8227,36.48665 -44.08804,88.93622 -29.26533,52.82963 -46.74852,81.33483 -52.44956,86.27573 -4.9409,3.42063 -9.12167,5.32097 -12.92236,5.32097 -1.90035,0 -8.36152,-4.9409 -20.52374,-15.20277 -14.44264,-12.16222 -28.5052,-21.28388 -42.1877,-27.74506 -21.28388,-9.8818 -43.3279,-14.8227 -66.89219,-14.8227 -29.64541,0 -54.72998,10.64194 -75.25373,32.30589 -20.90381,21.28388 -31.16568,47.12859 -31.16568,76.774 0,30.02548 10.26187,55.87019 31.16568,77.53414 20.52375,21.66395 45.60832,32.68596 75.25373,32.68596 49.78908,0 88.17608,-14.8227 115.161,-44.46811 4.18076,-4.9409 7.60138,-7.60139 9.50173,-7.60139 3.80069,0 22.80416,25.08458 56.63033,75.25373 34.5863,51.30935 51.68942,81.33483 51.68942,90.07642 0,5.70104 -3.80069,13.30243 -10.64194,22.80416 -24.7045,31.54576 -59.29081,56.25026 -104.13899,74.11352 -40.28735,16.34298 -82.47504,24.7045 -125.80294,24.7045 -95.3974,0 -176.73223,-33.06603 -243.62443,-99.57816 C 41.591504,528.29632 8.1454045,447.72163 8.1454045,352.32423 8.1454045,256.92684 41.591504,175.59201 108.4837,108.69981 175.3759,41.807608 256.71073,7.9814395 352.10813,7.9814395"
+     style="fill:#3d74a4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6.33449" /><path
+     id="path5"
+     d="M 352.10813,-1.6218825e-5 361.22979,0.38005309 h 9.12167 C 415.69373,2.4577653 458.97729,11.142349 500.71523,29.265321 l 7.60139,3.420623 6.84124,3.800694 7.22132,3.420623 c 13.73317,8.253839 27.78307,16.127608 40.28735,26.224783 l 6.08111,4.940901 6.46117,5.32097 c 9.52074,8.868284 20.4224,16.944757 27.365,28.125125 l 1.52027,3.04056 2.28042,6.08111 c 0,0.38007 0,0.76014 0,1.14021 l 0.38007,2.28041 c 0,0.38007 0,1.14021 -0.38007,1.52028 v 1.52028 c 0,0.38007 0,0.76013 -0.38007,1.1402 l -0.38007,1.90035 -1.14021,3.04055 c -14.03722,35.6125 -39.38785,77.74318 -58.1506,111.36031 l -4.18077,7.98146 -4.56083,7.22131 c -10.72429,15.43082 -22.79782,48.38916 -43.3279,52.82964 l -2.28041,0.38007 h -2.28042 c -1.14021,0.38007 -1.90035,0 -2.66048,0 l -0.76014,-0.38007 c -0.76014,0 -1.14021,-0.38007 -1.90035,-0.76014 l -1.14021,-0.76014 -2.66048,-1.52028 -2.28042,-1.90034 c -41.6936,-35.6505 -80.9611,-59.4175 -138.7253,-50.54922 l -4.56083,1.14021 -4.56083,1.14021 c -37.10743,11.8835 -65.76466,47.66069 -68.41248,86.6558 l -0.38007,5.32097 -0.38007,4.9409 0.38007,5.32097 0.38007,4.9409 c 1.82434,38.31099 32.21088,76.94503 68.79255,87.79601 l 4.56083,1.52028 4.56083,0.76014 4.9409,0.76014 c 21.3789,3.40795 50.77726,-0.62712 71.45303,-6.84125 l 6.84125,-2.66049 6.46118,-2.66048 c 19.85229,-9.09633 29.38569,-18.31934 44.08804,-33.4461 l 1.52028,-1.52028 3.80069,-2.28041 1.90035,-0.76014 c 0.38007,0 1.1402,-0.38007 1.52027,-0.38007 h 0.76014 c 1.14021,-0.38007 1.90035,-0.38007 2.66049,0 h 0.38007 c 0.76014,0 1.1402,0.38007 1.90034,0.38007 l 0.38007,0.38007 c 0.38007,0 0.76014,0.38007 1.14021,0.76014 l 0.76014,0.38006 1.14021,0.76014 c 10.56592,9.73611 22.41775,27.66905 30.78561,39.52721 l 2.66049,3.42063 2.28041,3.42062 c 24.05205,34.85235 53.14636,75.5071 70.69289,113.64072 l 1.14021,3.42063 1.14021,3.04055 c 0,0.38007 0,0.76014 0,1.14021 l 0.38007,1.90035 c 0,0.38006 0,0.76013 0,1.52027 l -0.38007,2.28042 -0.38007,3.42062 -1.14021,3.42063 -1.52028,3.42062 c -16.8624,32.33756 -58.8664,64.8905 -91.5967,79.81455 l -7.98145,4.18077 -7.98146,3.42062 c -41.66193,18.64874 -91.57137,29.04997 -137.20502,28.88527 h -9.12166 l -9.12167,-0.38007 -9.12166,-0.76014 C 213.45251,695.63451 113.78567,632.49866 53.373652,539.6984 l -9.121663,-14.44263 -3.800693,-7.22132 -4.180763,-7.60138 c -48.382823,-93.35769 -48.338481,-223.25272 0,-316.59774 l 3.800693,-7.60138 4.180763,-7.22132 C 100.66694,81.22713 202.50018,10.179507 316.38161,1.9003303 l 8.7416,-0.7601386 9.12166,-0.3800693 8.7416,-0.38006931 z M 343.74661,16.342964 h -8.7416 l -8.74159,0.760139 -8.36153,0.380069 C 210.21559,26.965901 118.64422,88.492788 62.495316,179.77277 l -4.180763,6.84124 -3.800693,6.84125 C 5.4279089,282.70187 3.419876,404.21636 46.912474,495.99043 l 3.420624,7.22132 3.800693,6.84125 4.180762,7.22131 3.800693,6.84125 C 119.20799,614.53405 210.14591,676.16862 317.90189,684.88488 l 8.36153,0.76014 8.36152,0.38007 c 86.2884,5.09293 202.56427,-30.57024 248.9454,-108.31976 l 0.38007,-1.90034 0.38007,-1.14021 0.38007,-2.28042 v 1.14021 l -0.38007,-1.90034 0.38007,1.1402 -0.38007,-1.52027 -0.76014,-2.66049 C 566.22018,532.26171 539.78002,495.2683 517.05821,461.7842 l -2.66048,-3.8007 -2.66049,-3.42062 c -9.10266,-13.04905 -18.9908,-27.53602 -29.64541,-39.14714 l -0.38007,-0.38007 -0.76013,-0.38007 1.1402,0.76014 -0.38007,-0.38007 1.52028,0.38007 h -0.38007 2.66049 l -0.76014,0.38007 1.52028,-0.38007 v -0.38007 l -0.76014,0.76014 -0.76014,0.38007 -1.14021,1.14021 -1.52028,1.1402 c -13.21374,16.73572 -33.94019,29.67075 -53.58977,37.62687 l -7.60138,2.66048 -7.98146,2.28042 c -21.40424,5.78338 -54.52728,9.17867 -76.39393,4.18076 l -5.70104,-1.14021 -5.32097,-1.52028 -5.32097,-1.90034 C 277.51319,444.26933 246.77192,400.74506 245.68872,354.98472 l -0.38007,-6.08111 0.38007,-5.70104 0.38007,-6.08111 0.76014,-5.32097 c 4.5735,-42.67545 38.67839,-82.31668 79.43449,-95.01733 l 5.32097,-1.1402 5.32097,-1.52028 c 61.89428,-8.9253 105.67827,14.42363 150.50744,53.58977 l 2.28042,1.52028 2.28042,1.52028 -1.52028,-0.38007 h 0.76014 l -2.66049,-0.38007 h 1.52028 c 10.54692,-0.5321 24.24842,-31.33038 30.02548,-38.387 l 3.80069,-6.84125 4.18076,-7.22132 c 20.98616,-37.20245 44.35409,-77.24275 61.57123,-116.30121 l 0.38007,-1.90034 0.76014,-2.28042 -0.38007,1.14021 0.38007,-1.52028 v 1.52028 l -0.38007,-1.90035 0.38007,1.14021 -0.38007,-1.14021 -0.38007,-1.52027 C 578.45841,95.612753 535.17485,63.95298 514.77779,54.349895 l -6.46117,-3.800693 -6.84125,-3.420624 C 458.07145,27.130598 417.50539,18.87676 369.97139,16.342964 h -8.7416 l -8.74159,-0.380069"
+     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6.33449" /><path
+     d="M 735.78785,987.28367 H 513.01592 c -36.03663,0 -65.52115,-29.4845 -65.52115,-65.52111 V 397.59334 c 0,-36.03663 29.48452,-65.52115 65.52115,-65.52115 H 775.10053 L 971.66399,528.63565 V 643.29766 C 952.00766,633.4695 929.07525,630.19344 906.14284,626.91738 V 561.39623 H 742.33996 V 397.59334 H 513.01592 V 921.76256 H 693.1991 c 9.82816,22.93241 26.20846,45.86481 42.58875,65.52111 m 137.59442,-327.60572 -72.07327,72.07327 72.07327,72.07327 v -45.8648 c 45.8648,0 81.90144,36.03663 81.90144,81.90144 0,13.10422 -3.27605,26.20846 -9.82817,36.03663 l 36.03663,36.03664 c 13.10423,-19.65635 22.93243,-45.86481 22.93243,-72.07327 0,-72.07327 -58.96906,-131.0423 -131.04233,-131.0423 v -49.14088 m 72.07327,288.29312 -72.07327,-75.34937 v 49.14086 c -45.8648,0 -81.90144,-36.03662 -81.90144,-81.90143 0,-13.10423 3.27605,-26.20846 9.82817,-36.03664 l -36.03664,-36.03663 c -13.10422,19.65634 -22.9324,45.86481 -22.9324,72.07327 0,72.07327 58.96904,131.04234 131.04231,131.04234 v 49.14083 z"
+     id="path1-5"
+     style="fill:#fcff7a;fill-opacity:1;stroke-width:32.7606" /></svg>