merged in current master

doc/utils/sphinx-config/conf.py

@@ -20,6 +20,7 @@ import os
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #sys.path.insert(0, os.path.abspath('.'))
+sys.path.append(os.path.join(os.path.dirname(__file__), '../../src/_ext'))
 
 # -- General configuration ------------------------------------------------
 
@@ -31,6 +32,9 @@ import os
 # ones.
 extensions = [
     'sphinx.ext.mathjax',
+    'sphinx.ext.imgmath',
+    'sphinx.ext.autodoc',
+    'table_from_list',
 ]
 # 2017-12-07: commented out, since this package is broken with Sphinx 16.x
 #             yet we can no longer use Sphinx 15.x, since that breaks with
@@ -201,6 +205,11 @@ htmlhelp_basename = 'LAMMPSdoc'
 
 html_add_permalinks = ''
 
+if 'epub' in sys.argv:
+  html_math_renderer = 'imgmath'
+else:
+  html_math_renderer = 'mathjax'
+
 # -- Options for LaTeX output ---------------------------------------------
 
 latex_elements = {
@@ -312,3 +321,11 @@ if spelling_spec:
 
     spelling_lang='en_US'
     spelling_word_list_filename='false_positives.txt'
+
+sys.path.append(os.path.join(os.path.dirname(__file__), '.'))
+import LAMMPSLexer
+from sphinx.highlighting import lexers
+
+lexers['LAMMPS'] = LAMMPSLexer.LAMMPSLexer(startinline=True)
+
+sys.path.append(os.path.join(os.path.dirname(__file__), '../../../python'))