Google fonts: search the static dir recursively

The Asap font has changed, so update the reference PDF.
brechtm · Dec 1, 2022 · 1b39feb · 1b39feb
1 parent 6d43708
commit 1b39feb
Show file tree

Hide file tree

Showing 4 changed files with 337 additions and 17 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -58,8 +58,12 @@ Fixed:
 * Crash on rendering a heading with an index entry annotation (#369)
 * Crash on encountering a fully-spanned table row (#369)
 * Crash on rendering a figure caption with the default style (#368)
-* Some fonts on Google Fonts have the 'otf' extension (instead of 'ttf'); also
-  collect these.
+* Google Fonts fixes
+
+  - Some fonts on Google Fonts have the 'otf' extension (instead of 'ttf');
+    also collect these.
+  - Look recursively for font files in the a Google Fonts directory (e.g. Asap
+    fonts are now stored in a deeper directory).
 
 
 Release 0.5.4 (2022-06-17)

diff --git a/src/rinoh/font/google.py b/src/rinoh/font/google.py
@@ -72,8 +72,8 @@ def installed_google_fonts_typefaces():
 def find_static_font_files(path):
     static = path / 'static'
     path = static if static.is_dir() else path
-    yield from path.glob('*.ttf')
-    yield from path.glob('*.otf')
+    yield from path.glob('**/*.ttf')
+    yield from path.glob('**/*.otf')
 
 
 def try_install_family(name, family_path):

diff --git a/tests_regression/rst/google_fonts.pdf b/tests_regression/rst/google_fonts.pdf