Changeset e4d8726 in sasmodels for doc

Timestamp:

Feb 26, 2016 12:27:24 PM (9 years ago)

Author:

richardh

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:

139c528

Parents:

97e6d3c (diff), 960cd80 (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.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasmodels

Location:

doc

Files:

• _extensions/dollarmath.py (modified) (2 diffs)
• _templates/layout.html (added)
• rst_prolog (modified) (1 diff)

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__":

doc/rst_prolog

@@ -60 +60 @@
 .. |g/cm^3| replace:: g\ |cdot|\ cm\ :sup:`-3`
 .. |fm^2| replace:: fm\ :sup:`2`
+.. |Ang*cm^-1| replace:: |Ang|\ |cdot|\ cm\ :sup:`-1`