diff options
author | Keewis <keewis@posteo.de> | 2021-08-17 18:19:46 +0200 |
---|---|---|
committer | Keewis <keewis@posteo.de> | 2021-08-17 18:19:46 +0200 |
commit | daae1085df859826e7e6b16795a8ec98cb6d2183 (patch) | |
tree | d35c059eec14085f030bedcf82a3de6fe555cf0d /pint | |
parent | ad660f4a6592b30ab066c53e7645c4fcbd504dc4 (diff) | |
download | pint-daae1085df859826e7e6b16795a8ec98cb6d2183.tar.gz |
move the siunitx code to the appropriate formatting function
Diffstat (limited to 'pint')
-rw-r--r-- | pint/formatting.py | 8 | ||||
-rw-r--r-- | pint/unit.py | 5 |
2 files changed, 2 insertions, 11 deletions
diff --git a/pint/formatting.py b/pint/formatting.py index 0493485..889dd4e 100644 --- a/pint/formatting.py +++ b/pint/formatting.py @@ -193,12 +193,8 @@ def format_latex(unit, **options): @register_unit_format("Lx") def format_latex_siunitx(unit, **options): - return formatter( - unit.items(), - siopts="", - pm_fmt=" +- ", - **options, - ) + formatted = siunitx_format_unit(unit) + return rf"\si[]{{{formatted}}}" @register_unit_format("H") diff --git a/pint/unit.py b/pint/unit.py index f91b6c1..c75e6db 100644 --- a/pint/unit.py +++ b/pint/unit.py @@ -20,7 +20,6 @@ from ._typing import UnitLike from .compat import NUMERIC_TYPES, babel_parse, is_upcast_type from .definitions import UnitDefinition from .errors import DimensionalityError -from .formatting import siunitx_format_unit from .util import PrettyIPython, SharedRegistryObject, UnitsContainer if TYPE_CHECKING: @@ -81,10 +80,6 @@ class Unit(PrettyIPython, SharedRegistryObject): def __format__(self, spec) -> str: spec = spec or self.default_format - # special cases - if "Lx" in spec: # the LaTeX siunitx code - return r"\si[]{%s}" % siunitx_format_unit(self) - if "~" in spec: if not self._units: return "" |