Apply black formatting

Fixes #57

.github/workflows/test.yml

@@ -10,7 +10,7 @@ jobs:
   pre-commit:
       runs-on: ubuntu-latest
       steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
       - name: Set up Python 3.10
         uses: actions/setup-python@v6
         with:
@@ -23,7 +23,7 @@ jobs:
         python-version: ['3.9', '3.10', '3.11', '3.12']
 
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v5
 
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v6

.readthedocs.yml

@@ -9,8 +9,6 @@ build:
     - pip install -r docs/requirements.txt
     - pip install -e .
     - cmake --workflow --preset documentation-workflow
-    # Generate llms.txt variants for demo purposes
-    - python docs/generate_llms_variants.py build/html
     # Copy built documentation to Read the Docs output directory
     - mkdir -p $READTHEDOCS_OUTPUT/html
     - cp -r build/html/* $READTHEDOCS_OUTPUT/html/

CHANGELOG.rst

@@ -1,17 +1,6 @@
 Changelog
 =========
 
-0.7.2
------
-
-- Fix double extension in llms.txt URLs when source suffix matches sourcelink suffix
-  `#63 <https://github.com/jdillard/sphinx-llms-txt/issues/63>`_
-
-0.7.1
------
-
-- Don't process includes within code blocks
-
 0.7.0
 -----
 

CMakeLists.txt

@@ -1,15 +1,8 @@
 cmake_minimum_required(VERSION 3.15)
-project(SphinxDocs VERSION 1.0.0 LANGUAGES NONE)
+project(SphinxLLMsTxt VERSION 1.0.0 LANGUAGES NONE)
 
-# Fetch Sphinx CMake modules
+# Add CMake module path
-include(FetchContent)
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-FetchContent_Declare(
-  sphinx_cmake_modules
-  GIT_REPOSITORY https://github.com/jdillard/sphinx-cmake-modules.git
-  GIT_TAG        main
-)
-FetchContent_MakeAvailable(sphinx_cmake_modules)
-list(APPEND CMAKE_MODULE_PATH "${sphinx_cmake_modules_SOURCE_DIR}/cmake/modules")
 
 # Add documentation
 add_subdirectory(docs)

CMakePresets.json

@@ -29,7 +29,7 @@
     },
     {
       "name": "docs-parallel",
-      "displayName": "Build all output formats in parallel",
+      "displayName": "Build HTML and Markdown in parallel",
       "configurePreset": "documentation",
       "targets": ["html", "markdown", "rst"]
     }

cmake/SphinxUtils.cmake

@@ -0,0 +1,28 @@
+# Sphinx related utilities
+
+set(SPHINX_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/source)
+set(SPHINX_BUILD ${CMAKE_BINARY_DIR})
+
+# Function to find Sphinx in the system
+function(setup_sphinx_environment)
+    # Find sphinx-build executable in system
+    find_program(SPHINX_EXECUTABLE
+        NAMES sphinx-build
+        DOC "Sphinx documentation generator"
+    )
+
+    if(NOT SPHINX_EXECUTABLE)
+        message(FATAL_ERROR "sphinx-build not found. Please install Sphinx.")
+    endif()
+
+    # Export to parent scope
+    set(SPHINX_EXECUTABLE "${SPHINX_EXECUTABLE}" PARENT_SCOPE)
+endfunction()
+
+# Function to add a Sphinx builder target
+function(add_sphinx_builder builder_name)
+    add_custom_target(${builder_name}
+        COMMAND ${SPHINX_EXECUTABLE} -b ${builder_name} ${SPHINX_SOURCE} ${SPHINX_BUILD}/${builder_name}
+        VERBATIM
+    )
+endfunction()

docs/generate_llms_variants.py

@@ -1,59 +0,0 @@
-#!/usr/bin/env python3
-"""
-Generate variant llms.txt files for demo purposes.
-
-Takes the generated llms.txt (with _sources links) and creates:
-- llms.txt - default with _sources links (unchanged)
-- llms.md.txt - .html.md links
-- llms.rst.txt - .rst links
-"""
-
-import re
-import sys
-from pathlib import Path
-
-
-def get_base_url() -> str:
-    """Import base_url from conf.py."""
-    sys.path.insert(0, str(Path(__file__).parent / "source"))
-    from conf import html_baseurl  # noqa: E402
-
-    return html_baseurl
-
-
-def generate_variants(build_dir: Path) -> None:
-    """Generate llms.txt variants from the original file."""
-    original = build_dir / "llms.txt"
-
-    if not original.exists():
-        print(f"Error: {original} not found")
-        sys.exit(1)
-
-    content = original.read_text()
-    base_url = get_base_url()
-
-    # Pattern to match links like: https://.../_sources/{docname}.rst.txt
-    link_pattern = re.compile(
-        rf"({re.escape(base_url)})_sources/([a-zA-Z0-9_/\-]+)\.rst\.txt"
-    )
-
-    # Generate .html.md variant
-    md_content = link_pattern.sub(r"\1\2.html.md", content)
-    (build_dir / "llms.md.txt").write_text(md_content)
-    print(f"Generated: {build_dir / 'llms.md.txt'} (.html.md links)")
-
-    # Generate .rst variant
-    rst_content = link_pattern.sub(r"\1\2.rst", content)
-    (build_dir / "llms.rst.txt").write_text(rst_content)
-    print(f"Generated: {build_dir / 'llms.rst.txt'} (.rst links)")
-
-    print(f"Kept: {build_dir / 'llms.txt'} (_sources links)")
-
-
-if __name__ == "__main__":
-    if len(sys.argv) > 1:
-        build_dir = Path(sys.argv[1])
-    else:
-        build_dir = Path("build/html")
-
-    generate_variants(build_dir)

docs/requirements.txt

@@ -2,7 +2,6 @@ furo
 esbonio
 sphinx-contributors
 sphinx
-sphinx-design
 sphinx-llms-txt
 sphinx-inline-tabs
 sphinxext-opengraph

docs/source/advanced-configuration.rst

@@ -303,121 +303,42 @@ CMake Workflow
 ^^^^^^^^^^^^^^
 
 This project uses CMake to orchestrate documentation builds across multiple output formats, serving as a simple demo of the functionality.
-This approach enables parallel builds and integrates well with CI/CD platforms like Read the Docs.
-
 Building multiple formats allows you to compare what works best for your docs, as well as allows users to choose which format to feed to their LLM.
-Use :confval:`llms_txt_uri_template` to configure links to point to your preferred format.
+This approach enables parallel builds and integrates well with CI/CD platforms like Read the Docs.
 
 Key Files
 ~~~~~~~~~
 
-These configuration files serve as a simple example of a Sphinx site hosted on Read The Docs, some modification may be needed.
-
 .. code-block:: text
 
    .
    ├── .readthedocs.yml
    ├── CMakeLists.txt
    ├── CMakePresets.json
+   ├── cmake/
+   │   └── SphinxUtils.cmake
    └── docs/
        └── CMakeLists.txt
 
-Each section below contains a summary of the file's purpose, the full contents of the file, and a table describing key lines that may need modification.
+:ghfile:`.readthedocs.yml`
-
-.. dropdown:: .readthedocs.yml
-   :chevron: down-up
-
    A Read The Docs config file that installs dependencies, then runs the full documentation workflow which builds all output formats in parallel, and copies them into a single deploy location.
 
-   .. literalinclude:: ../../.readthedocs.yml
+:ghfile:`CMakeLists.txt`
-      :language: yaml
+   A CMake config file that sets up the project and includes the ``cmake/`` module path.
-      :lines: 1-9,11,14-
-      :linenos:
-      :emphasize-lines: 9, 14-15
 
-   .. list-table::
+:ghfile:`docs/CMakeLists.txt`
-      :header-rows: 1
+   A CMake config file that includes the Sphinx utilities and defines the documentation-specific build targets.
-      :width: 100%
-      :widths: 15 85
 
-      * - Line
+:ghfile:`cmake/SphinxUtils.cmake`
-        - Description
+   A CMake module that provides Sphinx related utilities.
-      * - **9**
-        - Update the path if your requirements file is in a different location
-      * - **13-14**
-        - Modify the copy commands for the output formats you deploy
-
-.. dropdown:: CMakeLists.txt
-   :chevron: down-up
-
-   A CMake config file that sets up the project, fetches the shared `sphinx-cmake-modules <https://github.com/jdillard/sphinx-cmake-modules>`_, and includes the docs subdirectory.
-
-   .. literalinclude:: ../../CMakeLists.txt
-      :language: cmake
-      :linenos:
-      :emphasize-lines: 9, 15
-
-   .. list-table::
-      :header-rows: 1
-      :width: 100%
-      :widths: 15 85
-
-      * - Line
-        - Description
-      * - **9**
-        - Update the ``GIT_TAG`` to use a different version or commit hash
-      * - **15**
-        - Change if your docs subdirectory has a different location
-
-.. dropdown:: docs/CMakeLists.txt
-   :chevron: down-up
-
-   A CMake config file that includes the `SphinxUtils <https://github.com/jdillard/sphinx-cmake-modules/blob/v0.1.0/SphinxUtils.cmake>`_ module from FetchContent and defines the documentation-specific build targets.
-
-   .. literalinclude:: ../CMakeLists.txt
-      :language: cmake
-      :linenos:
-      :emphasize-lines: 5-7
-
-   .. list-table::
-      :header-rows: 1
-      :width: 100%
-      :widths: 15 85
-
-      * - Line
-        - Description
-      * - **5-7**
-        - Add or remove calls based on which output formats you need
-
-
-.. dropdown:: CMakePresets.json
-   :chevron: down-up
 
+:ghfile:`CMakePresets.json`
    Defines presets for configuring and building documentation:
 
    - **Configure Presets:** Sets up the build directory.
-   - **Build Presets:** Defines build formats individually and all in parallel.
+   - **Build Presets:** Defines Build formats individually and all in parallel.
    - **Workflow Presets:** Runs the configure preset followed by the parallel build preset.
 
-   .. literalinclude:: ../../CMakePresets.json
-      :language: json
-      :linenos:
-      :emphasize-lines: 18-23, 24-29, 34
-
-   .. list-table::
-      :header-rows: 1
-      :width: 100%
-      :widths: 15 85
-
-      * - Line
-        - Description
-      * - **18-23**
-        - Remove this preset to disable Markdown documentation builds
-      * - **24-29**
-        - Remove this preset to disable reStructuredText documentation builds
-      * - **34**
-        - Modify the targets list to build only the output formats you need in parallel
-
 Usage
 ~~~~~
 

docs/source/conf.py

@@ -16,6 +16,7 @@ project = "sphinx-llms-txt"
 copyright = "Jared Dillard"
 author = "Jared Dillard"
 
+llms_txt_uri_template = "{base_url}{docname}.md"
 llms_txt_code_files = ["+:../../sphinx_llms_txt/*.py"]
 llms_txt_summary = """
 A Sphinx extension that generates a summary llms.txt file,written in Markdown,
@@ -24,7 +25,10 @@ and a single combined documentation llms-full.txt file, written in reStructuredT
 
 # This doesn't seem to be supported
 # rst_file_suffix = ".html.rst"
-markdown_file_suffix = ".html.md"
+
+extlinks = {
+    "ghfile": ("https://github.com/jdillard/sphinx-llms-txt/blob/main/%s", "%s")
+}
 
 # check if the current commit is tagged as a release (vX.Y.Z)
 try:
@@ -57,7 +61,6 @@ extensions = [
     "sphinxcontrib.restbuilder",
     "sphinx_inline_tabs",
     "sphinx.ext.extlinks",
-    "sphinx_design",
 ]
 
 # The language for content autogenerated by Sphinx. Refer to documentation

docs/source/getting-started.rst

@@ -34,34 +34,24 @@ After the HTML finishes building, **sphinx-llms-txt** will output the location o
     sphinx-llms-txt: Created /path/to/_build/html/llms-full.txt with 45 sources and 6879 lines
     sphinx-llms-txt: created /path/to/_build/html/llms.txt
 
-.. _choosing-output-format:
-
 Choosing an Output Format
 -------------------------
 
-By default, **sphinx-llms-txt** requires no additional configuration and links to raw reStructuredText source files created by the HTML builder.
+By default, **sphinx-llms-txt** requires no additional configuration and links to raw reStructuredText source files in :confval:`_sources/ <sphinx:html_copy_source>`.
-For optimal LLM support, see the alternative builders below and the :ref:`CMake workflow <cmake_workflow>` for setup.
+For optimal LLM support, you can use `sphinx-markdown-builder`_ and/or `sphinxcontrib-restbuilder`_, set up in parallel builds using :ref:`CMake <cmake_workflow>`.
 
 .. list-table:: Output Format Comparison
    :header-rows: 1
    :widths: 18 27 27 27
 
    * -
-     - Default
+     - Default (no config)
-     - Markdown
+     - Markdown (CMake)
-     - reStructuredText
+     - RST (CMake)
-   * - **Setup**
-     - No config
-     - CMake [#sphinxllm]_
-     - CMake
-   * - **Builder**
-     - Native [#native]_
-     - `sphinx-markdown-builder`_
-     - `sphinxcontrib-restbuilder`_
    * - **Format**
-     - Raw reStructuredText source
+     - Raw RST source
-     - Rendered Markdown [#rendered]_
+     - Rendered Markdown
-     - Rendered reStructuredText [#rendered]_
+     - Rendered RST
    * - **LLM Readability**
      - Good - preserves structure for simple syntax
      - Excellent - native LLM format
@@ -71,22 +61,18 @@ For optimal LLM support, see the alternative builders below and the :ref:`CMake
      - More compact (less input tokens)
      - Can preserve Sphinx semantics
    * - **Key Disadvantage**
-     - Raw directives won't be parsed [#autodoc]_
+     - Raw directives (e.g., autodoc) won't be parsed
      - Loses structure from complex directives
      - Can lose structure from complex directives
    * - **llms-full.txt support**
-     - Supported with above caveats
+     - Suported with above caveats
-     - Pending `support <https://github.com/liran-funaro/sphinx-markdown-builder/pull/37>`__ [#pending]_
+     - Pending `support <https://github.com/liran-funaro/sphinx-markdown-builder/pull/37>`__
-     - Pending `support <https://github.com/sphinx-contrib/restbuilder/pull/35>`__ [#pending]_
+     - Pending `support <https://github.com/sphinx-contrib/restbuilder/pull/35>`__
+
+
+See :ref:`cmake_workflow` for an example of building HTML, Markdown, and RST in parallel.
+Use :confval:`llms_txt_uri_template` to configure links to point to your preferred format.
 
 .. _sphinx-markdown-builder: https://pypi.org/project/sphinx-markdown-builder/
 .. _sphinxcontrib-restbuilder: https://pypi.org/project/sphinxcontrib-restbuilder/
 
-.. rubric:: Footnotes
-
-.. [#sphinxllm] See `sphinx-llm <https://github.com/NVIDIA/sphinx-llm>`_ as an alternative for CMake-free Markdown builds.
-.. [#native] Uses raw :confval:`_sources/ <sphinx:html_copy_source>` files created by Sphinx's HTML builder with some minor enhancements.
-.. [#autodoc] Directives like ``autodoc`` will appear as raw directive syntax rather than the extracted docstrings.
-.. [#pending] PRs that add ``llms-full.txt`` concatenation support have yet to be released.
-.. [#rendered] Directives are expanded and processed before output, so content like autodoc docstrings will be included.
-

docs/source/index.rst

@@ -8,9 +8,7 @@ A `Sphinx`_ extension that generates a summary ``llms.txt`` file, written in Mar
 Demo
 ----
 
-This Sphinx project's `llms.txt`_ and `llms-full.txt`_ files as an example of the default output format.
+You can see this Sphinx project's `llms.txt`_ and `llms-full.txt`_ files as a simple example.
-
-Alternative :ref:`output formats <choosing-output-format>` are also available. For example: `Markdown`_ and `reStructuredText`_.
 
 Highlights
 ----------
@@ -26,11 +24,6 @@ Highlights
    Filter content, include source code files, or integrate with alternative output formats like Markdown for even better LLM compatibility.
    See :doc:`getting-started` for output format options and :doc:`configuration-values` for all settings.
 
-.. seealso::
-
-   For better default output without configuration, see `sphinx-llm <https://github.com/NVIDIA/sphinx-llm>`_ from NVIDIA.
-   sphinx-llms-txt is best when customized with alternative output formats, content filtering, or source code inclusion.
-
 .. toctree::
    :maxdepth: 2
 
@@ -43,8 +36,6 @@ Highlights
 
 .. _llms.txt: https://sphinx-llms-txt.readthedocs.io/en/latest/llms.txt
 .. _llms-full.txt: https://sphinx-llms-txt.readthedocs.io/en/latest/llms-full.txt
-.. _Markdown: https://sphinx-llms-txt.readthedocs.io/en/latest/llms.md.txt
-.. _reStructuredText: https://sphinx-llms-txt.readthedocs.io/en/latest/llms.rst.txt
 .. _Sphinx: http://sphinx-doc.org/
 
 .. |PyPI version| image:: https://img.shields.io/pypi/v/sphinx-llms-txt.svg

sphinx_llms_txt/__init__.py

@@ -21,7 +21,7 @@ from .manager import LLMSFullManager
 from .processor import DocumentProcessor
 from .writer import FileWriter
 
-__version__ = "0.7.2"
+__version__ = "0.7.0"
 
 # Export classes needed by tests
 __all__ = [

sphinx_llms_txt/writer.py

@@ -163,17 +163,11 @@ class FileWriter:
 
                     title = page_titles.get(docname, docname)
 
-                    # Avoid duplicate extensions when suffix matches
-                    # sourcelink_suffix (e.g., both are ".txt")
-                    effective_sourcelink_suffix = sourcelink_suffix
-                    if suffix and suffix == sourcelink_suffix:
-                        effective_sourcelink_suffix = ""
-
                     uri = uri_template.format(
                         base_url=base_url,
                         docname=docname,
                         suffix=suffix or "",
-                        sourcelink_suffix=effective_sourcelink_suffix,
+                        sourcelink_suffix=sourcelink_suffix,
                     )
 
                     f.write(f"- [{title}]({uri})\n")

tests/test_uri_template.py

@@ -132,48 +132,6 @@ def test_uri_template_custom(tmp_path):
     assert "- [Home Page](https://example.com/raw/index.rst)" in content
 
 
-def test_uri_template_no_double_extension_when_suffix_matches_sourcelink(tmp_path):
-    """Test that .txt suffix + .txt sourcelink_suffix doesn't produce .txt.txt URLs."""
-    build_dir = tmp_path / "build"
-    build_dir.mkdir()
-
-    sources_dir = build_dir / "_sources"
-    sources_dir.mkdir()
-
-    class MockApp:
-        class Config:
-            html_sourcelink_suffix = ".txt"
-
-        config = Config()
-
-    config = {
-        "llms_txt_file": True,
-        "llms_txt_filename": "llms.txt",
-        "html_baseurl": "https://example.com",
-    }
-    writer = FileWriter(config, str(build_dir), MockApp())
-
-    page_titles = {
-        "index": "Home Page",
-        "contents": "Table of Contents",
-    }
-
-    # .txt source files — suffix matches sourcelink_suffix
-    page_order = [("index", ".txt"), ("contents", ".txt")]
-
-    writer.write_verbose_info_to_file(page_order, page_titles, 0, sources_dir)
-
-    verbose_file = build_dir / "llms.txt"
-    with open(verbose_file, "r", encoding="utf-8") as f:
-        content = f.read()
-
-    # Should NOT have double .txt.txt extension
-    assert ".txt.txt" not in content
-    # Should have single .txt extension
-    assert "- [Home Page](https://example.com/_sources/index.txt)" in content
-    assert "- [Table of Contents](https://example.com/_sources/contents.txt)" in content
-
-
 def test_uri_template_invalid_fallback(tmp_path):
     """
     Test that invalid template falls back to default sources template when