Adding ability to specify 'UserStyleSheetURI' for an SVGDrawer, this …

openhtmltopdf-core/src/main/java/com/openhtmltopdf/extend/SVGDrawer.java

@@ -20,6 +20,8 @@ SVGImage buildSVGImage(Element svgElement, Box box, CssContext cssContext, doubl
 
     default void withUserAgent(UserAgentCallback userAgentCallback) {}
 
+    default void withUserStyleSheetURI(String userStyleSheetURI) {}
+
     interface SVGImage {
         int getIntrinsicWidth();
 

openhtmltopdf-svg-support/src/main/java/com/openhtmltopdf/svgsupport/BatikSVGDrawer.java

@@ -22,6 +22,7 @@ public class BatikSVGDrawer implements SVGDrawer {
     private final boolean allowScripts;
     private final boolean allowExternalResources;
     private UserAgentCallback userAgentCallback;
+    private String userStyleSheetURI;
 
     public enum SvgScriptMode {
         SECURE,
@@ -83,6 +84,9 @@ public void withUserAgent(UserAgentCallback userAgentCallback) {
         this.userAgentCallback = userAgentCallback;
     }
 
+    @Override
+    public void withUserStyleSheetURI(String userStyleSheetURI) { this.userStyleSheetURI = userStyleSheetURI; }
+
     @Override
     public SVGImage buildSVGImage(Element svgElement, Box box, CssContext c,
     		double cssWidth, double cssHeight, double dotsPerPixel) {
@@ -91,7 +95,7 @@ public SVGImage buildSVGImage(Element svgElement, Box box, CssContext c,
     	double cssMaxHeight = CalculatedStyle.getCSSMaxHeight(c, box);
 
         BatikSVGImage img = new BatikSVGImage(svgElement, box, cssWidth, cssHeight,
-                cssMaxWidth, cssMaxHeight, dotsPerPixel);
+                cssMaxWidth, cssMaxHeight, dotsPerPixel, userStyleSheetURI);
         img.setFontResolver(fontResolver);
         img.setUserAgentCallback(userAgentCallback);
         img.setSecurityOptions(allowScripts, allowExternalResources, allowedProtocols);

openhtmltopdf-svg-support/src/main/java/com/openhtmltopdf/svgsupport/BatikSVGImage.java

@@ -33,7 +33,7 @@ public class BatikSVGImage implements SVGImage {
     private UserAgentCallback userAgentCallback;
 
     public BatikSVGImage(Element svgElement, Box box, double cssWidth, double cssHeight,
-            double cssMaxWidth, double cssMaxHeight, double dotsPerPixel) {
+            double cssMaxWidth, double cssMaxHeight, double dotsPerPixel, String userStyleSheetURI) {
         this.svgElement = svgElement;
         this.dotsPerPixel = dotsPerPixel;
 
@@ -58,6 +58,11 @@ public BatikSVGImage(Element svgElement, Box box, double cssWidth, double cssHei
                     SVGAbstractTranscoder.KEY_MAX_HEIGHT,
                     (float) (cssMaxHeight / dotsPerPixel));
         }
+        if(userStyleSheetURI != null) {
+            this.pdfTranscoder.addTranscodingHint(
+                    SVGAbstractTranscoder.KEY_USER_STYLESHEET_URI,
+                    userStyleSheetURI);
+        }
 
         Point dimensions = parseDimensions(svgElement);
         double w;

openhtmltopdf-svg-support/src/main/java/com/openhtmltopdf/svgsupport/OpenHtmlUserAgent.java

@@ -12,12 +12,14 @@
 public class OpenHtmlUserAgent extends UserAgentAdapter {
 
 	private final OpenHtmlFontResolver resolver;
+    private final String userStyleSheetURI;
     private final boolean allowScripts;
     private final boolean allowExternalResources;
     private final Set<String> allowedProtocols;
 
-    public OpenHtmlUserAgent(OpenHtmlFontResolver resolver, boolean allowScripts, boolean allowExternalResources, Set<String> allowedProtocols) {
+    public OpenHtmlUserAgent(OpenHtmlFontResolver resolver, String userStyleSheetURI, boolean allowScripts, boolean allowExternalResources, Set<String> allowedProtocols) {
 		this.resolver = resolver;
+        this.userStyleSheetURI = userStyleSheetURI;
         this.allowScripts = allowScripts;
         this.allowExternalResources = allowExternalResources;
         this.allowedProtocols = allowedProtocols;
@@ -43,4 +45,9 @@ public void checkLoadExternalResource(ParsedURL resourceURL, ParsedURL docURL) t
             throw new SecurityException("Tried to fetch external resource (" + resourceURL + ") from SVG. Refused!");
         }
     }
+
+    @Override
+    public String getUserStyleSheetURI() {
+        return userStyleSheetURI;
+    }
 }

openhtmltopdf-svg-support/src/main/java/com/openhtmltopdf/svgsupport/PDFTranscoder.java

@@ -226,10 +226,12 @@ protected BridgeContext createBridgeContext(String svgVersion) {
 
 	@Override
 	protected void transcode(Document svg, String uri, TranscoderOutput out) throws TranscoderException {
-
+
+		String userStyleSheetURI = (String)hints.get(SVGAbstractTranscoder.KEY_USER_STYLESHEET_URI);
+
 		// Note: We have to initialize user agent here and not in ::createUserAgent() as method
 		// is called before our constructor is called in the super constructor.
-		this.userAgent = new OpenHtmlUserAgent(this.fontResolver, this.allowScripts, this.allowExternalResources, this.allowedProtocols);
+		this.userAgent = new OpenHtmlUserAgent(this.fontResolver, userStyleSheetURI, this.allowScripts, this.allowExternalResources, this.allowedProtocols);
 		super.transcode(svg, uri, out);
 
         Rectangle contentBounds = box.getContentAreaEdge(box.getAbsX(), box.getAbsY(), ctx);