Changeset 103ea45 in sasmodels

Timestamp:

Feb 24, 2016 2:57:20 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

431caae

Parents:

b7529e2

Message:

more flexible handling of inline latex

File:

• doc/_extensions/dollarmath.py (modified) (2 diffs)

doc/_extensions/dollarmath.py

@@ -12 +12 @@
 import re
 
-_dollar = re.compile(r"(?:^|(?<=\s))[$]([^\n]*?)(?<![\\])[$](?:$|(?=\s|[.,;\\]))")
+_dollar = re.compile(r"(?:^|(?<=\s|[(]))[$]([^\n]*?)(?<![\\])[$](?:$|(?=\s|[.,;)\\]))")
 _notdollar = re.compile(r"\\[$]")
 
@@ -51 +51 @@
     assert replace_dollar(u"dollar\$ escape")==u"dollar$ escape"
     assert replace_dollar(u"dollar \$escape\$ too")==u"dollar $escape$ too"
+    assert replace_dollar(u"spaces $in the$ math")==u"spaces :math:`in the` math"
     assert replace_dollar(u"emb\ $ed$\ ed")==u"emb\ :math:`ed`\ ed"
     assert replace_dollar(u"$first$a")==u"$first$a"
     assert replace_dollar(u"a$last$")==u"a$last$"
+    assert replace_dollar(u"$37")==u"$37"
+    assert replace_dollar(u"($37)")==u"($37)"
+    assert replace_dollar(u"$37 - $43")==u"$37 - $43"
+    assert replace_dollar(u"($37, $38)")==u"($37, $38)"
     assert replace_dollar(u"a $mid$dle a")==u"a $mid$dle a"
+    assert replace_dollar(u"a ($in parens$) a")==u"a (:math:`in parens`) a"
+    assert replace_dollar(u"a (again $in parens$) a")==u"a (again :math:`in parens`) a"
 
 if __name__ == "__main__":