From 1fb10441e41e2e4539462f20539671d732c34167 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Mon, 5 Jun 2023 13:45:43 -0700
Subject: [PATCH] src/doc/bootstrap: In reference manual show modularized
 sagelib packages separately

---
 build/bin/sage-spkg-info |  2 +-
 src/doc/bootstrap        | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/build/bin/sage-spkg-info b/build/bin/sage-spkg-info
index 4e53139fa7e..d02b3ac347f 100755
--- a/build/bin/sage-spkg-info
+++ b/build/bin/sage-spkg-info
@@ -9,7 +9,7 @@ PKG_SCRIPTS="$SAGE_ROOT/build/pkgs/$PKG_BASE"
 for ext in rst txt; do
     SPKG_FILE="$PKG_SCRIPTS/SPKG.$ext"
     if [ -f "$SPKG_FILE" ]; then
-        cat "$SPKG_FILE"
+        sed "1,3s/^ *Sage: Open Source Mathematics Software:/$PKG_BASE:/" "$SPKG_FILE"
         break
     fi
 done
diff --git a/src/doc/bootstrap b/src/doc/bootstrap
index 6dd50fd5cec..c8766a2173d 100755
--- a/src/doc/bootstrap
+++ b/src/doc/bootstrap
@@ -100,7 +100,16 @@ Sage depends.  It installs them automatically if it does not find
 equivalent system packages.
 
 EOF
-for PKG_BASE in $(sage-package list --has-file SPKG.rst :standard: | sort); do
+for PKG_BASE in $(sage-package list --has-file SPKG.rst :standard: | grep -v '^sagemath_' | sort); do
+    echo "* :ref:\`spkg_$PKG_BASE\`"
+done >> "$OUTPUT_INDEX"
+cat >> "$OUTPUT_INDEX" <<EOF
+
+Packages of the Modularized Sage Library
+----------------------------------------
+
+EOF
+for PKG_BASE in $(sage-package list --has-file SPKG.rst | grep '^sagemath_' | sort); do
     echo "* :ref:\`spkg_$PKG_BASE\`"
 done >> "$OUTPUT_INDEX"
 cat >> "$OUTPUT_INDEX" <<EOF
@@ -112,7 +121,7 @@ For additional functionality, you can install some of the following
 optional packages.
 
 EOF
-for PKG_BASE in $(sage-package list --has-file SPKG.rst :optional: | sort); do
+for PKG_BASE in $(sage-package list --has-file SPKG.rst :optional: | grep -v '^sagemath_' | sort); do
     echo "* :ref:\`spkg_$PKG_BASE\`"
 done >> "$OUTPUT_INDEX"
 cat >> "$OUTPUT_INDEX" <<EOF
@@ -125,7 +134,7 @@ Some packages that provide additional functionality are marked as
 integration of these packages into the Sage distribution.
 
 EOF
-for PKG_BASE in $(sage-package list --has-file SPKG.rst :experimental: | sort); do
+for PKG_BASE in $(sage-package list --has-file SPKG.rst :experimental: | grep -v '^sagemath_' | sort); do
     echo "* :ref:\`spkg_$PKG_BASE\`"
 done >> "$OUTPUT_INDEX"
 cat >> "$OUTPUT_INDEX" <<EOF
@@ -150,6 +159,7 @@ Packages are in alphabetical order.
 .. toctree::
    :maxdepth: 1
 
+.. default-role:: code
 EOF
 for PKG_BASE in $(sage-package list --has-file SPKG.rst | sort); do
             PKG_SCRIPTS=build/pkgs/$PKG_BASE
@@ -160,3 +170,6 @@ for PKG_BASE in $(sage-package list --has-file SPKG.rst | sort); do
             (echo ".. _spkg_$PKG_BASE:" && echo && OUTPUT_RST=1 sage-spkg-info $PKG_BASE) | sed -e "s|https://github.com/sagemath/sage/issues/\([0-9]*\)|:issue:\`\1\`|g" -e "s|https://arxiv.org/abs/cs/\([0-9]*\)|:arxiv:\`cs/\1\`|g" > "$OUTPUT_DIR"/$PKG_BASE.rst
             echo >> "$OUTPUT_INDEX" "   $PKG_BASE"
 done
+cat >> "$OUTPUT_INDEX" <<EOF
+.. default-role::
+EOF