Merge 6de54a9 into 04c222c

python-pillow · May 31, 2019 · 5d95267 · 5d95267
2 parents 04c222c + 6de54a9
commit 5d95267
Show file tree

Hide file tree

Showing 5 changed files with 156 additions and 84 deletions.
diff --git a/Tests/fonts/LICENSE.txt b/Tests/fonts/LICENSE.txt
@@ -1,7 +1,6 @@
 
-NotoNastaliqUrdu-Regular.ttf:
-
-(from https://github.com/googlei18n/noto-fonts)
+NotoNastaliqUrdu-Regular.ttf, from https://github.com/googlei18n/noto-fonts
+NotoSansJP-Thin.otf, from https://www.google.com/get/noto/help/cjk/
 
 All Noto fonts are published under the SIL Open Font License (OFL) v1.1 (http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL), which allows you to copy, modify, and redistribute them if you need to.
 

diff --git a/Tests/fonts/NotoSansJP-Regular.otf b/Tests/fonts/NotoSansJP-Regular.otf
diff --git a/Tests/images/test_direction_ttb.png b/Tests/images/test_direction_ttb.png
diff --git a/Tests/test_imagefontctl.py b/Tests/test_imagefontctl.py
@@ -104,6 +104,22 @@ def test_text_direction_rtl2(self):
 
         self.assert_image_similar(im, target_img, .5)
 
+    def test_text_direction_ttb(self):
+        ttf = ImageFont.truetype("Tests/fonts/NotoSansJP-Regular.otf", 30)
+
+        im = Image.new(mode='RGB', size=(100, 300))
+        draw = ImageDraw.Draw(im)
+        try:
+            draw.text((0, 0), 'English あい', font=ttf, fill=500, direction='ttb')
+        except ValueError as ex:
+            if str(ex) == "libraqm 0.7 or greater required for 'ttb' direction":
+                self.skipTest('libraqm 0.7 or greater not available')
+
+        target = 'Tests/images/test_direction_ttb.png'
+        target_img = Image.open(target)
+
+        self.assert_image_similar(im, target_img, .65)
+
     def test_ligature_features(self):
         ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)