Changeset 0fc5a03 in sasview for docs/sphinx-docs/source/_extensions/dollarmath.py

Timestamp:

Nov 7, 2017 9:09:49 AM (7 years ago)

Author:

GitHub <noreply@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

0957bb3a, 2469df7, 6debc16

Parents:

08b9e331 (diff), 2a2fb09 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Paul Kienzle <pkienzle@…> (11/07/17 09:09:49)

git-committer:

GitHub <noreply@…> (11/07/17 09:09:49)

Message:

Merge pull request #116 from SasView?/dollarmath

consistent $-math expression for sasmodels and sasview, now allowing 1-$\sigma$

File:

• docs/sphinx-docs/source/_extensions/dollarmath.py (modified) (1 diff)

docs/sphinx-docs/source/_extensions/dollarmath.py

@@ -11 +11 @@
 
 import re
-_dollar = re.compile(r"(?:^|(?<=\s))[$]([^\n]*?)(?<![\\])[$](?:$|(?=\s|[.,;:?\\()]))")
+_dollar = re.compile(r"(?:^|(?<=\s|[-(]))[$]([^\n]*?)(?<![\\])[$](?:$|(?=\s|[-.,;:?\\)]))")
 _notdollar = re.compile(r"\\[$]")