Merge branch 'main' into feature/singlemarkdown

.readthedocs.yml

@@ -13,5 +13,5 @@ build:
     - mkdir -p $READTHEDOCS_OUTPUT/html
     - cp -r build/html/* $READTHEDOCS_OUTPUT/html/
     - cp -r build/markdown/* $READTHEDOCS_OUTPUT/html/
+    - cp build/singlemarkdown/index.md $READTHEDOCS_OUTPUT/html/llms-full.txt
     - cp -r build/rst/* $READTHEDOCS_OUTPUT/html/
-    - cp build/singlerst/index.rst $READTHEDOCS_OUTPUT/html/llms-full.txt

CMakePresets.json

@@ -21,23 +21,23 @@
       "configurePreset": "documentation",
       "targets": ["markdown"]
     },
+    {
+      "name": "singlemarkdown",
+      "displayName": "Build Single Markdown Documentation",
+      "configurePreset": "documentation",
+      "targets": ["singlemarkdown"]
+    },
     {
       "name": "rst",
       "displayName": "Build reStructuredText Documentation",
       "configurePreset": "documentation",
       "targets": ["rst"]
     },
-    {
-      "name": "singlerst",
-      "displayName": "Build Single reStructuredText Documentation",
-      "configurePreset": "documentation",
-      "targets": ["singlerst"]
-    },
     {
       "name": "docs-parallel",
       "displayName": "Build HTML and Markdown in parallel",
       "configurePreset": "documentation",
-      "targets": ["html", "markdown", "rst", "singlerst"]
+      "targets": ["html", "markdown", "singlemarkdown", "rst"]
     }
   ],
   "workflowPresets": [

docs/CMakeLists.txt

@@ -4,5 +4,5 @@ setup_sphinx_environment()
 
 add_sphinx_builder(html)
 add_sphinx_builder(markdown)
+add_sphinx_builder(singlemarkdown)
 add_sphinx_builder(rst)
-add_sphinx_builder(singlerst)

docs/requirements.txt

@@ -5,5 +5,5 @@ sphinx
 sphinx-llms-txt
 sphinx-inline-tabs
 sphinxext-opengraph
-sphinx-markdown-builder
-sphinxcontrib-restbuilder @ git+https://github.com/jdillard/restbuilder.git@feature/singlerst-builder
+sphinx-markdown-builder @ git+https://github.com/akaihola/sphinx-markdown-builder.git@singlemarkdown
+sphinxcontrib-restbuilder