ezdxf 1.1.2rc0__zip → 1.1.3b0__zip

{ezdxf-1.1.2rc0 → ezdxf-1.1.3b0}/NEWS.md

@@ -2,6 +2,14 @@
 News
 ====
 
+Version 1.1.3b0 - beta
+----------------------
+
+- Release notes: https://ezdxf.mozman.at/release-v1-1.html
+- CHANGE: [#956](https://github.com/mozman/ezdxf/issues/956)
+  added a safety factor of 1.01 to `MTEXT` size estimation, a "too precise" measurement
+  causes sometimes unwanted line wraps
+
 Version 1.1.2 - 2023-11-01
 --------------------------
 

{ezdxf-1.1.2rc0/src/ezdxf.egg-info → ezdxf-1.1.3b0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ezdxf
-Version: 1.1.2rc0
+Version: 1.1.3b0
 Summary: A Python package to create/manipulate DXF drawings.
 Home-page: https://ezdxf.mozman.at
 Download-URL: https://pypi.org/project/ezdxf/
@@ -252,6 +252,14 @@ Manfred
 News
 ====
 
+Version 1.1.3b0 - beta
+----------------------
+
+- Release notes: https://ezdxf.mozman.at/release-v1-1.html
+- CHANGE: [#956](https://github.com/mozman/ezdxf/issues/956)
+  added a safety factor of 1.01 to `MTEXT` size estimation, a "too precise" measurement
+  causes sometimes unwanted line wraps
+
 Version 1.1.2 - 2023-11-01
 --------------------------
 

{ezdxf-1.1.2rc0 → ezdxf-1.1.3b0}/src/ezdxf/fonts/font_manager.py

@@ -450,7 +450,7 @@ def normalize_style(style: str) -> str:
 def get_ttf_font_face(font_path: Path) -> FontFace:
     try:
         ttf = TTFont(font_path, fontNumber=0)
-    except IOError:
+    except (IOError, TTLibError):
         return FontFace(filename=font_path.name)
 
     names = ttf["name"].names

{ezdxf-1.1.2rc0 → ezdxf-1.1.3b0}/src/ezdxf/tools/text.py

@@ -54,8 +54,8 @@ class TextLine:
 
     Args:
         text: content string
-        font: ezdxf font definition like :class:`~ezdxf.tools.fonts.MonospaceFont`
-            or :class:`~ezdxf.tools.fonts.MatplotlibFont`
+        font: ezdxf font definition like :class:`~ezdxf.fonts.fonts.MonospaceFont`
+            or :class:`~ezdxf.fonts.fonts.TrueTypeFont`
 
     """
 
@@ -1731,8 +1731,6 @@ def estimate_mtext_extents(mtext: MText) -> tuple[float, float]:
     function, but the result is very inaccurate if inline codes are used or
     line wrapping at the column border is involved!
 
-    This function uses the optional `Matplotlib` package if available.
-
     Returns:
         Tuple[width, height]
 
@@ -1757,6 +1755,23 @@ def estimate_mtext_extents(mtext: MText) -> tuple[float, float]:
     )
 
 
+_SAFETY_FACTOR = 1.01
+
+
+def set_estimation_safety_factor(factor: float) -> None:
+    """Set the global safety factor for MTEXT size estimation."""
+    global _SAFETY_FACTOR
+    _SAFETY_FACTOR = factor
+
+
+def reset_estimation_safety_factor() -> None:
+    """Reset the global safety factor for MTEXT size estimation to the hard coded
+    default value.
+    """
+    global _SAFETY_FACTOR
+    _SAFETY_FACTOR = 1.01
+
+
 def estimate_mtext_content_extents(
     content: str,
     font: fonts.AbstractFont,
@@ -1768,8 +1783,6 @@ def estimate_mtext_content_extents(
     line wrapping at the column border is involved!
     Column breaks ``\\N`` will be ignored.
 
-    This function uses the optional `Matplotlib` package if available.
-
     Args:
         content: the :class:`~ezdxf.entities.MText` content string
         font: font abstraction based on :class:`ezdxf.tools.fonts.AbstractFont`
@@ -1792,7 +1805,7 @@ def estimate_mtext_content_extents(
         for line in lines:
             line_width = font.text_width(line)
             if line_width == 0 and line:
-                # line contains only white space:
+                # line contains only white space and text_width() returns 0
                 # - MatplotlibFont returns 0 as text width
                 # - MonospaceFont returns the correct width
                 line_width = len(line) * font.space_width()
@@ -1809,7 +1822,7 @@ def estimate_mtext_content_extents(
         spacing = leading(cap_height, line_spacing_factor) - cap_height
         height = cap_height * line_count + spacing * (line_count - 1)
 
-    return max_width, height
+    return max_width * _SAFETY_FACTOR, height
 
 
 def safe_string(s: Optional[str], max_len: int = MAX_STR_LEN) -> str:

{ezdxf-1.1.2rc0 → ezdxf-1.1.3b0}/src/ezdxf/version.py

@@ -24,5 +24,5 @@
 #   1. bug fix release beta0: VERSION = "0.9.1b0"; version = (0, 9, 1, 'b0')
 #   2. bug fix release: VERSION = "0.9.2"; version = (0, 9, 2, 'release')
 
-version = (1, 1, 2, "rc0")
-__version__ = "1.1.2rc0"
+version = (1, 1, 3, "b0")
+__version__ = "1.1.3b0"

{ezdxf-1.1.2rc0 → ezdxf-1.1.3b0/src/ezdxf.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ezdxf
-Version: 1.1.2rc0
+Version: 1.1.3b0
 Summary: A Python package to create/manipulate DXF drawings.
 Home-page: https://ezdxf.mozman.at
 Download-URL: https://pypi.org/project/ezdxf/
@@ -252,6 +252,14 @@ Manfred
 News
 ====
 
+Version 1.1.3b0 - beta
+----------------------
+
+- Release notes: https://ezdxf.mozman.at/release-v1-1.html
+- CHANGE: [#956](https://github.com/mozman/ezdxf/issues/956)
+  added a safety factor of 1.01 to `MTEXT` size estimation, a "too precise" measurement
+  causes sometimes unwanted line wraps
+
 Version 1.1.2 - 2023-11-01
 --------------------------
 

{ezdxf-1.1.2rc0 → ezdxf-1.1.3b0}/tests/test_05_tools/test_514_text.py

@@ -1,4 +1,4 @@
-#  Copyright (c) 2021, Manfred Moitzi
+#  Copyright (c) 2021-2023, Manfred Moitzi
 #  License: MIT License
 
 import pytest
@@ -20,6 +20,8 @@ from ezdxf.tools.text import (
     is_upside_down_text_angle,
     upright_text_angle,
     estimate_mtext_content_extents,
+    set_estimation_safety_factor,
+    reset_estimation_safety_factor,
 )
 from ezdxf.fonts.fonts import MonospaceFont
 from ezdxf.enums import TextEntityAlignment
@@ -49,7 +51,9 @@ class TestTextLine:
         assert text_line.height == 3.3325, "should not shrink height"
 
     def test_stretch_to_aligned(self, text_line):
-        text_line.stretch(TextEntityAlignment.ALIGNED, Vec3(0, 0), Vec3(15, 0))  # 50% stretch
+        text_line.stretch(
+            TextEntityAlignment.ALIGNED, Vec3(0, 0), Vec3(15, 0)
+        )  # 50% stretch
         assert text_line.width == 15.0, "should stretch width"
         # cap height * 1.333 * 1.5 = 4.99875
         assert text_line.height == 4.99875, "should stretch height"
@@ -117,9 +121,7 @@ class TestTextLineTransformation:
     def test_empty_input(self, text_line):
         assert text_line.transform_2d([]) == []
 
-    @pytest.mark.parametrize(
-        "location", [(0, 0), (1, 0), (0, 1), (-1, 0), (0, -1)]
-    )
+    @pytest.mark.parametrize("location", [(0, 0), (1, 0), (0, 1), (-1, 0), (0, -1)])
     def test_translation(self, text_line, location):
         v = [(0, 0), (1, 0), (-1, 0), (0, 1), (0, -1)]
         vertices = text_line.transform_2d(vertices=v, insert=location)
@@ -261,10 +263,7 @@ def test_replace_non_printable():
     assert replace_non_printable_characters("abc def") == "abc def"
     assert replace_non_printable_characters("abc \tdef") == "abc \tdef"
     assert replace_non_printable_characters("abc\0def") == "abc▯def"
-    assert (
-        replace_non_printable_characters("abc\0def", replacement=" ")
-        == "abc def"
-    )
+    assert replace_non_printable_characters("abc\0def", replacement=" ") == "abc def"
 
 
 def test_plain_mtext_removes_formatting():
@@ -279,9 +278,7 @@ def test_plain_mtext_removes_formatting():
     )
     # Includes caret decoding!
     assert fast_plain_mtext(raw_text) == expected
-    assert (
-        fast_plain_mtext("\\:") == "\\:"
-    ), "invalid escape code is printed verbatim"
+    assert fast_plain_mtext("\\:") == "\\:", "invalid escape code is printed verbatim"
 
 
 def test_plain_mtext2_removes_formatting():
@@ -295,9 +292,7 @@ def test_plain_mtext2_removes_formatting():
         "1. Nummerierung\n2. Nummerierung\n\n1/2500  ein Bruch"
     )
     assert plain_mtext(raw_text, tabsize=1) == expected
-    assert (
-        plain_mtext("\\:\\;") == "\\:\\;"
-    ), "invalid escape code is printed verbatim"
+    assert plain_mtext("\\:\\;") == "\\:\\;", "invalid escape code is printed verbatim"
 
 
 def test_remove_commands_without_terminating_semicolon():
@@ -357,15 +352,9 @@ def test_text_wrapping():
     assert text_wrap("   \n    ", 1, get_text_width) == []
 
     assert text_wrap("abc", 0, get_text_width) == ["abc"]
-    assert text_wrap(" abc", 6, get_text_width) == [
-        " abc"
-    ], "preserve leading spaces"
-    assert text_wrap("abc ", 1, get_text_width) == [
-        "abc"
-    ], "do not wrap too long words"
-    assert text_wrap(" abc ", 6, get_text_width) == [
-        " abc"
-    ], "remove trailing spaces"
+    assert text_wrap(" abc", 6, get_text_width) == [" abc"], "preserve leading spaces"
+    assert text_wrap("abc ", 1, get_text_width) == ["abc"], "do not wrap too long words"
+    assert text_wrap(" abc ", 6, get_text_width) == [" abc"], "remove trailing spaces"
 
     assert text_wrap("abc\ndef", 1, get_text_width) == [
         "abc",
@@ -413,9 +402,7 @@ class TestIsTextVerticalStacked:
         assert is_text_vertical_stacked(text) is False
 
     def test_stacked_text_entity(self, doc):
-        text = doc.modelspace().add_text(
-            "Test", dxfattribs={"style": "Stacked"}
-        )
+        text = doc.modelspace().add_text("Test", dxfattribs={"style": "Stacked"})
         assert is_text_vertical_stacked(text) is True
 
     def test_stacked_mtext_entity(self, doc):
@@ -423,9 +410,7 @@ class TestIsTextVerticalStacked:
         the vertical stacked text feature.
 
         """
-        mtext = doc.modelspace().add_mtext(
-            "Test", dxfattribs={"style": "Stacked"}
-        )
+        mtext = doc.modelspace().add_mtext("Test", dxfattribs={"style": "Stacked"})
         assert is_text_vertical_stacked(mtext) is True
 
     def test_raise_type_error_for_unsupported_types(self):
@@ -489,21 +474,34 @@ class TestEstimateMTextContentExtents:
         assert width == 0.0
 
     def test_single_line(self, font):
+        set_estimation_safety_factor(1.0)
         width, height = estimate_mtext_content_extents("XXX", font)
         assert height == 2.0
         assert width == 6.0
+        reset_estimation_safety_factor()
 
     def test_many_lines_no_line_wrapping(self, font):
+        set_estimation_safety_factor(1.0)
         width, height = estimate_mtext_content_extents("XXX\nYYYY\nZ", font)
         assert height == pytest.approx(8.668)  # 3x line height + 2x spacing
         assert width == 8.0
+        reset_estimation_safety_factor()
 
     def test_many_lines_with_line_wrapping(self, font):
+        set_estimation_safety_factor(1.0)
         width, height = estimate_mtext_content_extents(
             "XXXXXXXXXXXX\nYYYY\nZ", font, column_width=8.0
         )
         assert height == pytest.approx(15.336)  # 5x line height + 4x spacing
         assert width == 8.0
+        reset_estimation_safety_factor()
+
+    def test_estimation_safety_factor(self, font):
+        set_estimation_safety_factor(1.01)
+        width, height = estimate_mtext_content_extents("XXX", font)
+        assert height == 2.0
+        assert width == pytest.approx(6.0 * 1.01)
+        reset_estimation_safety_factor()
 
 
 if __name__ == "__main__":

{ezdxf-1.1.2rc0 → ezdxf-1.1.3b0}/tests/test_05_tools/test_523_text_size.py

@@ -1,18 +1,19 @@
-#  Copyright (c) 2021, Manfred Moitzi
+#  Copyright (c) 2021-2023, Manfred Moitzi
 #  License: MIT License
 
 import pytest
 
 import ezdxf
 from ezdxf.layouts import VirtualLayout
-from ezdxf.math import BoundingBox2d
 from ezdxf.tools.text_size import (
     text_size,
     mtext_size,
-    WordSizeDetector,
     estimate_mtext_extents,
 )
-
+from ezdxf.tools.text import (
+    set_estimation_safety_factor,
+    reset_estimation_safety_factor,
+)
 from ezdxf.tools.text_layout import leading
 
 
@@ -105,6 +106,7 @@ def test_mtext_size_of_an_empty_string(msp):
 
 
 def test_mtext_size_of_a_single_char(msp):
+    set_estimation_safety_factor(1.0)
     # Matplotlib support disabled and using MonospaceFont()
     mtext = msp.add_mtext("X", dxfattribs={"char_height": 2.0})
     size = mtext_size(mtext)
@@ -113,9 +115,11 @@ def test_mtext_size_of_a_single_char(msp):
     assert size.column_width == pytest.approx(1.8794373744139317)
     assert size.gutter_width == 0.0
     assert size.column_count == 1
+    reset_estimation_safety_factor()
 
 
 def test_mtext_size_of_a_string(msp):
+    set_estimation_safety_factor(1.0)
     # Matplotlib support disabled and using MonospaceFont()
     mtext = msp.add_mtext("XXX", dxfattribs={"char_height": 2.0})
     size = mtext_size(mtext)
@@ -124,9 +128,11 @@ def test_mtext_size_of_a_string(msp):
     assert size.column_width == size.total_width
     assert size.gutter_width == 0.0
     assert size.column_count == 1
+    reset_estimation_safety_factor()
 
 
 def test_estimate_mtext_extents(msp):
+    set_estimation_safety_factor(1.0)
     # Matplotlib support disabled and using MonospaceFont()
     mtext = msp.add_mtext(
         "XXXXXXXXXXXX\nYYYY\nZ",  # 5 lines!
@@ -138,12 +144,14 @@ def test_estimate_mtext_extents(msp):
     width, height = estimate_mtext_extents(mtext)
     assert height == pytest.approx(15.336)  # 5 lines!
     assert width == 8.0
+    reset_estimation_safety_factor()
 
 
 @pytest.mark.parametrize(
     "cap_height, expected", [(2.0, 6.703281982585398), (3.0, 10.054922973878098)]
 )
 def test_mtext_size_of_2_lines(cap_height, expected, msp):
+    set_estimation_safety_factor(1.0)
     # Matplotlib support disabled and using MonospaceFont()
     mtext = msp.add_mtext(
         "XXX\nYYYY",
@@ -157,6 +165,7 @@ def test_mtext_size_of_2_lines(cap_height, expected, msp):
     assert size.total_height == pytest.approx(expected_total_height)
     assert size.total_width == pytest.approx(expected), "expected width of 2nd line"
     assert size.column_width == size.total_width
+    reset_estimation_safety_factor()
 
 
 if __name__ == "__main__":