Fix floatfmt always using 'g' formatting with to_str

matrepr/__init__.py

@@ -137,6 +137,7 @@ def get(self, **kwargs):
             ret.set_precision(ret.precision)
         elif isinstance(ret.floatfmt, str):
             fmt_str = ret.floatfmt
+            ret.floatfmt_str = fmt_str
             ret.floatfmt = lambda f: format(f, fmt_str)
 
         # validate

matrepr/list_converter.py

@@ -50,13 +50,6 @@ def pprint(self, obj, is_index=False):
             else:
                 obj = self.fill_value
 
-        if isinstance(obj, int) and is_index:
-            return str(obj)
-
-        if isinstance(obj, (int, float)):
-            formatted = self.floatfmt(obj)
-            return obj if repr(obj) == formatted else formatted
-
         if type(obj).__module__ == "numpy":
             # numpy is installed
             import numpy as np
@@ -71,6 +64,13 @@ def pprint(self, obj, is_index=False):
                 # do not fall through to the regular numpy driver below because of missing multiline support in tabular.
                 return _single_line(str(obj))
 
+        if isinstance(obj, int) and is_index:
+            return str(obj)
+
+        if isinstance(obj, (int, float)):
+            formatted = self.floatfmt(obj)
+            return obj if repr(obj) == formatted else formatted
+
         if isinstance(obj, complex):
             sign = "-" if obj.imag < 0 else "+"
             r = str(self.pprint(obj.real)).replace("e+", "e")

matrepr/string_formatter.py

@@ -205,10 +205,14 @@ def _to_tabulate_args(mat: Any, is_tensor, options, tab_extra_args) -> Tuple[Dic
         row_labels_txt = _format_row_labels(_labels_to_str(row_labels), has_header=has_header, tf=matrix_format)
 
     # collect floatfmt argument
-    if isinstance(options.floatfmt, str):
+    disable_numparse = tab_extra_args.pop("disable_numparse", False)
+    if hasattr(options, "floatfmt_str"):
+        floatfmt = options.floatfmt_str
+    elif isinstance(options.floatfmt, str):
         floatfmt = options.floatfmt
     else:
-        floatfmt = f".{options.precision}g"
+        disable_numparse = True  # the numbers are already formatted; leave them as is
+        floatfmt = "g"
 
     # column alignment
     index_cols = set(mat.columns_as_index())
@@ -229,6 +233,7 @@ def _to_tabulate_args(mat: Any, is_tensor, options, tab_extra_args) -> Tuple[Dic
         "tablefmt": matrix_format,
         "floatfmt": floatfmt,
         "colalign": colalign,
+        "disable_numparse": disable_numparse,
         **tab_extra_args
     }