Fix build on better_java2d branch.

I should know by now not to resolve conflicts with the web interface.

openhtmltopdf-core/src/main/java/com/openhtmltopdf/outputdevice/helper/AddedFont.java

@@ -13,11 +13,23 @@ public class AddedFont {
     public final String family;
     public final boolean subset;
     public final FontStyle style;
+    public final Object pdfontSupplier; // Bit of a hack, not type-safe!
 
     public AddedFont(FSSupplier<InputStream> supplier, File fontFile, Integer weight, String family, boolean subset,
             FontStyle style) {
         this.supplier = supplier;
         this.fontFile = fontFile;
+        this.pdfontSupplier = null;
+        this.weight = weight;
+        this.family = family;
+        this.subset = subset;
+        this.style = style;
+    }
+
+    public AddedFont(Object pdfontSupplier, Integer weight, String family, boolean subset, FontStyle style) {
+        this.supplier = null;
+        this.fontFile = null;
+        this.pdfontSupplier = pdfontSupplier;
         this.weight = weight;
         this.family = family;
         this.subset = subset;

openhtmltopdf-examples/src/main/java/com/openhtmltopdf/visualtest/TestSupport.java

@@ -107,7 +107,7 @@ public void setText(String newText) {
      * So we can test line breaking/justification with conditions more like real world.
      */
     public static class CollapsedSpaceTextBreaker implements FSTextBreaker {
-        private final static Pattern SPACES = Pattern.compile("\\s");
+        private final static Pattern SPACES = Pattern.compile("[\\s\u00AD]");
         private Matcher matcher;
 
         @Override

openhtmltopdf-examples/src/test/java/com/openhtmltopdf/visualregressiontests/TextVisualRegressionTest.java

@@ -521,7 +521,7 @@ public void testJustifySpaceAtEnd() throws IOException {
      */
     @Test
     public void testSoftHyphens() throws IOException {
-        assertTrue(vtester.runTest("soft-hyphens", WITH_COLLAPSED_LINE_BREAKER));
+        assertTrue(vtester.runTest("soft-hyphens", TestSupport.WITH_COLLAPSED_LINE_BREAKER));
     }
 
     /**

openhtmltopdf-pdfbox/src/main/java/com/openhtmltopdf/pdfboxout/PdfRendererBuilder.java

@@ -82,7 +82,7 @@ public PdfBoxRenderer buildPdfRenderer() {
 			} 
 			// use PDFont supplier
 			else if (font.pdfontSupplier != null) {
-				resolver.addFont(font.pdfontSupplier, font.family, font.weight, fontStyle, font.subset);
+				resolver.addFont((PDFontSupplier) font.pdfontSupplier, font.family, font.weight, fontStyle, font.subset);
 			} 
 			// load via font File
 			else {
@@ -179,7 +179,7 @@ public PdfRendererBuilder usePDDocument(PDDocument doc) {
 	 */
 	public PdfRendererBuilder useFont(PDFontSupplier supplier, String fontFamily, Integer fontWeight,
 			FontStyle fontStyle, boolean subset) {
-		state._fonts.add(new AddedFont(null, supplier, null, fontWeight, fontFamily, subset, fontStyle));
+		state._fonts.add(new AddedFont(supplier, fontWeight, fontFamily, subset, fontStyle));
 		return this;
 	}