diff --git a/bin/check_invisible.sh b/bin/check_invisible.sh index 22daa28..28e1d8c 100755 --- a/bin/check_invisible.sh +++ b/bin/check_invisible.sh @@ -2,7 +2,7 @@ set -e -u # SPDX-License-Identifier: GPL-3.0-or-later # SPDX-FileCopyrightText: Bradley M. Bell -# SPDX-FileContributor: 2020-22 Bradley M. Bell +# SPDX-FileContributor: 2020-24 Bradley M. Bell # ----------------------------------------------------------------------------- if [ "$0" != "bin/check_invisible.sh" ] then @@ -19,13 +19,21 @@ else echo 'usage: bin/check_invisible [all]' exit 1 fi +# +# sed_path +if which gsed >& /dev/null +then + sed_path=$(which gsed) +else + sed_path=$(which sed) +fi # ---------------------------------------------------------------------------- # file_list if [ "$all" == 'true' ] then file_list=$(git ls-files) else - file_list=$(git status --porcelain | sed -e 's|^...||') + file_list=$(git status --porcelain | $sed_path -e 's|^...||') fi # # sed.$$ @@ -41,7 +49,7 @@ for file in $file_list do if [ -f "$file" ] then - sed -f sed.$$ $file > copy.$$ + $sed_path -f sed.$$ $file > copy.$$ if ! diff $file copy.$$ > diff.$$ then echo "original (<) invisible white space removed (>)" diff --git a/pyproject.toml b/pyproject.toml index c7aff7a..e006b3f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,7 +11,7 @@ build-backend = 'setuptools.build_meta' # ----------------------------------------------------------------------------- [project] name = 'xrst' -version = '2024.6.25' +version = '2024.7.13' description = 'Extract RST files from source code and run Sphinx' readme = 'readme.md' requires-python = '>=3.0' diff --git a/setup.py b/setup.py index 4ad9340..e032af1 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setup( name = 'xrst', - version = '2024.6.25', + version = '2024.7.13', description = 'Extract RST files from source code and run Sphinx', license = 'GPL-3.0-or-later', keywords = 'sphinx rst documentation source', diff --git a/test_rst/check_input_files.rst b/test_rst/check_input_files.rst index d9ad29f..56530b2 100644 --- a/test_rst/check_input_files.rst +++ b/test_rst/check_input_files.rst @@ -25,7 +25,7 @@ Prototype ********* .. literalinclude:: ../../xrst/check_input_files.py - :lines: 63-77,187-192 + :lines: 62-76,186-191 :language: py .. index:: config_file diff --git a/test_rst/get_conf_dict.rst b/test_rst/get_conf_dict.rst index 44d759b..8600fff 100644 --- a/test_rst/get_conf_dict.rst +++ b/test_rst/get_conf_dict.rst @@ -28,7 +28,7 @@ Prototype ********* .. literalinclude:: ../../xrst/get_conf_dict.py - :lines: 507-509,700-702 + :lines: 504-506,697-699 :language: py .. index:: config_file diff --git a/xrst/check_input_files.py b/xrst/check_input_files.py index 8ae3043..c671e03 100644 --- a/xrst/check_input_files.py +++ b/xrst/check_input_files.py @@ -9,7 +9,6 @@ # {xrst_begin check_input_files dev} # {xrst_spell # conf -# config # } # {xrst_comment_ch #} # diff --git a/xrst/get_conf_dict.py b/xrst/get_conf_dict.py index 3a1d29d..6cf26c4 100644 --- a/xrst/get_conf_dict.py +++ b/xrst/get_conf_dict.py @@ -472,9 +472,6 @@ def iterable2string(iterable) : return string # # {xrst_begin get_conf_dict dev} -# {xrst_spell -# config -# } # {xrst_comment_ch #} # # Get Configuration Dictionary diff --git a/xrst/run_xrst.py b/xrst/run_xrst.py index f139792..63596e8 100644 --- a/xrst/run_xrst.py +++ b/xrst/run_xrst.py @@ -608,7 +608,7 @@ def fix_latex(latex_dir, project_name) : import xrst # # version -version = '2024.6.25' +version = '2024.7.13' # def run_xrst() : #