Skip to content

Commit

Permalink
Uncertain quantities fix (JelteF#207)
Browse files Browse the repository at this point in the history
* Fix uncertain quantities to work with siunitx

* Fix uncertain quantities to work with siunitx

* Fix uncertain quantities to work with siunitx
  • Loading branch information
yagehu authored and JelteF committed Feb 4, 2018
1 parent 4ad4a8a commit 7d88ebb
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
9 changes: 6 additions & 3 deletions pylatex/quantities.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,10 @@ def _dimensionality_to_siunitx(dim):
class Quantity(Command):
"""A class representing quantities."""

packages = [Package('siunitx'),
NoEscape('\\DeclareSIUnit\\rpm{rpm}')]
packages = [
Package('siunitx', options=[NoEscape('separate-uncertainty=true')]),
NoEscape('\\DeclareSIUnit\\rpm{rpm}')
]

def __init__(self, quantity, *, options=None, format_cb=None):
r"""
Expand Down Expand Up @@ -123,7 +125,8 @@ def _format(val):

if isinstance(quantity, pq.UncertainQuantity):
magnitude_str = '{} +- {}'.format(
_format(quantity.magnitude), _format(quantity.uncertainty))
_format(quantity.magnitude),
_format(quantity.uncertainty.magnitude))
elif isinstance(quantity, pq.Quantity):
magnitude_str = _format(quantity.magnitude)

Expand Down
1 change: 1 addition & 0 deletions tests/test_quantities.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,5 @@ def test_dimensionality_to_siunitx():

if __name__ == '__main__':
test_quantity()
test_quantity_uncertain()
test_dimensionality_to_siunitx()

0 comments on commit 7d88ebb

Please sign in to comment.