Fix rendering issue of non-ASCII characaters with unicode fonts (#169)

py-pdf · Jun 12, 2021 · 3354afb · 3354afb
1 parent 2f2351b
commit 3354afb
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,9 +7,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/),
 and [PEP 440](https://www.python.org/dev/peps/pep-0440/).
 
-## [2.4.1] - not released yet
+## [2.4.1] - 2021-06-12
 ### Fixed
 - erroneous page breaks occured for full-width / full-height images
+- rendering issue of non-ASCII characaters with unicode fonts
 
 ## [2.4.0] - 2021-06-11
 ### Changed

diff --git a/fpdf/fpdf.py b/fpdf/fpdf.py
@@ -62,7 +62,7 @@
 HERE = Path(__file__).resolve().parent
 
 # Global variables
-FPDF_VERSION = "2.4.0"
+FPDF_VERSION = "2.4.1"
 FPDF_FONT_DIR = HERE / "font"
 
 PAGE_FORMATS = {
@@ -1634,7 +1634,7 @@ def cell(
                         txt_frag_escaped = escape_parens(
                             txt_frag.encode("UTF-16BE").decode("latin-1")
                         )
-                        for char in txt_frag_escaped:
+                        for char in txt_frag:
                             self.current_font["subset"].append(ord(char))
                     else:
                         txt_frag_escaped = escape_parens(txt_frag)

diff --git a/test/cells/cell_markdown_with_ttf_fonts.pdf b/test/cells/cell_markdown_with_ttf_fonts.pdf
diff --git a/test/end_to_end_legacy/charmap/charmap_first_999_chars-DejaVuSans.pdf b/test/end_to_end_legacy/charmap/charmap_first_999_chars-DejaVuSans.pdf
diff --git a/test/end_to_end_legacy/charmap/charmap_first_999_chars-DroidSansFallback.pdf b/test/end_to_end_legacy/charmap/charmap_first_999_chars-DroidSansFallback.pdf
diff --git a/test/end_to_end_legacy/charmap/charmap_first_999_chars-Roboto-Regular.pdf b/test/end_to_end_legacy/charmap/charmap_first_999_chars-Roboto-Regular.pdf
diff --git a/test/end_to_end_legacy/charmap/charmap_first_999_chars-cmss12.pdf b/test/end_to_end_legacy/charmap/charmap_first_999_chars-cmss12.pdf
diff --git a/test/fonts/render_en_dash.pdf b/test/fonts/render_en_dash.pdf
diff --git a/test/fonts/test_add_font.py b/test/fonts/test_add_font.py
@@ -109,3 +109,13 @@ def test_add_core_fonts():
     pdf.add_font("times", style="")
     pdf.add_font("courier")
     assert pdf.fonts == {}  # No fonts added, as all of them are core fonts
+
+
+def test_render_en_dash(tmp_path):  # issue-166
+    pdf = FPDF()
+    font_file_path = HERE / "../fonts/Roboto-Regular.ttf"
+    pdf.add_font("Roboto-Regular", fname=font_file_path, uni=True)
+    pdf.set_font("Roboto-Regular", size=120)
+    pdf.add_page()
+    pdf.cell(w=pdf.epw, txt="–")  # U+2013
+    assert_pdf_equal(pdf, HERE / "render_en_dash.pdf", tmp_path)
diff --git a/test/html/issue_156.pdf b/test/html/issue_156.pdf