Skip to content

Commit

Permalink
Merge branch 'TextRegion' of https://github.com/gmischler/fpdf2 into …
Browse files Browse the repository at this point in the history
…TextRegion
  • Loading branch information
gmischler committed Oct 31, 2023
2 parents 6bbd072 + ca4ec1d commit 5e053b4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/TextRegion.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ All types of text regions have the following constructor parameters in common:
* skip_leading_spaces (default: False) - This flag is primarily used by `write_html()`, but may also have other uses. It removes all space characters at the beginning of each line.
* wrapmode (default "WORD") -
* image (str or PIL.Image.Image or io.BytesIO, optional) - An image to add to the region. This is a convenience parameter for cases when no further text or images need to be added to the paragraph. If both "text" and "image" arguments are present, the text will be inserted first. (Default: None)
* image_fill_width (bool, optional) - Indicates whether increase the size of the image to fill the width of the column. Larger images will always be reduced to column width. (Default: False)
* image_fill_width (bool, optional) - Indicates whether to increase the size of the image to fill the width of the column. Larger images will always be reduced to column width. (Default: False)

All of those values can be overriden for each individual paragraph.

Expand Down
6 changes: 3 additions & 3 deletions fpdf/fpdf.py
Original file line number Diff line number Diff line change
Expand Up @@ -3741,7 +3741,7 @@ def write(
def text_columns(
self,
text: Optional[str] = None,
img: str = None,
img: Optional[str] = None,
img_fill_width: bool = False,
ncols: int = 1,
gutter: float = 10,
Expand Down Expand Up @@ -3956,7 +3956,7 @@ def _raster_image(
self,
name,
img,
info,
info: RasterImageInfo,
x=None,
y=None,
w=0,
Expand Down Expand Up @@ -4027,7 +4027,7 @@ def _raster_image(
def _vector_image(
self,
svg: SVGObject,
info,
info: VectorImageInfo,
x=None,
y=None,
w=0,
Expand Down

0 comments on commit 5e053b4

Please sign in to comment.