Merge commit 'refs/pull/1903/head' of github.com:lammps/lammps into release-preparation

2020-02-27 01:15:17 -05:00
parent 3563d2f10d 9ef5949798
commit 1bb38ed09b
132 changed files with 1664 additions and 1654 deletions
--- a/doc/utils/sphinx-config/LAMMPSLexer.py
+++ b/doc/utils/sphinx-config/LAMMPSLexer.py
@ -35,7 +35,7 @@ class LAMMPSLexer(RegexLexer):
            (r'[\w_\.\[\]]+', Name),
            (r'\$[\w_]+', Name.Variable),
            (r'\s+', Whitespace),
-            (r'[\+\-\*\/&=<>]', Operator),
+            (r'[\+\-\*\^\|\/\!%&=<>]', Operator),
        ],
        'variable' : [
            ('[^\}]+', Name.Variable),