Update CSS processor interface to allow stylesheet URIs

ndw · Sep 6, 2015 · 72824e2 · 72824e2
1 parent ab04076
commit 72824e2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/main/java/com/xmlcalabash/config/CssProcessor.java b/src/main/java/com/xmlcalabash/config/CssProcessor.java
@@ -17,5 +17,6 @@
 public interface CssProcessor {
     public void initialize(XProcRuntime runtime, XStep step, Properties options);
     public void addStylesheet(XdmNode doc);
+    public void addStylesheet(String uri);
     public void format(XdmNode doc, OutputStream out, String contentType);
 }
diff --git a/src/main/java/com/xmlcalabash/extensions/CssFormatter.java b/src/main/java/com/xmlcalabash/extensions/CssFormatter.java
@@ -39,6 +39,7 @@
 
 public class CssFormatter extends DefaultStep {
     private static final QName _href = new QName("","href");
+    private static final QName _css = new QName("","css");
     private static final QName _content_type = new QName("","content-type");
     private ReadablePipe source = null;
     private ReadablePipe css = null;
@@ -90,7 +91,7 @@ public void run() throws SaxonApiException {
             throw new XProcException(step.getNode(), "Failed to instantiate CSS provider");
         }
 
-        while (css.moreDocuments()) {
+        while (css != null && css.moreDocuments()) {
             XdmNode style = css.read();
             provider.addStylesheet(style);
         }
@@ -102,6 +103,13 @@ public void run() throws SaxonApiException {
             contentType = "application/pdf";
         }
 
+        if (getOption(_css) != null) {
+            String s = getOption(_css).getString();
+            for (String css : s.split("\\s+")) {
+                provider.addStylesheet(css);
+            }
+       }
+
         String href = getOption(_href).getString();
         String base = getOption(_href).getBaseURI().toASCIIString();