unit test and updates to latex output

robfalck · robfalck · commit 495841418efe · 2011-05-08T20:53:47.000-04:00
diff --git a/quantities/dimensionality.py b/quantities/dimensionality.py
@@ -50,7 +50,7 @@ def unicode(self):
         
     @property
     def latex(self):
-        return markup.format_units_latex(self,font="mathrm",mult="")
+        return markup.format_units_latex(self.simplified,font='mathrm',mult=r'\cdot')
 
     def __hash__(self):
         res = hash(unit_registry['dimensionless'])
diff --git a/quantities/markup.py b/quantities/markup.py
@@ -29,7 +29,7 @@ def __init__(self):
 
 config = _Config()
 
-superscripts = ['⁰', '¹', '²', '³', '⁴', '⁵', '⁶', '⁷', '⁸', '⁹']
+superscripts = ['‚Å∞', '¬π', '¬≤', '¬≥', '‚Å¥', '‚Åµ', '‚Å∂', '‚Å∑', '‚Å∏', '‚Åπ']
 
 def superscript(val):
     # TODO: use a regexp:
@@ -82,7 +82,7 @@ def format_units(udict):
 def format_units_unicode(udict):
     res = format_units(udict)
     res = superscript(res)
-    res = res.replace('**', '^').replace('*','·')
+    res = res.replace('**', '^').replace('*','¬∑')
 
     return res
     
@@ -94,23 +94,26 @@ def format_units_latex(ustr,font='mathrm',mult=''):
     
     Exponentiation (m**2) will be replaced with superscripts (m^{2})
     
+    The latex is set  with the font argument, and the default is the normal, 
+    non-italicized font mathrm.  Other useful options include 'mathnormal', 
+    'mathit', 'mathsf', and 'mathtt'.
+    
     Multiplication (*) are replaced with the symbol specified by the mult argument.
     By default this is a blank string (no multiplication symbol).  Other useful
     options may be r'\cdot' or r'\*'
     
-    The latex is set  with the font argument, and the default is the normal, 
-    non-italicized font mathrm.  Other useful options include 'mathnormal', 
-    'mathit', 'mathsf', and 'mathtt'.
+    Restrictions:
+    With ambiguous units (having more than one division symbol), this routine
+    will likely produce undesirable results.  It is recommended that you first
+    simplify the dimensionality before running it through this function.      
     '''
     res = format_units(ustr)
-    # Replace the first last parentheses with larger ones
-    res = re.sub(r'^\(',r'\\left(',res)
-    res = re.sub(r'\)$',r'\\right)',res)
     # Replace division (num/den) with \frac{num}{den}
-    res = re.sub(r'(?P<num>\w+)/(?P<den>\w+)','\\\\frac{\g<num>}{\g<den>}',res)
+    res = re.sub(r'(?P<num>.+)/(?P<den>.+)','\\\\frac{\g<num>}{\g<den>}',res)
     # Replace exponentiation (**exp) with ^{exp}
-    res = re.sub(r'\*\*(?P<exp>\d+)',r'^{\g<exp>}',res)
+    res = re.sub(r'\*{2,2}(?P<exp>\d+)',r'^{\g<exp>}',res)
     # Remove multiplication signs
-    res = re.sub(r'\*',mult,res)
-    return r'$\%s{%s}$' % (font,res)
+    res = re.sub(r'\*','{'+mult+'}',res)
+    res = r'$\%s{%s}$' % (font,res)
+    return res
     
diff --git a/quantities/tests/test_dimensionality.py b/quantities/tests/test_dimensionality.py
@@ -12,7 +12,8 @@
 centimeter_str = 'cm'
 joule = Dimensionality({pq.kg: 1, pq.m: 2, pq.s: -2})
 joule_str = 'kg*m**2/s**2'
-joule_uni = 'kg·m²/s²'
+joule_uni = 'kg¬∑m¬≤/s¬≤'
+joule_tex = r'$\mathrm{\frac{kg{\cdot}m^{2}}{s^{2}}}$'
 Joule = Dimensionality({pq.J: 1})
 Joule_str = 'J'
 
@@ -23,6 +24,7 @@ def test_dimensionality_str(self):
         self.assertEqual(str(meter), meter_str)
         self.assertEqual(joule.string, joule_str)
         self.assertEqual(joule.unicode, joule_uni)
+        self.assertEqual(joule.latex, joule_tex)
         self.assertEqual(Joule.string, 'J')
 
     def test_equality(self):
@@ -136,6 +138,7 @@ def test_inplace_power(self):
     def test_simplification(self):
         self.assertEqual(Joule.simplified.string, 'kg*m**2/s**2')
         self.assertEqual(Joule.simplified, joule)
+        
 
     def test_gt(self):
         self.assertTrue(joule > meter)
