add way to access the stylesheet from the main context

org/w3c/css/css/DocumentParser.java

@@ -51,7 +51,7 @@ public DocumentParser(ApplContext ac, Reader reader, String urlString, MimeType
             mediatype = MimeType.TEXT_CSS;
         }
         if (mediatype.match(MimeType.TEXT_CSS) == MimeType.MATCH_SPECIFIC_SUBTYPE) {
-            StyleSheetParser csshandler = new StyleSheetParser();
+            StyleSheetParser csshandler = new StyleSheetParser(ac);
             csshandler.parseStyleSheet(ac, reader, htmlURL);
             style = csshandler.getStyleSheet();
         } else if (mediatype.match(MimeType.TEXT_HTML) == MimeType.MATCH_SPECIFIC_SUBTYPE) {
@@ -88,7 +88,7 @@ public DocumentParser(ApplContext ac, String urlString) throws Exception {
 
         if (!"http".equals(urlProtocol) && !"https".equals(urlProtocol)) {
             if (urlLower.endsWith(".css")) {
-                StyleSheetParser parser = new StyleSheetParser();
+                StyleSheetParser parser = new StyleSheetParser(ac);
                 parser.parseURL(ac, htmlURL, null, null, media, StyleSheetOrigin.AUTHOR);
                 style = parser.getStyleSheet();
             } else if (urlLower.endsWith(".html") || urlLower.endsWith(".htm") ||
@@ -157,7 +157,7 @@ public DocumentParser(ApplContext ac, String urlString) throws Exception {
                         style.setType("text/html");
                     }
                 } else if (contentType.match(MimeType.TEXT_CSS) == MimeType.MATCH_SPECIFIC_SUBTYPE) {
-                    StyleSheetParser parser = new StyleSheetParser();
+                    StyleSheetParser parser = new StyleSheetParser(ac);
                     parser.parseURL(ac, htmlURL, null, null, media, StyleSheetOrigin.AUTHOR);
                     style = parser.getStyleSheet();
                 } else if ((contentType.match(MimeType.TEXT_XML) == MimeType.MATCH_SPECIFIC_SUBTYPE)

org/w3c/css/css/HTMLParserStyleSheetHandler.java

@@ -68,7 +68,7 @@ public class HTMLParserStyleSheetHandler implements ContentHandler, LexicalHandl
     boolean isHTML5;
 
     //  StyleSheet styleSheet = new StyleSheet();
-    StyleSheetParser styleSheetParser = new StyleSheetParser();
+    StyleSheetParser styleSheetParser = null;
 
     boolean inStyle = false;
     String media = null;
@@ -88,6 +88,7 @@ public HTMLParserStyleSheetHandler(URL baseURI, ApplContext ac) {
         this.documentURI = baseURI;
         this.baseURI = baseURI;
         this.ac = ac;
+        this.styleSheetParser = new StyleSheetParser(ac);
     }
 
     public void setDocumentLocator(Locator locator) {

org/w3c/css/css/StyleSheetParser.java

@@ -61,6 +61,10 @@ public final class StyleSheetParser
     CssFouffa cssFouffa;
     StyleSheet style = new StyleSheet();
 
+    public StyleSheetParser(ApplContext ac) {
+        ac.setStyleSheet(getStyleSheet());
+    }
+
     public void reInit() {
         style = new StyleSheet();
     }

org/w3c/css/css/TagSoupStyleSheetHandler.java

@@ -64,8 +64,7 @@ public class TagSoupStyleSheetHandler implements ContentHandler, LexicalHandler,
     URL documentURI = null;
     URL baseURI = null;
 
-    //  StyleSheet styleSheet = new StyleSheet();
-    StyleSheetParser styleSheetParser = new StyleSheetParser();
+    StyleSheetParser styleSheetParser = null;
 
     boolean inStyle = false;
     String media = null;
@@ -85,6 +84,7 @@ public TagSoupStyleSheetHandler(URL baseURI, ApplContext ac) {
         this.documentURI = baseURI;
         this.baseURI = baseURI;
         this.ac = ac;
+        this.styleSheetParser = new StyleSheetParser(ac);
     }
 
     public void setDocumentLocator(Locator locator) {

org/w3c/css/css/XMLStyleSheetHandler.java

@@ -67,7 +67,7 @@ public class XMLStyleSheetHandler implements ContentHandler, LexicalHandler,
     URL baseURI = null;
 
     // StyleSheet styleSheet = new StyleSheet();
-    StyleSheetParser styleSheetParser = new StyleSheetParser();
+    StyleSheetParser styleSheetParser = null;
 
     boolean inStyle = false;
 
@@ -90,6 +90,7 @@ public XMLStyleSheetHandler(URL baseURI, ApplContext ac) {
         this.documentURI = baseURI;
         this.baseURI = baseURI;
         this.ac = ac;
+        this.styleSheetParser = new StyleSheetParser(ac);
     }
 
     public void setDocumentLocator(Locator locator) {

org/w3c/css/servlet/CssValidator.java

@@ -417,7 +417,7 @@ public void doGet(HttpServletRequest req, HttpServletResponse res)
 
                     if ("css".equals(type) || ("none".equals(type) && isCSS(text))) {
                         // if CSS:
-                        parser = new StyleSheetParser();
+                        parser = new StyleSheetParser(ac);
                         parser.parseStyleElement(ac, is, null, usermedium,
                                 new URL(fileName), 0);
 
@@ -716,7 +716,7 @@ public void doPost(HttpServletRequest req, HttpServletResponse res)
             ac.setFakeURL(fileName);
             if (isCSS) {
                 //if CSS:
-                parser = new StyleSheetParser();
+                parser = new StyleSheetParser(ac);
                 parser.parseStyleElement(ac, is, null, ac.getMedium(),
                         new URL(fileName), 0);
 

org/w3c/css/util/ApplContext.java

@@ -9,6 +9,7 @@
 package org.w3c.css.util;
 
 
+import org.w3c.css.css.StyleSheet;
 import org.w3c.css.parser.Frame;
 import org.w3c.www.http.HttpAcceptCharset;
 import org.w3c.www.http.HttpAcceptCharsetList;
@@ -75,6 +76,7 @@ private BomEncoding() {
     String lang;
     Messages msgs;
     Frame frame;
+    StyleSheet styleSheet = null;
     CssVersion version = CssVersion.getDefault();
     CssProfile profile = CssProfile.NONE;
     String input;
@@ -149,6 +151,14 @@ public Frame getFrame() {
         return frame;
     }
 
+    public void setStyleSheet(StyleSheet styleSheet) {
+        this.styleSheet = styleSheet;
+    }
+
+    public StyleSheet getStyleSheet() {
+        return styleSheet;
+    }
+
     public Class getCssSelectorsStyle() {
         return cssselectorstyle;
     }