PyPDFForm 1.4.13__py3-none-any.whl → 1.4.15__py3-none-any.whl

PyPDFForm/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """Contains any object users might need."""
 
-__version__ = "1.4.13"
+__version__ = "1.4.15"
 
 from .wrapper import FormWrapper, PdfWrapper, PyPDFForm

PyPDFForm/constants.py

@@ -26,29 +26,30 @@ WIDGET_TYPES = Union[Text, Checkbox, Radio, Dropdown, Signature]
 
 DEPRECATION_NOTICE = "{} will be deprecated soon. Use {} instead."
 
-ANNOTATION_KEY = "/Annots"
-ANNOTATION_FIELD_KEY = "/T"
-ANNOTATION_RECTANGLE_KEY = "/Rect"
-SUBTYPE_KEY = "/Subtype"
-WIDGET_SUBTYPE_KEY = "/Widget"
-WIDGET_TYPE_KEY = "/FT"
-PARENT_KEY = "/Parent"
-FIELD_FLAG_KEY = "/Ff"
-TEXT_FIELD_IDENTIFIER = "/Tx"
-TEXT_VALUE_IDENTIFIER = "/V"
-TEXT_VALUE_SHOW_UP_IDENTIFIER = "/AP"
-SIGNATURE_FIELD_IDENTIFIER = "/Sig"
-TEXT_FIELD_APPEARANCE_IDENTIFIER = "/DA"
-SELECTABLE_IDENTIFIER = "/Btn"
-TEXT_FIELD_MAX_LENGTH_KEY = "/MaxLen"
-TEXT_FIELD_ALIGNMENT_IDENTIFIER = "/Q"
-CHOICE_FIELD_IDENTIFIER = "/Ch"
-CHOICES_IDENTIFIER = "/Opt"
-BUTTON_IDENTIFIER = "/MK"
-BUTTON_STYLE_IDENTIFIER = "/CA"
-SELECTED_IDENTIFIER = "/AS"
+Annots = "/Annots"
+T = "/T"
+Rect = "/Rect"
+Subtype = "/Subtype"
+Widget = "/Widget"
+FT = "/FT"
+Parent = "/Parent"
+Ff = "/Ff"
+Tx = "/Tx"
+V = "/V"
+AP = "/AP"
+Sig = "/Sig"
+DA = "/DA"
+Btn = "/Btn"
+MaxLen = "/MaxLen"
+Q = "/Q"
+Ch = "/Ch"
+Opt = "/Opt"
+MK = "/MK"
+CA = "/CA"
+AS = "/AS"
 
 # Field flag bits
+READ_ONLY = 1 << 0
 MULTILINE = 1 << 12
 COMB = 1 << 24
 
@@ -69,6 +70,6 @@ BUTTON_STYLES = {
     "l": "\u25CF",  # circle
 }
 
-CHECKBOX_SELECT = "/Yes"
+Yes = "/Yes"
 
 COORDINATE_GRID_FONT_SIZE_MARGIN_RATIO = DEFAULT_FONT_SIZE / 100

PyPDFForm/coordinate.py

@@ -7,8 +7,8 @@ from typing import List, Tuple, Union
 from pypdf import PdfReader
 from reportlab.pdfbase.pdfmetrics import stringWidth
 
-from .constants import (ANNOTATION_RECTANGLE_KEY,
-                        COORDINATE_GRID_FONT_SIZE_MARGIN_RATIO, DEFAULT_FONT)
+from .constants import (COORDINATE_GRID_FONT_SIZE_MARGIN_RATIO, DEFAULT_FONT,
+                        Rect)
 from .middleware.text import Text
 from .template import (get_char_rect_width, get_widget_alignment,
                        is_text_multiline)
@@ -23,14 +23,8 @@ def get_draw_checkbox_radio_coordinates(
     """Returns coordinates to draw at given a PDF form checkbox/radio widget."""
 
     string_height = widget_middleware.font_size * 96 / 72
-    width_mid_point = (
-        float(widget[ANNOTATION_RECTANGLE_KEY][0])
-        + float(widget[ANNOTATION_RECTANGLE_KEY][2])
-    ) / 2
-    height_mid_point = (
-        float(widget[ANNOTATION_RECTANGLE_KEY][1])
-        + float(widget[ANNOTATION_RECTANGLE_KEY][3])
-    ) / 2
+    width_mid_point = (float(widget[Rect][0]) + float(widget[Rect][2])) / 2
+    height_mid_point = (float(widget[Rect][1]) + float(widget[Rect][3])) / 2
 
     return (
         width_mid_point
@@ -51,16 +45,10 @@ def get_draw_sig_coordinates_resolutions(
     Returns coordinates and resolutions to draw signature at given a PDF form signature widget.
     """
 
-    x = float(widget[ANNOTATION_RECTANGLE_KEY][0])
-    y = float(widget[ANNOTATION_RECTANGLE_KEY][1])
-    width = abs(
-        float(widget[ANNOTATION_RECTANGLE_KEY][0])
-        - float(widget[ANNOTATION_RECTANGLE_KEY][2])
-    )
-    height = abs(
-        float(widget[ANNOTATION_RECTANGLE_KEY][1])
-        - float(widget[ANNOTATION_RECTANGLE_KEY][3])
-    )
+    x = float(widget[Rect][0])
+    y = float(widget[Rect][1])
+    width = abs(float(widget[Rect][0]) - float(widget[Rect][2]))
+    height = abs(float(widget[Rect][1]) - float(widget[Rect][3]))
 
     return x, y, width, height
 
@@ -72,8 +60,8 @@ def get_draw_text_coordinates(
 
     if widget_middleware.preview:
         return (
-            float(widget[ANNOTATION_RECTANGLE_KEY][0]),
-            float(widget[ANNOTATION_RECTANGLE_KEY][3]) + 5,
+            float(widget[Rect][0]),
+            float(widget[Rect][3]) + 5,
         )
 
     text_value = widget_middleware.value or ""
@@ -94,13 +82,10 @@ def get_draw_text_coordinates(
     )
 
     alignment = get_widget_alignment(widget) or 0
-    x = float(widget[ANNOTATION_RECTANGLE_KEY][0])
+    x = float(widget[Rect][0])
 
     if int(alignment) != 0:
-        width_mid_point = (
-            float(widget[ANNOTATION_RECTANGLE_KEY][0])
-            + float(widget[ANNOTATION_RECTANGLE_KEY][2])
-        ) / 2
+        width_mid_point = (float(widget[Rect][0]) + float(widget[Rect][2])) / 2
         string_width = stringWidth(
             text_value,
             widget_middleware.font,
@@ -116,7 +101,7 @@ def get_draw_text_coordinates(
         if int(alignment) == 1:
             x = width_mid_point - string_width / 2
         elif int(alignment) == 2:
-            x = float(widget[ANNOTATION_RECTANGLE_KEY][2]) - string_width
+            x = float(widget[Rect][2]) - string_width
             if length > 0 and widget_middleware.comb is True:
                 x -= (
                     get_char_rect_width(widget, widget_middleware)
@@ -128,13 +113,10 @@ def get_draw_text_coordinates(
                 ) / 2
 
     string_height = widget_middleware.font_size * 96 / 72
-    height_mid_point = (
-        float(widget[ANNOTATION_RECTANGLE_KEY][1])
-        + float(widget[ANNOTATION_RECTANGLE_KEY][3])
-    ) / 2
+    height_mid_point = (float(widget[Rect][1]) + float(widget[Rect][3])) / 2
     y = (height_mid_point - string_height / 2 + height_mid_point) / 2
     if is_text_multiline(widget):
-        y = float(widget[ANNOTATION_RECTANGLE_KEY][3]) - string_height / 1.5
+        y = float(widget[Rect][3]) - string_height / 1.5
 
     if int(alignment) == 1 and widget_middleware.comb is True and length != 0:
         x -= character_paddings[0] / 2

PyPDFForm/filler.py

@@ -5,11 +5,9 @@ from io import BytesIO
 from typing import Dict, cast
 
 from pypdf import PdfReader, PdfWriter
-from pypdf.generic import DictionaryObject, NameObject, TextStringObject
+from pypdf.generic import DictionaryObject
 
-from .constants import (ANNOTATION_KEY, CHECKBOX_SELECT, SELECTED_IDENTIFIER,
-                        TEXT_VALUE_IDENTIFIER, TEXT_VALUE_SHOW_UP_IDENTIFIER,
-                        WIDGET_TYPES)
+from .constants import WIDGET_TYPES, Annots
 from .coordinate import (get_draw_checkbox_radio_coordinates,
                          get_draw_sig_coordinates_resolutions,
                          get_draw_text_coordinates,
@@ -21,6 +19,10 @@ from .middleware.dropdown import Dropdown
 from .middleware.radio import Radio
 from .middleware.signature import Signature
 from .middleware.text import Text
+from .patterns import (simple_flatten_generic, simple_flatten_radio,
+                       simple_update_checkbox_value,
+                       simple_update_dropdown_value, simple_update_radio_value,
+                       simple_update_text_value)
 from .template import get_widget_key, get_widgets_by_page
 from .utils import checkbox_radio_to_draw, stream_to_io
 from .watermark import create_watermarks_and_draw, merge_watermarks_with_pdf
@@ -130,6 +132,7 @@ def fill(
 def simple_fill(
     template: bytes,
     widgets: Dict[str, WIDGET_TYPES],
+    flatten: bool = False,
 ) -> bytes:
     """Fills a PDF form in place."""
 
@@ -140,7 +143,7 @@ def simple_fill(
     radio_button_tracker = {}
 
     for page in out.pages:
-        for annot in page.get(ANNOTATION_KEY, []):  # noqa
+        for annot in page.get(Annots, []):  # noqa
             annot = cast(DictionaryObject, annot.get_object())
             key = get_widget_key(annot.get_object())
 
@@ -148,30 +151,24 @@ def simple_fill(
             if widget is None:
                 continue
 
-            if isinstance(widget, Checkbox) and widget.value is True:
-                annot[NameObject(SELECTED_IDENTIFIER)] = NameObject(CHECKBOX_SELECT)
+            if type(widget) is Checkbox and widget.value is True:
+                simple_update_checkbox_value(annot)
             elif isinstance(widget, Radio):
                 if key not in radio_button_tracker:
                     radio_button_tracker[key] = 0
                 radio_button_tracker[key] += 1
                 if widget.value == radio_button_tracker[key] - 1:
-                    annot[NameObject(SELECTED_IDENTIFIER)] = NameObject(
-                        f"/{widget.value}"
-                    )
+                    simple_update_radio_value(annot, widget)
             elif isinstance(widget, Dropdown) and widget.value is not None:
-                annot[NameObject(TEXT_VALUE_IDENTIFIER)] = TextStringObject(
-                    widget.choices[widget.value]
-                )
-                annot[NameObject(TEXT_VALUE_SHOW_UP_IDENTIFIER)] = TextStringObject(
-                    widget.choices[widget.value]
-                )
+                simple_update_dropdown_value(annot, widget)
             elif isinstance(widget, Text) and widget.value:
-                annot[NameObject(TEXT_VALUE_IDENTIFIER)] = TextStringObject(
-                    widget.value
-                )
-                annot[NameObject(TEXT_VALUE_SHOW_UP_IDENTIFIER)] = TextStringObject(
-                    widget.value
-                )
+                simple_update_text_value(annot, widget)
+
+            if flatten:
+                if isinstance(widget, Radio):
+                    simple_flatten_radio(annot)
+                else:
+                    simple_flatten_generic(annot)
 
     with BytesIO() as f:
         out.write(f)

PyPDFForm/font.py

@@ -10,8 +10,8 @@ from reportlab.pdfbase.acroform import AcroForm
 from reportlab.pdfbase.pdfmetrics import registerFont, standardFonts
 from reportlab.pdfbase.ttfonts import TTFError, TTFont
 
-from .constants import (ANNOTATION_RECTANGLE_KEY, DEFAULT_FONT,
-                        FONT_COLOR_IDENTIFIER, FONT_SIZE_IDENTIFIER)
+from .constants import (DEFAULT_FONT, FONT_COLOR_IDENTIFIER,
+                        FONT_SIZE_IDENTIFIER, Rect)
 from .patterns import TEXT_FIELD_APPEARANCE_PATTERNS
 from .utils import traverse_pattern
 
@@ -82,10 +82,7 @@ def text_field_font_size(widget: dict) -> Union[float, int]:
     given a text field widget.
     """
 
-    height = abs(
-        float(widget[ANNOTATION_RECTANGLE_KEY][1])
-        - float(widget[ANNOTATION_RECTANGLE_KEY][3])
-    )
+    height = abs(float(widget[Rect][1]) - float(widget[Rect][3]))
 
     return height * 2 / 3
 
@@ -96,12 +93,8 @@ def checkbox_radio_font_size(widget: dict) -> Union[float, int]:
     given a checkbox/radio button widget.
     """
 
-    area = abs(
-        float(widget[ANNOTATION_RECTANGLE_KEY][0])
-        - float(widget[ANNOTATION_RECTANGLE_KEY][2])
-    ) * abs(
-        float(widget[ANNOTATION_RECTANGLE_KEY][1])
-        - float(widget[ANNOTATION_RECTANGLE_KEY][3])
+    area = abs(float(widget[Rect][0]) - float(widget[Rect][2])) * abs(
+        float(widget[Rect][1]) - float(widget[Rect][3])
     )
 
     return sqrt(area) * 72 / 96

PyPDFForm/patterns.py

@@ -1,14 +1,11 @@
 # -*- coding: utf-8 -*-
 """Contains patterns used for identifying properties of widgets."""
 
-from .constants import (ANNOTATION_FIELD_KEY, BUTTON_IDENTIFIER,
-                        BUTTON_STYLE_IDENTIFIER, CHOICE_FIELD_IDENTIFIER,
-                        CHOICES_IDENTIFIER, FIELD_FLAG_KEY, PARENT_KEY,
-                        SELECTABLE_IDENTIFIER, SIGNATURE_FIELD_IDENTIFIER,
-                        SUBTYPE_KEY, TEXT_FIELD_ALIGNMENT_IDENTIFIER,
-                        TEXT_FIELD_APPEARANCE_IDENTIFIER,
-                        TEXT_FIELD_IDENTIFIER, WIDGET_SUBTYPE_KEY,
-                        WIDGET_TYPE_KEY)
+from pypdf.generic import (DictionaryObject, NameObject, NumberObject,
+                           TextStringObject)
+
+from .constants import (AP, AS, CA, DA, FT, MK, READ_ONLY, Btn, Ch, Ff, Opt,
+                        Parent, Q, Sig, Subtype, T, Tx, V, Widget, Yes)
 from .middleware.checkbox import Checkbox
 from .middleware.dropdown import Dropdown
 from .middleware.radio import Radio
@@ -17,67 +14,109 @@ from .middleware.text import Text
 
 WIDGET_TYPE_PATTERNS = [
     (
-        ({WIDGET_TYPE_KEY: SIGNATURE_FIELD_IDENTIFIER},),
+        ({FT: Sig},),
         Signature,
     ),
     (
-        ({WIDGET_TYPE_KEY: TEXT_FIELD_IDENTIFIER},),
+        ({FT: Tx},),
         Text,
     ),
     (
-        ({WIDGET_TYPE_KEY: SELECTABLE_IDENTIFIER},),
+        ({FT: Btn},),
         Checkbox,
     ),
     (
-        ({WIDGET_TYPE_KEY: CHOICE_FIELD_IDENTIFIER},),
+        ({FT: Ch},),
         Dropdown,
     ),
     (
-        ({PARENT_KEY: {WIDGET_TYPE_KEY: CHOICE_FIELD_IDENTIFIER}},),
+        ({Parent: {FT: Ch}},),
         Dropdown,
     ),
     (
-        ({PARENT_KEY: {WIDGET_TYPE_KEY: TEXT_FIELD_IDENTIFIER}},),
+        ({Parent: {FT: Tx}},),
         Text,
     ),
     (
         (
-            {PARENT_KEY: {WIDGET_TYPE_KEY: SELECTABLE_IDENTIFIER}},
-            {PARENT_KEY: {SUBTYPE_KEY: WIDGET_SUBTYPE_KEY}},
+            {Parent: {FT: Btn}},
+            {Parent: {Subtype: Widget}},
         ),
         Checkbox,
     ),
     (
-        ({PARENT_KEY: {WIDGET_TYPE_KEY: SELECTABLE_IDENTIFIER}},),
+        ({Parent: {FT: Btn}},),
         Radio,
     ),
 ]
 
 WIDGET_KEY_PATTERNS = [
-    {ANNOTATION_FIELD_KEY: True},
-    {PARENT_KEY: {ANNOTATION_FIELD_KEY: True}},
+    {T: True},
+    {Parent: {T: True}},
 ]
 
 DROPDOWN_CHOICE_PATTERNS = [
-    {CHOICES_IDENTIFIER: True},
-    {PARENT_KEY: {CHOICES_IDENTIFIER: True}},
+    {Opt: True},
+    {Parent: {Opt: True}},
 ]
 
 WIDGET_ALIGNMENT_PATTERNS = [
-    {TEXT_FIELD_ALIGNMENT_IDENTIFIER: True},
-    {PARENT_KEY: {TEXT_FIELD_ALIGNMENT_IDENTIFIER: True}},
+    {Q: True},
+    {Parent: {Q: True}},
 ]
 
 TEXT_FIELD_FLAG_PATTERNS = [
-    {FIELD_FLAG_KEY: True},
-    {PARENT_KEY: {FIELD_FLAG_KEY: True}},
+    {Ff: True},
+    {Parent: {Ff: True}},
 ]
 
 TEXT_FIELD_APPEARANCE_PATTERNS = [
-    {TEXT_FIELD_APPEARANCE_IDENTIFIER: True},
-    {PARENT_KEY: {TEXT_FIELD_APPEARANCE_IDENTIFIER: True}},
+    {DA: True},
+    {Parent: {DA: True}},
 ]
 
 BUTTON_STYLE_PATTERNS = [
-    {BUTTON_IDENTIFIER: {BUTTON_STYLE_IDENTIFIER: True}},
+    {MK: {CA: True}},
 ]
+
+
+def simple_update_checkbox_value(annot: DictionaryObject) -> None:
+    """Patterns to update values for checkbox annotations."""
+
+    annot[NameObject(AS)] = NameObject(Yes)
+
+
+def simple_update_radio_value(annot: DictionaryObject, widget: Radio) -> None:
+    """Patterns to update values for radio annotations."""
+
+    annot[NameObject(AS)] = NameObject(f"/{widget.value}")
+
+
+def simple_update_dropdown_value(annot: DictionaryObject, widget: Dropdown) -> None:
+    """Patterns to update values for dropdown annotations."""
+
+    annot[NameObject(V)] = TextStringObject(widget.choices[widget.value])
+    annot[NameObject(AP)] = TextStringObject(widget.choices[widget.value])
+
+
+def simple_update_text_value(annot: DictionaryObject, widget: Text) -> None:
+    """Patterns to update values for text annotations."""
+
+    annot[NameObject(V)] = TextStringObject(widget.value)
+    annot[NameObject(AP)] = TextStringObject(widget.value)
+
+
+def simple_flatten_radio(annot: DictionaryObject) -> None:
+    """Patterns to flatten checkbox annotations."""
+
+    annot[NameObject(Parent)][NameObject(Ff)] = NumberObject(  # noqa
+        int(annot[NameObject(Parent)].get(NameObject(Ff), 0)) | READ_ONLY  # noqa
+    )
+
+
+def simple_flatten_generic(annot: DictionaryObject) -> None:
+    """Patterns to flatten generic annotations."""
+
+    annot[NameObject(Ff)] = NumberObject(
+        int(annot.get(NameObject(Ff), 0)) | READ_ONLY  # noqa
+    )

PyPDFForm/template.py

@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
 """Contains helpers for generic template related processing."""
 
+from sys import maxsize
 from typing import Dict, List, Tuple, Union
 
 from pypdf import PdfReader
 from reportlab.pdfbase.pdfmetrics import stringWidth
 
-from .constants import (ANNOTATION_RECTANGLE_KEY, COMB, DEFAULT_FONT_SIZE,
-                        MULTILINE, NEW_LINE_SYMBOL, TEXT_FIELD_MAX_LENGTH_KEY,
-                        WIDGET_TYPES)
+from .constants import (COMB, DEFAULT_FONT_SIZE, MULTILINE, NEW_LINE_SYMBOL,
+                        WIDGET_TYPES, MaxLen, Rect)
 from .font import (auto_detect_font, get_text_field_font_color,
                    get_text_field_font_size, text_field_font_size)
 from .middleware.checkbox import Checkbox
@@ -81,7 +81,7 @@ def widget_rect_watermarks(pdf: bytes) -> List[bytes]:
     for page, widgets in get_widgets_by_page(pdf).items():
         to_draw = []
         for widget in widgets:
-            rect = widget[ANNOTATION_RECTANGLE_KEY]
+            rect = widget[Rect]
             x = rect[0]
             y = rect[1]
             width = abs(rect[0] - rect[2])
@@ -132,10 +132,10 @@ def update_text_field_attributes(
                 if widgets[key].font_color is None:
                     widgets[key].font_color = get_text_field_font_color(_widget)
                 if is_text_multiline(_widget) and widgets[key].text_wrap_length is None:
+                    widgets[key].text_lines = get_paragraph_lines(_widget, widgets[key])
                     widgets[key].text_wrap_length = get_paragraph_auto_wrap_length(
-                        _widget, widgets[key]
+                        widgets[key]
                     )
-                    widgets[key].text_lines = get_paragraph_lines(_widget, widgets[key])
 
 
 def get_widgets_by_page(pdf: bytes) -> Dict[int, List[dict]]:
@@ -205,11 +205,7 @@ def construct_widget(widget: dict, key: str) -> Union[WIDGET_TYPES, None]:
 def get_text_field_max_length(widget: dict) -> Union[int, None]:
     """Returns the max length of the text field if presented or None."""
 
-    return (
-        int(widget[TEXT_FIELD_MAX_LENGTH_KEY]) or None
-        if TEXT_FIELD_MAX_LENGTH_KEY in widget
-        else None
-    )
+    return int(widget[MaxLen]) or None if MaxLen in widget else None
 
 
 def check_field_flag_bit(widget: dict, bit: int) -> bool:
@@ -268,10 +264,7 @@ def get_button_style(widget: dict) -> Union[str, None]:
 def get_char_rect_width(widget: dict, widget_middleware: Text) -> float:
     """Returns rectangular width of each character for combed text fields."""
 
-    rect_width = abs(
-        float(widget[ANNOTATION_RECTANGLE_KEY][0])
-        - float(widget[ANNOTATION_RECTANGLE_KEY][2])
-    )
+    rect_width = abs(float(widget[Rect][0]) - float(widget[Rect][2]))
     return rect_width / widget_middleware.max_length
 
 
@@ -295,43 +288,17 @@ def get_character_x_paddings(widget: dict, widget_middleware: Text) -> List[floa
     return result
 
 
-def calculate_wrap_length(widget: dict, widget_middleware: Text, v: str) -> int:
-    """Increments the substring until reaching maximum horizontal width."""
-
-    width = abs(
-        float(widget[ANNOTATION_RECTANGLE_KEY][0])
-        - float(widget[ANNOTATION_RECTANGLE_KEY][2])
-    )
-    value = widget_middleware.value or ""
-    value = value.replace(NEW_LINE_SYMBOL, " ")
-
-    counter = 0
-    _width = 0
-    while _width <= width and counter < len(value):
-        counter += 1
-        _width = stringWidth(
-            v[:counter],
-            widget_middleware.font,
-            widget_middleware.font_size,
-        )
-    return counter - 1
-
-
 def get_paragraph_lines(widget: dict, widget_middleware: Text) -> List[str]:
     """Splits the paragraph field's text to a list of lines."""
 
     # pylint: disable=R0912
     lines = []
     result = []
-    text_wrap_length = widget_middleware.text_wrap_length
     value = widget_middleware.value or ""
     if widget_middleware.max_length is not None:
         value = value[: widget_middleware.max_length]
 
-    width = abs(
-        float(widget[ANNOTATION_RECTANGLE_KEY][0])
-        - float(widget[ANNOTATION_RECTANGLE_KEY][2])
-    )
+    width = abs(float(widget[Rect][0]) - float(widget[Rect][2]))
 
     split_by_new_line_symbol = value.split(NEW_LINE_SYMBOL)
     for line in split_by_new_line_symbol:
@@ -339,7 +306,12 @@ def get_paragraph_lines(widget: dict, widget_middleware: Text) -> List[str]:
         current_line = ""
         for each in characters:
             line_extended = f"{current_line} {each}" if current_line else each
-            if len(line_extended) <= text_wrap_length:
+            if (
+                stringWidth(
+                    line_extended, widget_middleware.font, widget_middleware.font_size
+                )
+                <= width
+            ):
                 current_line = line_extended
             else:
                 lines.append(current_line)
@@ -350,25 +322,29 @@ def get_paragraph_lines(widget: dict, widget_middleware: Text) -> List[str]:
             else current_line
         )
 
-    for line in lines:
-        while (
-            stringWidth(
-                line[:text_wrap_length],
-                widget_middleware.font,
-                widget_middleware.font_size,
-            )
-            > width
-        ):
-            text_wrap_length -= 1
-
     for each in lines:
-        while len(each) > text_wrap_length:
-            result.append(each[:text_wrap_length])
-            each = each[text_wrap_length:]
+        tracker = ""
+        for char in each:
+            check = tracker + char
+            if (
+                stringWidth(check, widget_middleware.font, widget_middleware.font_size)
+                > width
+            ):
+                result.append(tracker)
+                tracker = char
+            else:
+                tracker = check
+
+        each = tracker
         if each:
             if (
                 result
-                and len(each) + 1 + len(result[-1]) <= text_wrap_length
+                and stringWidth(
+                    f"{each} {result[-1]}",
+                    widget_middleware.font,
+                    widget_middleware.font_size,
+                )
+                <= width
                 and NEW_LINE_SYMBOL not in result[-1]
             ):
                 result[-1] = f"{result[-1]}{each} "
@@ -384,31 +360,11 @@ def get_paragraph_lines(widget: dict, widget_middleware: Text) -> List[str]:
     return result
 
 
-def get_paragraph_auto_wrap_length(widget: dict, widget_middleware: Text) -> int:
+def get_paragraph_auto_wrap_length(widget_middleware: Text) -> int:
     """Calculates the text wrap length of a paragraph field."""
 
-    value = widget_middleware.value or ""
-    value = value.replace(NEW_LINE_SYMBOL, " ")
-    width = abs(
-        float(widget[ANNOTATION_RECTANGLE_KEY][0])
-        - float(widget[ANNOTATION_RECTANGLE_KEY][2])
-    )
-    text_width = stringWidth(
-        value,
-        widget_middleware.font,
-        widget_middleware.font_size,
-    )
-
-    lines = text_width / width
-    if lines > 1:
-        current_min = 0
-        while len(value) and current_min < len(value):
-            result = calculate_wrap_length(widget, widget_middleware, value)
-            value = value[result:]
-            if current_min == 0:
-                current_min = result
-            elif result < current_min:
-                current_min = result
-        return current_min
-
-    return len(value) + 1
+    result = maxsize
+    for line in widget_middleware.text_lines:
+        result = min(result, len(line))
+
+    return result

PyPDFForm/wrapper.py

@@ -45,6 +45,7 @@ class FormWrapper:
     def fill(
         self,
         data: Dict[str, Union[str, bool, int]],
+        **kwargs,
     ) -> FormWrapper:
         """Fills a PDF form."""
 
@@ -54,7 +55,9 @@ class FormWrapper:
             if key in widgets:
                 widgets[key].value = value
 
-        self.stream = simple_fill(self.read(), widgets)
+        self.stream = simple_fill(
+            self.read(), widgets, flatten=kwargs.get("flatten", False)
+        )
 
         return self
 
@@ -179,6 +182,7 @@ class PdfWrapper(FormWrapper):
     def fill(
         self,
         data: Dict[str, Union[str, bool, int]],
+        **kwargs,
     ) -> PdfWrapper:
         """Fills a PDF form."""
 

{PyPDFForm-1.4.13.dist-info → PyPDFForm-1.4.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyPDFForm
-Version: 1.4.13
+Version: 1.4.15
 Summary: The Python library for PDF forms.
 Home-page: https://github.com/chinapandaman/PyPDFForm
 Author: Jinge Li

{PyPDFForm-1.4.13.dist-info → PyPDFForm-1.4.15.dist-info}/RECORD

@@ -1,15 +1,15 @@
-PyPDFForm/__init__.py,sha256=KAGYHIP-vZnPpNmy2UPIQSULuxgByHXmJhj303FFmCg,149
+PyPDFForm/__init__.py,sha256=KgGvTymkLYyv87kBq8HFehcC47PtgmzHc1zc73Z526w,149
 PyPDFForm/adapter.py,sha256=OgAIwcmukpBqHFBLymd3I7wA7wIdipRqgURZA2Y0Hgo,885
-PyPDFForm/constants.py,sha256=qxC6FN_K5kWD5XmwypeTyGLBG778geIGf2kHnHGcXAQ,1791
-PyPDFForm/coordinate.py,sha256=EZxqeM3mkPSvhrsdOa-R2wPylmIECvUwMIlpigWRSbI,7854
-PyPDFForm/filler.py,sha256=aVmzJZFW_XwX19KLbRWuDCBZ8ek2s8BapLydf44ZbxY,6707
-PyPDFForm/font.py,sha256=iXsih_EJ9qe_penqakbQWuP44yUdxhWlQzlpZlMl3uw,4347
+PyPDFForm/constants.py,sha256=H-MBRnFhqvCrkVnwTCzYdt6ebe7rbUBTjzZl3GFdHtM,1431
+PyPDFForm/coordinate.py,sha256=iOy_KEZO3DKsvwdclxZHLOJyrvbCVqJDK2UKmMpEM8E,7310
+PyPDFForm/filler.py,sha256=qobLLpYF79YZaHmZz_VbjLICebg-6xdQa4btNZO4Li4,6430
+PyPDFForm/font.py,sha256=y9vNvoaBfgkd5vz9EDp04ul8KDM2jY7J61-VWFng6GY,4155
 PyPDFForm/image.py,sha256=0GV8PFgY5oLJFHmhPD1fG-_5SBEO7jVLLtxCc_Uodfo,1143
-PyPDFForm/patterns.py,sha256=LQRwSk7jImTYZFfN_DC38mCWFrPrXDgkYtu-yQLI7PA,2340
-PyPDFForm/template.py,sha256=bvjrrIz6RZZl2h7MIjpI1g1FGD0mcabCjtseTvVUQTA,13176
+PyPDFForm/patterns.py,sha256=udF5Ka-ucEKgO13FvZ3VZv8mJbi-f-aAixAyJFR8cWI,2946
+PyPDFForm/template.py,sha256=fuoqiYD_4xQXrBgw8XC677EMxJzHaXb9NcVVYbf0r-0,11782
 PyPDFForm/utils.py,sha256=_gskLLNmwhfGF16gfMP00twVY6iYADYYAYWHMvKCDrg,4140
 PyPDFForm/watermark.py,sha256=clYdRqCuWEE25IL-BUHnSo4HgLkHPSOl7FUJLhbAfGg,4755
-PyPDFForm/wrapper.py,sha256=pXLY84cXuL4X81hvGdmcatp_GV07XXeLfGMdjOT2sx4,10232
+PyPDFForm/wrapper.py,sha256=oO-CYX_RzNm1O2bpifkpWUMzJ326TbR-EHTXmb6OCSc,10328
 PyPDFForm/middleware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 PyPDFForm/middleware/base.py,sha256=TmoO8XpjFa5NerAumrAGm_kUt2eFP3DyyF-Vx0uXloM,724
 PyPDFForm/middleware/checkbox.py,sha256=Z92awlKjceMd_ryb9Fhrtyd4fLkU84Ii6fSum60rHcA,1305
@@ -21,8 +21,8 @@ PyPDFForm/widgets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 PyPDFForm/widgets/base.py,sha256=Stq-oQt-cfwQ6nilQ4NqpO5udFSKDNb1mAwryrWggZA,2076
 PyPDFForm/widgets/checkbox.py,sha256=issx3onojq9plTHbNQwEnkbnhTo5vJKA5XSAoxRzQCg,264
 PyPDFForm/widgets/text.py,sha256=lUVlfQ-ndemSelsKNzY6nS4Kuf_H4mDPxotFMQFV-so,484
-PyPDFForm-1.4.13.dist-info/LICENSE,sha256=43awmYkI6opyTpg19me731iO1WfXZwViqb67oWtCsFY,1065
-PyPDFForm-1.4.13.dist-info/METADATA,sha256=1RfinIDEtIhuU7zhUfbvhAzp479KlQ0MH2GrLy7QxuA,5178
-PyPDFForm-1.4.13.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-PyPDFForm-1.4.13.dist-info/top_level.txt,sha256=GQQKuWqPUjT9YZqwK95NlAQzxjwoQrsxQ8ureM8lWOY,10
-PyPDFForm-1.4.13.dist-info/RECORD,,
+PyPDFForm-1.4.15.dist-info/LICENSE,sha256=43awmYkI6opyTpg19me731iO1WfXZwViqb67oWtCsFY,1065
+PyPDFForm-1.4.15.dist-info/METADATA,sha256=63tamlVBtPHyMvkegLhDXBGlZ2Wp9qMQ_HTLCRRC9_o,5178
+PyPDFForm-1.4.15.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+PyPDFForm-1.4.15.dist-info/top_level.txt,sha256=GQQKuWqPUjT9YZqwK95NlAQzxjwoQrsxQ8ureM8lWOY,10
+PyPDFForm-1.4.15.dist-info/RECORD,,