Merge branch 'master' into doc-styles-check
This commit is contained in:
@ -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 ------------------------------------------------
|
||||
|
||||
@ -30,7 +31,10 @@ import os
|
||||
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
|
||||
# ones.
|
||||
extensions = [
|
||||
'sphinx.ext.mathjax', 'sphinx.ext.imgmath'
|
||||
'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
|
||||
@ -323,3 +327,5 @@ import LAMMPSLexer
|
||||
from sphinx.highlighting import lexers
|
||||
|
||||
lexers['LAMMPS'] = LAMMPSLexer.LAMMPSLexer(startinline=True)
|
||||
|
||||
sys.path.append(os.path.join(os.path.dirname(__file__), '../../../python'))
|
||||
|
||||
@ -213,6 +213,7 @@ Berne
|
||||
Bertotti
|
||||
Bessarab
|
||||
Beutler
|
||||
Bext
|
||||
bgq
|
||||
Bh
|
||||
Biersack
|
||||
@ -1042,6 +1043,7 @@ Gunsteren
|
||||
Gunzenmuller
|
||||
Guo
|
||||
gw
|
||||
gyromagnetic
|
||||
gz
|
||||
gzipped
|
||||
Haak
|
||||
@ -1061,6 +1063,7 @@ Haswell
|
||||
Haugk
|
||||
Hayoun
|
||||
Hayre
|
||||
hbar
|
||||
hbcut
|
||||
hbn
|
||||
hbnewflag
|
||||
@ -1403,6 +1406,7 @@ Lammps
|
||||
LAMMPS
|
||||
lammpsplot
|
||||
Lamoureux
|
||||
Lande
|
||||
Landron
|
||||
langevin
|
||||
Langevin
|
||||
@ -1775,6 +1779,7 @@ mtk
|
||||
Mtotal
|
||||
muB
|
||||
Muccioli
|
||||
mui
|
||||
Mukherjee
|
||||
Mulders
|
||||
multi
|
||||
@ -2074,7 +2079,9 @@ Ouyang
|
||||
overlayed
|
||||
Ovito
|
||||
oxdna
|
||||
oxrna
|
||||
oxDNA
|
||||
oxRNA
|
||||
padua
|
||||
Padua
|
||||
palegoldenrod
|
||||
|
||||
Reference in New Issue
Block a user