#423 #422 Allow a font-face rule src property to contain several sources

with format tags. We select the truetype font. This allows some Google font stylesheets to be used (where a truetype font is provided), however, consider the network load issue if running a template multiple times. With tests for: + Simple uri which was previously all we supported. + Multiple uris/local with format tags. + Import of google CSS font sheet (manual test to avoid network load on each test run).
danfickle · Dec 9, 2019 · c520a52 · c520a52
1 parent 6af81c0
commit c520a52
Show file tree

Hide file tree

Showing 8 changed files with 104 additions and 6 deletions.
diff --git a/...f-core/src/main/java/com/openhtmltopdf/css/parser/property/PrimitivePropertyBuilders.java b/...f-core/src/main/java/com/openhtmltopdf/css/parser/property/PrimitivePropertyBuilders.java
@@ -1488,14 +1488,27 @@ public static class Right extends LengthLikeWithAuto {
     public static class Src extends GenericURIWithNone {
         @Override
         public List<PropertyDeclaration> buildDeclarations(CSSName cssName, List<PropertyValue> values, int origin, boolean important, boolean inheritAllowed) {
+            if (values.size() == 1) {
+                return super.buildDeclarations(cssName, values, origin, important, inheritAllowed);    
+            }
 
+            for (int i = 0; i < values.size(); i++) {
+                PropertyValue value = values.get(i);
+                PropertyValue next = (i + 1 < values.size()) ? values.get(i + 1) : null;
+
+                if (value.getPrimitiveType() != CSSPrimitiveValue.CSS_URI ||
+                    next == null ||
+                    next.getPropertyValueType() != PropertyValue.VALUE_TYPE_FUNCTION ||
+                    !"format".equals(next.getFunction().getName()) ||
+                    next.getFunction().getParameters().size() < 1 ||
+                    !"truetype".equals(next.getFunction().getParameters().get(0).getStringValue())) {
+                    continue;
+                } else {
+                    return super.buildDeclarations(cssName, Collections.singletonList(value), origin, important, inheritAllowed); 
+                }
+            }
 
-
-
-
-
-
-            return super.buildDeclarations(cssName, values, origin, important, inheritAllowed);
+            throw new CSSParseException("Could not find font src with format(truetype) in list (" + values.toString() + ") of fonts", -1);
         }
     }
 

diff --git a/...htmltopdf-examples/src/main/resources/visualtest/expected/css-font-face-rule-advanced.pdf b/...htmltopdf-examples/src/main/resources/visualtest/expected/css-font-face-rule-advanced.pdf
diff --git a/openhtmltopdf-examples/src/main/resources/visualtest/expected/css-font-face-rule-google.pdf b/openhtmltopdf-examples/src/main/resources/visualtest/expected/css-font-face-rule-google.pdf
diff --git a/openhtmltopdf-examples/src/main/resources/visualtest/expected/css-font-face-rule-simple.pdf b/openhtmltopdf-examples/src/main/resources/visualtest/expected/css-font-face-rule-simple.pdf
diff --git a/openhtmltopdf-examples/src/main/resources/visualtest/html/css-font-face-rule-advanced.html b/openhtmltopdf-examples/src/main/resources/visualtest/html/css-font-face-rule-advanced.html
@@ -0,0 +1,21 @@
+<html>
+<head>
+<style>
+@page {
+  size: 200px 200px;
+}
+@font-face {
+  font-family: 'Karla';
+  src: url(http://example.com/should-not-load.woff) format(woff),
+       url(fonts/Karla-Bold.ttf) format(truetype),
+       url(http://example.com/should-not-load.eot) format(eot);
+}
+body {
+  font-family: 'Karla';
+}
+</style>
+</head>
+<body>
+This is a test. Text should be bold.
+</body>
+</html>
diff --git a/openhtmltopdf-examples/src/main/resources/visualtest/html/css-font-face-rule-google.html b/openhtmltopdf-examples/src/main/resources/visualtest/html/css-font-face-rule-google.html
@@ -0,0 +1,18 @@
+<html>
+    <head>
+        <style>
+        @import url('https://fonts.googleapis.com/css?family=PT+Sans&amp;display=swap&amp;subset=cyrillic,cyrillic-ext,latin-ext');
+        @page {
+           size: 20cm 6cm;
+        }
+        body {
+            font-family: 'PT Sans', sans-serif;
+        }
+        </style>
+    </head>
+    <body>
+ABCČĆDĐEFGHIJKLMNOPQRSŠTUVWXYZŽabcčćdđefghijklmnopqrsštuvwxyzž
+АБВГҐДЂЕЁЄЖЗЅИІЇЙЈКЛЉМНЊОПРСТЋ
+УЎФХЦЧЏШЩЪЫЬЭЮЯабвгґдђеёєжзѕиіїйјклљмнњопрстћуўфхцчџшщъыьэюя
+    </body>
+</html> 
diff --git a/openhtmltopdf-examples/src/main/resources/visualtest/html/css-font-face-rule-simple.html b/openhtmltopdf-examples/src/main/resources/visualtest/html/css-font-face-rule-simple.html
@@ -0,0 +1,19 @@
+<html>
+<head>
+<style>
+@page {
+  size: 200px 200px;
+}
+@font-face {
+  font-family: 'Karla';
+  src: url(fonts/Karla-Bold.ttf);
+}
+body {
+  font-family: 'Karla';
+}
+</style>
+</head>
+<body>
+This is a test. Text should be bold.
+</body>
+</html>
diff --git a/...-examples/src/test/java/com/openhtmltopdf/visualregressiontests/VisualRegressionTest.java b/...-examples/src/test/java/com/openhtmltopdf/visualregressiontests/VisualRegressionTest.java
@@ -952,6 +952,33 @@ public void testIssue420JustifyTextWhiteSpacePre() throws IOException {
     public void testIssue309ClassCastExceptionOnFloatTd() throws IOException {
         assertTrue(vt.runTest("issue-309-classcastexception-on-float-td"));
     }
+
+    /**
+     * Tests that a font-face rule with multiple sources in different formats
+     * loads the truetype font only.
+     */
+    @Test
+    public void testCssFontFaceRuleAdvanced() throws IOException {
+        assertTrue(vt.runTest("css-font-face-rule-advanced"));
+    }
+
+    /**
+     * Tests that a simple font-face rule continues to work.
+     */
+    @Test
+    public void testCssFontFaceRuleSimple() throws IOException {
+        assertTrue(vt.runTest("css-font-face-rule-simple"));
+    }
+
+    /**
+     * Tests that a google font import will work (provided that truetype font is included).
+     */
+    @Test
+    @Ignore // Passing manual test - we do not want to rely on google always returning the same thing
+            // and network load of font slows down the tests.
+    public void testCssFontFaceRuleGoogle() throws IOException {
+        assertTrue(vt.runTest("css-font-face-rule-google"));
+    }
 
     // TODO:
     // + Elements that appear just on generated overflow pages.