diff --git a/doc/Makefile b/doc/Makefile index f63f91454c..d5671b8895 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -10,7 +10,6 @@ endif BUILDDIR = ${CURDIR} RSTDIR = $(BUILDDIR)/src VENV = $(BUILDDIR)/docenv -TXT2RST = $(VENV)/bin/txt2rst ANCHORCHECK = $(VENV)/bin/rst_anchor_check SPHINXCONFIG = $(BUILDDIR)/utils/sphinx-config MATHJAX = $(SPHINXCONFIG)/_static/mathjax @@ -59,7 +58,7 @@ SPHINXEXTRA = -E -j $(shell $(PYTHON) -c 'import multiprocessing;print(multiproc # we only want to use explicitly listed files. DOXYFILES = $(shell sed -n -e 's/\#.*$$//' -e '/^ *INPUT \+=/,/^[A-Z_]\+ \+=/p' doxygen/Doxyfile.in | sed -e 's/@LAMMPS_SOURCE_DIR@/..\/src/g' -e 's/\\//g' -e 's/ \+/ /' -e 's/[A-Z_]\+ \+= *\(YES\|NO\|\)//') -.PHONY: help clean-all clean clean-spelling epub mobi rst html pdf spelling anchor_check style_check xmlgen +.PHONY: help clean-all clean clean-spelling epub mobi rst html pdf spelling anchor_check style_check char_check xmlgen # ------------------------------------------ @@ -205,6 +204,9 @@ package_check : $(VENV) deactivate ;\ ) +char_check : + @( env LC_ALL=C grep -n '[^ -~]' $(RSTDIR)/*.rst && exit 1 || : ) + xmlgen : doxygen/xml/index.xml doxygen/Doxyfile: doxygen/Doxyfile.in @@ -230,7 +232,7 @@ $(VENV): $(MATHJAX): @git clone -b 3.1.4 -c advice.detachedHead=0 --depth 1 git://github.com/mathjax/MathJax.git $@ -$(TXT2RST) $(ANCHORCHECK): $(VENV) +$(ANCHORCHECK): $(VENV) @( \ . $(VENV)/bin/activate; \ (cd utils/converters;\ diff --git a/doc/utils/converters/lammpsdoc/rst_anchor_check.py b/doc/utils/converters/lammpsdoc/rst_anchor_check.py old mode 100644 new mode 100755 index 64a1308601..5d4ee428e2 --- a/doc/utils/converters/lammpsdoc/rst_anchor_check.py +++ b/doc/utils/converters/lammpsdoc/rst_anchor_check.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python3 +#!/usr/bin/env python3 # LAMMPS Documentation Utilities # # Scan for duplicate anchor labels in documentation files diff --git a/doc/utils/converters/setup.py b/doc/utils/converters/setup.py index d85669bcc1..275c9b0c0b 100644 --- a/doc/utils/converters/setup.py +++ b/doc/utils/converters/setup.py @@ -1,7 +1,7 @@ from setuptools import setup setup(name='LAMMPS Documentation Utilities', - version='2.0.0', + version='2.0.1', description='Utilities to convert existing LAMMPS documentation text files into ReStructured Text', url='https://github.com/rbberger/lammps-doc-utils', author='Richard Berger', @@ -11,8 +11,6 @@ setup(name='LAMMPS Documentation Utilities', test_suite='nose.collector', tests_require=['nose'], entry_points = { - "console_scripts": ['txt2html = lammpsdoc.txt2html:main', - 'txt2rst = lammpsdoc.txt2rst:main', - 'rst_anchor_check = lammpsdoc.rst_anchor_check:main '] + "console_scripts": ['rst_anchor_check = lammpsdoc.rst_anchor_check:main '] }, )