Merge branch 'master' of github.com:bradbell/xrst

The only conflicts were the cuurent dates.

.gitignore

@@ -14,3 +14,6 @@ __pycache__/
 *.log
 *.swp
 *.tmp
+# MacOS special cases
+/.tox/
+/pytest/test_rst.py-e

bin/check_tab.sh

@@ -9,11 +9,19 @@ then
    echo "bin/check_tab.sh: must be executed from its parent directory"
    exit 1
 fi
+#
+# grep
+if which ggrep >& /dev/null
+then
+   grep=$(which ggrep)
+else
+   grep='grep'
+fi
 # -----------------------------------------------------------------------------
 ok='yes'
 for file in $(git ls-files)
 do
-   if grep -P '\t' $file > /dev/null
+   if $grep -P '\t' $file > /dev/null
    then
       echo "$file has a tab"
       ok='no'

bin/check_version.sh

@@ -4,11 +4,20 @@ set -e -u
 # SPDX-FileCopyrightText: Bradley M. Bell <[email protected]>
 # SPDX-FileContributor: 2020-24 Bradley M. Bell
 # -----------------------------------------------------------------------------
-# bash function that echos and executes a command
+#
+# echo_eval
 echo_eval() {
    echo $*
    eval $*
 }
+#
+# sed
+if which gsed >& /dev/null
+then
+   sed=gsed
+else
+   sed=sed
+fi
 # -----------------------------------------------------------------------------
 # BEGIN: SECTION THAT DEPENDS ON GIT REPOSITORY
 #
@@ -30,7 +39,7 @@ version_files='
 # create_temp_sed
 # The sed script temp.sed is used to check the version number in files above.
 function create_temp_sed {
-year=$( echo $version | sed -e 's|\..*||' )
+year=$( echo $version | $sed -e 's|\..*||' )
 cat << EOF > temp.sed
 #
 # xrst/user.xrst
@@ -62,7 +71,7 @@ fi
 # -----------------------------------------------------------------------------
 # check_version
 check_version() {
-   sed "$1" -f temp.sed > temp.out
+   $sed "$1" -f temp.sed > temp.out
    if ! diff "$1" temp.out > /dev/null
    then
       version_ok='no'
@@ -83,12 +92,12 @@ branch=$(git rev-parse --abbrev-ref HEAD)
 #
 # version
 version=$(
-   sed -n -e '/^ *version *=/p' $stable_version_file | \
-      sed -e 's|.*= *||' -e "s|'||g"
+   $sed -n -e '/^ *version *=/p' $stable_version_file | \
+      $sed -e 's|.*= *||' -e "s|'||g"
 )
 if [ "$branch" == 'master' ] || [ "$branch" == 'main' ]
 then
-   version=$(date +%Y.%m.%d | sed -e 's|\.0*|.|g')
+   version=$(date +%Y.%m.%d | $sed -e 's|\.0*|.|g')
 fi
 if echo $branch | grep '^stable/' > /dev/null
 then

bin/check_xrst.sh

@@ -36,12 +36,19 @@ else
 fi
 print_variable PYTHONPATH
 # -----------------------------------------------------------------------------
+#
 # number_jobs
-if [ $(nproc) == '1' ] || [ $(nproc) == '2' ]
+if which nproc >& /dev/null
+then
+   n_proc=$(nproc)
+else
+   n_proc=$(sysctl -n hw.ncpu)
+fi
+if [ $n_proc == '1' ] || [ n_proc == '2' ]
 then
    number_jobs='1'
 else
-   let number_jobs="$(nproc) - 1"
+   let number_jobs="$n_proc - 1"
 fi
 # -----------------------------------------------------------------------------
 # index_page_name

pyproject.toml

@@ -11,7 +11,7 @@ build-backend = 'setuptools.build_meta'
 # -----------------------------------------------------------------------------
 [project]
 name              = 'xrst'
-version           = '2024.8.15'
+version           = '2024.8.25'
 description       = 'Extract RST files from source code and run Sphinx'
 readme            = 'readme.md'
 requires-python   = '>=3.0'

setup.py

@@ -8,7 +8,7 @@
 
 setup(
    name             = 'xrst',
-   version          = '2024.8.15',
+   version          = '2024.8.25',
    description      = 'Extract RST files from source code and run Sphinx',
    license          = 'GPL-3.0-or-later',
    keywords         = 'sphinx rst documentation source',

test_rst/config_file.rst

@@ -458,7 +458,7 @@ Example
 =======
 
 .. literalinclude:: ../../xrst.toml
-   :lines: 71-96
+   :lines: 71-97
    :language: toml
 
 .. index:: not_in_index
@@ -498,5 +498,5 @@ Example
 =======
 
 .. literalinclude:: ../../xrst.toml
-   :lines: 100-129
+   :lines: 101-130
    :language: toml

tox.ini

@@ -1,10 +1,12 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 # SPDX-FileCopyrightText: Bradley M. Bell <[email protected]>
-# SPDX-FileContributor: 2020-23 Bradley M. Bell
+# SPDX-FileContributor: 2020-24 Bradley M. Bell
 #
 [tox]
 # see python requires-python in pyproject.toml
-envlist   = {py3.12, py3.11, py3.10, py3.9, py3.8}
+# envlist   = {py3.12, py3.11, py3.10, py3.9, py3.8}
+# pyenchant does not work on MacOS with older versions of python
+envlist   = {py3.12, py3.11, py3.10}
 skipsdist = true
 
 [testenv]

xrst.toml

@@ -83,6 +83,7 @@ data = [
    ''',
    # abbreviations
    '''
+   config
    dir
    toc
    tmp

xrst/run_xrst.py

@@ -607,7 +607,7 @@ def fix_latex(latex_dir, project_name) :
 import xrst
 #
 # version
-version = '2024.8.15'
+version = '2024.8.25'
 #
 def run_xrst() :
    #