- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 23 Aug 2005 16:22:56 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/parser In directory hutz:/tmp/cvs-serv7360/parser Modified Files: AtRuleMedia.java CssFouffa.java CssPrinterStyle.java CssPropertyFactory.java CssSelectors.java CssStyle.java Frame.java allcss.properties Log Message: Patch by Jean-Guilhem Rouel Better handling of media and properties files Major reorganization of those properties files Index: CssSelectors.java =================================================================== RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/CssSelectors.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- CssSelectors.java 12 Jul 2005 14:47:55 -0000 1.11 +++ CssSelectors.java 23 Aug 2005 16:22:54 -0000 1.12 @@ -11,7 +11,7 @@ import java.util.Enumeration; import java.util.Hashtable; -import org.w3c.css.properties.CssProperty; +import org.w3c.css.properties.css1.CssProperty; import org.w3c.css.util.ApplContext; import org.w3c.css.util.InvalidParamException; import org.w3c.css.util.Utf8Properties; @@ -109,7 +109,7 @@ */ public CssSelectors(ApplContext ac) { style = ac.getCssSelectorsStyle(); - try { + try { properties = (CssStyle) style.newInstance(); } catch (Exception e) { e.printStackTrace(); Index: Frame.java =================================================================== RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/Frame.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Frame.java 8 Aug 2005 13:18:11 -0000 1.5 +++ Frame.java 23 Aug 2005 16:22:54 -0000 1.6 @@ -6,6 +6,12 @@ // Please first read the full copyright statement in file COPYRIGHT.html /* * $Log$ + * Revision 1.6 2005/08/23 16:22:54 ylafon + * Patch by Jean-Guilhem Rouel + * + * Better handling of media and properties files + * Major reorganization of those properties files + * * Revision 1.5 2005/08/08 13:18:11 ylafon * All those changed made by Jean-Guilhem Rouel: * @@ -121,6 +127,20 @@ } /** + * Adds a warning to this frame with a message. + * + * @param warningMessage the warning message + * (see org.w3c.css.util.Messages.properties). + * @param message An add-on message. + * @see org.w3c.css.util.Warning + */ + public void addWarning(String warningMessage, String message1, + String message2) { + warnings.addWarning(new Warning(getSourceFile(), getLine(), + warningMessage, 0, message1, message2, ac)); + } + + /** * Get all warnings. */ public Warnings getWarnings() { Index: AtRuleMedia.java =================================================================== RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/AtRuleMedia.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- AtRuleMedia.java 8 Aug 2005 13:18:11 -0000 1.7 +++ AtRuleMedia.java 23 Aug 2005 16:22:54 -0000 1.8 @@ -13,7 +13,7 @@ import java.util.Enumeration; import java.util.Vector; -import org.w3c.css.properties.CssProperty; +import org.w3c.css.properties.css1.CssProperty; import org.w3c.css.util.ApplContext; import org.w3c.css.util.InvalidParamException; Index: CssPropertyFactory.java =================================================================== RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/CssPropertyFactory.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- CssPropertyFactory.java 8 Aug 2005 13:18:11 -0000 1.11 +++ CssPropertyFactory.java 23 Aug 2005 16:22:54 -0000 1.12 @@ -7,21 +7,21 @@ package org.w3c.css.parser; -import java.io.IOException; -import java.io.InputStream; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.net.URL; import java.util.StringTokenizer; import java.util.Vector; -import org.w3c.css.properties.CssProperty; +import org.w3c.css.properties.PropertiesLoader; +import org.w3c.css.properties.css1.CssProperty; import org.w3c.css.util.ApplContext; import org.w3c.css.util.InvalidParamException; import org.w3c.css.util.Utf8Properties; import org.w3c.css.values.CssExpression; import org.w3c.css.values.CssIdent; + /** * @version $Revision$ * @author Philippe Le H�garet @@ -31,9 +31,10 @@ // all recognized properties are here. private Utf8Properties properties; - private Utf8Properties allprops; + //private Utf8Properties allprops; - private String usermedium; + // does not seem to be used +// private String usermedium; public CssPropertyFactory getClone() { try { @@ -47,7 +48,7 @@ /** * Create a new CssPropertyFactory */ - public CssPropertyFactory(URL url, URL allprop_url) { + /*public CssPropertyFactory(URL url, URL allprop_url) { properties = new Utf8Properties(); InputStream f = null; try { @@ -80,6 +81,14 @@ e.printStackTrace(); } // ignore } + }*/ + + public CssPropertyFactory(String profile) { + properties = PropertiesLoader.getProfile(profile); + // It's not good to have null properties :-/ + if(properties == null) { + throw new NullPointerException(); + } } public String getProperty(String name) { @@ -100,15 +109,20 @@ return list; } - public void setUserMedium(String usermedium) { - this.usermedium = usermedium; - } +// public void setUserMedium(String usermedium) { +// this.usermedium = usermedium; +// } +// bug: FIXME +// @media screen and (min-width: 400px) and (max-width: 700px), print { +// a { +// border: 0; +// } +// } public synchronized CssProperty createMediaFeature(ApplContext ac, AtRule atRule, String property, CssExpression expression) throws Exception { - - String result = "ok"; + //String result = "ok"; String media = atRule.toString(); int pos = -1; int pos2 = media.toUpperCase().indexOf("AND"); @@ -136,11 +150,11 @@ if (classname == null) { if (atRule instanceof AtRuleMedia && (!media.equals("all"))) { // I don't know this property - // throw new InvalidParamException("noexistence-media", - // property, - // media, ac); - ac.getFrame().addWarning("noexistence-media", property); - classname = allprops.getProperty(property); + throw new InvalidParamException("noexistence-media", + property, + media, ac); +// ac.getFrame().addWarning("noexistence-media", property); +// classname = allprops.getProperty(property); } else { // I don't know this property throw new InvalidParamException("noexistence", property, media, @@ -173,10 +187,8 @@ public synchronized CssProperty createProperty(ApplContext ac, AtRule atRule, String property, CssExpression expression) - throws Exception { - - String result = "ok"; - String classname; + throws Exception { + String classname = null; String media = atRule.toString(); int pos = -1; String upperMedia = media.toUpperCase(); @@ -199,77 +211,34 @@ Vector list = new Vector(getVector(media)); - if (atRule instanceof AtRuleMedia) { - if (media.equals("all")) { - classname = properties.getProperty(property); - } else { - for (int i = 0; i < list.size() - 1; i++) { + if(atRule instanceof AtRuleMedia) { + classname = properties.getProperty(property); + // a list of media has been specified + if(classname != null && !media.equals("all")) { + String propMedia = PropertiesLoader.mediaProperties.getProperty(property); + for(int i = 0; i < list.size(); i++) { String medium = (String) list.elementAt(i); - String name = properties.getProperty(medium + "." - + property); - if (name == null) { - result = medium; + if(propMedia.indexOf(medium) == -1 && + !propMedia.equals("all")) { + ac.getFrame().addWarning("noexistence-media", + property, medium + " (" + propMedia + ")"); } } - - if (result.equals("ok")) { - classname = properties.getProperty((String) list - .firstElement() - + "." + property); - } else { - classname = null; - } - } - } else { + } + } + else { classname = properties.getProperty("@" + atRule.keyword() + "." + property); } - CssProperty prop = null; - - // System.out.println(allprops.getProperty(property)); - - if (classname == null && usermedium != null) { - if (atRule instanceof AtRuleMedia) { - // I don't know this property - if (!media.equals("all")) - ac.getFrame().addWarning("notforusermedium", property); - classname = properties.getProperty(property); - } else { - // NEW - if (allprops.getProperty(property) == null) { - // I don't know this property - throw new InvalidParamException("noexistence", property, - media, ac); - } else { - ac.getFrame().addWarning("otherprofile", property); - classname = allprops.getProperty(property); - } - } - } else if (classname == null) { // && CssFouffa.usermedium == null) - if (atRule instanceof AtRuleMedia && (!media.equals("all"))) { - // I don't know this property - /* - * throw new InvalidParamException("noexistence-media", - * property, media, ac); - */ - ac.getFrame().addWarning("noexistence-media", property); - classname = allprops.getProperty(property); - - } else { - // I don't know this property - // NEW - if (allprops.getProperty(property) == null) { - // I don't know this property - throw new InvalidParamException("noexistence", property, - media, ac); - } else { - ac.getFrame().addWarning("otherprofile", property); - classname = allprops.getProperty(property); - } - } + // the property does not exist in this profile + // this is an error... or a warning if it exists in another + // profile... FIXME + if(classname == null) { + throw new InvalidParamException("noexistence", + property, ac); } - + CssIdent initial = new CssIdent("initial"); if (expression.getValue().equals(initial) @@ -280,7 +249,7 @@ Constructor constructor = Class.forName(classname) .getConstructor(parametersType); Object[] parameters = {}; - // invoke the constructor + // invoke the constructor return (CssProperty) constructor.newInstance(parameters); } catch (InvocationTargetException e) { // catch InvalidParamException @@ -288,22 +257,21 @@ Exception ex = (Exception) iv.getTargetException(); throw ex; } - } else { - + } else { try { // create an instance of your property class Class[] parametersType = { ac.getClass(), expression.getClass(), boolean.class }; Constructor constructor = Class.forName(classname) .getConstructor(parametersType); Object[] parameters = { ac, expression, new Boolean(true)}; - // invoke the constructor + // invoke the constructor return (CssProperty) constructor.newInstance(parameters); - } catch (InvocationTargetException e) { + } catch (InvocationTargetException e) { // catch InvalidParamException InvocationTargetException iv = e; Exception ex = (Exception) iv.getTargetException(); throw ex; } - } + } } } Index: CssStyle.java =================================================================== RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/CssStyle.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- CssStyle.java 8 Aug 2005 13:18:11 -0000 1.4 +++ CssStyle.java 23 Aug 2005 16:22:54 -0000 1.5 @@ -6,6 +6,12 @@ // Please first read the full copyright statement in file COPYRIGHT.html /* * $Log$ + * Revision 1.5 2005/08/23 16:22:54 ylafon + * Patch by Jean-Guilhem Rouel + * + * Better handling of media and properties files + * Major reorganization of those properties files + * * Revision 1.4 2005/08/08 13:18:11 ylafon * All those changed made by Jean-Guilhem Rouel: * @@ -28,7 +34,7 @@ import java.util.Enumeration; import org.w3c.css.css.StyleSheet; -import org.w3c.css.properties.CssProperty; +import org.w3c.css.properties.css1.CssProperty; import org.w3c.css.util.ApplContext; import org.w3c.css.util.Warning; import org.w3c.css.util.Warnings; Index: CssFouffa.java =================================================================== RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/CssFouffa.java,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- CssFouffa.java 23 Aug 2005 09:42:20 -0000 1.31 +++ CssFouffa.java 23 Aug 2005 16:22:54 -0000 1.32 @@ -24,11 +24,12 @@ import org.w3c.css.parser.analyzer.CssParserTokenManager; import org.w3c.css.parser.analyzer.ParseException; import org.w3c.css.parser.analyzer.TokenMgrError; -import org.w3c.css.properties.CssProperty; +import org.w3c.css.properties.PropertiesLoader; +import org.w3c.css.properties.css1.CssProperty; import org.w3c.css.util.ApplContext; import org.w3c.css.util.HTTPURL; import org.w3c.css.util.InvalidParamException; -import org.w3c.css.util.Utf8Properties; +//import org.w3c.css.util.Utf8Properties; import org.w3c.css.util.Util; import org.w3c.css.values.CssExpression; @@ -53,27 +54,27 @@ // all properties CssPropertyFactory properties = null; - static CssPropertyFactory __s_nullprop = null; - - static CssPropertyFactory __s_css1prop = null; - - static CssPropertyFactory __s_asc_tvprop = null; - - static CssPropertyFactory __s_css2prop = null; - - static CssPropertyFactory __s_css2mobileprop = null; - - static CssPropertyFactory __s_css2tvprop = null; - - static CssPropertyFactory __s_css3prop = null; - - static CssPropertyFactory __s_svgprop = null; - - static CssPropertyFactory __s_svgtinyprop = null; - - static CssPropertyFactory __s_svgbasicprop = null; - - static private Utf8Properties config = null; +// static CssPropertyFactory __s_nullprop = null; +// +// static CssPropertyFactory __s_css1prop = null; +// +// static CssPropertyFactory __s_asc_tvprop = null; +// +// static CssPropertyFactory __s_css2prop = null; +// +// static CssPropertyFactory __s_css2mobileprop = null; +// +// static CssPropertyFactory __s_css2tvprop = null; +// +// static CssPropertyFactory __s_css3prop = null; +// +// static CssPropertyFactory __s_svgprop = null; +// +// static CssPropertyFactory __s_svgtinyprop = null; +// +// static CssPropertyFactory __s_svgbasicprop = null; +// +// static private Utf8Properties config = null; // all listeners Vector listeners; @@ -124,7 +125,24 @@ + " medium " + ac.getMedium() + " at-rule " + getAtRule() + " profile " + ac.getProfile()); } - loadConfig(ac.getCssVersion(), ac.getProfile()); + //loadConfig(ac.getCssVersion(), ac.getProfile()); + // load the CssStyle + String classStyle = PropertiesLoader.config.getProperty("style2"); + Class style; + try { + style = Class.forName(classStyle); + ac.setCssSelectorsStyle(style); + } + catch (ClassNotFoundException e) { + System.err.println("org.w3c.css.parser.CssFouffa: couldn't" + + " load the style"); + e.printStackTrace(); + } + String profile = ac.getProfile(); + if(profile == null || profile.equals("")) { + profile = ac.getCssVersion(); + } + properties = new CssPropertyFactory(profile); listeners = new Vector(); } @@ -199,14 +217,14 @@ // and a new frame for errors and warnings super.ReInit(input, ac); // @@this is a default media ... - AtRuleMedia media; - if ("css1".equals(ac.getCssVersion())) { - media = new AtRuleMediaCSS1(); - } else if ("css2".equals(ac.getCssVersion())) { - media = new AtRuleMediaCSS2(); - } else { - media = new AtRuleMediaCSS2(); - } +// AtRuleMedia media; +// if ("css1".equals(ac.getCssVersion())) { +// media = new AtRuleMediaCSS1(); +// } else if ("css2".equals(ac.getCssVersion())) { +// media = new AtRuleMediaCSS2(); +// } else { +// media = new AtRuleMediaCSS2(); +// } /* * if (ac.getMedium() == null) { try { media.addMedia("all", ac); } * catch (InvalidParamException e) {} //ignore } else { try { @@ -221,7 +239,24 @@ + ac.getProfile()); } - loadConfig(ac.getCssVersion(), ac.getProfile()); +// load the CssStyle + String classStyle = PropertiesLoader.config.getProperty("style2"); + Class style; + try { + style = Class.forName(classStyle); + ac.setCssSelectorsStyle(style); + } + catch (ClassNotFoundException e) { + System.err.println("org.w3c.css.parser.CssFouffa: couldn't" + + " load the style"); + e.printStackTrace(); + } + String profile = ac.getProfile(); + if(profile == null || profile.equals("")) { + profile = ac.getCssVersion(); + } + properties = new CssPropertyFactory(profile); + //loadConfig(ac.getCssVersion(), ac.getProfile()); } /** @@ -336,9 +371,9 @@ public void parseStyle() { try { parserUnit(); - } catch(TokenMgrError e) { + } catch(TokenMgrError e) { throw e; - } catch (Throwable e) { + } catch (Throwable e) { if (Util.onDebug) { e.printStackTrace(); } @@ -353,7 +388,7 @@ listener = (CssValidatorListener) e.nextElement(); listener.notifyErrors(ac.getFrame().getErrors()); listener.notifyWarnings(ac.getFrame().getWarnings()); - } + } } /** @@ -365,7 +400,7 @@ * the file name in the import statement */ public void handleImport(URL url, String file, AtRuleMedia media) { - CssError cssError = null; + //CssError cssError = null; try { URL importedURL = HTTPURL.getURL(url, file); @@ -514,8 +549,7 @@ // set informations for errors and warnings prop.setInfo(ac.getFrame().getLine(), ac.getFrame().getSourceFile()); - // ok, return the new property - + // ok, return the new property return prop; } @@ -730,7 +764,7 @@ * style sheet 2 or 3. * <OL> */ - public void loadConfig(String version, String profile) { + /* public void loadConfig(String version, String profile) { try { URL allprops = CssFouffa.class.getResource("allcss.properties"); @@ -883,10 +917,10 @@ + " load the style"); e.printStackTrace(); } - } + }*/ /* config by default! */ - static { + /*static { try { config = new Utf8Properties(); URL url = CssFouffa.class.getResource("Config.properties"); @@ -912,21 +946,24 @@ + " load the config"); e.printStackTrace(); } - } + }*/ public CssFouffa(java.io.InputStream stream) { super(stream); - loadConfig("css2", null); + properties = new CssPropertyFactory("css2"); + //loadConfig("css2", null); } public CssFouffa(java.io.Reader stream) { super(stream); - loadConfig("css2", null); + properties = new CssPropertyFactory("css2"); + //loadConfig("css2", null); } public CssFouffa(CssParserTokenManager tm) { super(tm); - loadConfig("css2", null); + properties = new CssPropertyFactory("css2"); + //loadConfig("css2", null); } } Index: allcss.properties =================================================================== RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/allcss.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- allcss.properties 8 Aug 2005 13:18:11 -0000 1.3 +++ allcss.properties 23 Aug 2005 16:22:54 -0000 1.4 @@ -87,27 +87,27 @@ counter-increment: org.w3c.css.properties.CssCounterIncrement marker-offset: org.w3c.css.properties.CssMarkerOffset -volume: org.w3c.css.aural.ACssVolume -pause-before: org.w3c.css.aural.ACssPauseBefore -pause-after: org.w3c.css.aural.ACssPauseAfter -pause: org.w3c.css.aural.ACssPause -cue-before: org.w3c.css.aural.ACssCueBefore -cue-after: org.w3c.css.aural.ACssCueAfter -cue: org.w3c.css.aural.ACssCue -play-during: org.w3c.css.aural.ACssPlayDuring -voice-family: org.w3c.css.aural.ACssVoiceFamily -elevation: org.w3c.css.aural.ACssElevation -speech-rate: org.w3c.css.aural.ACssSpeechRate -pitch: org.w3c.css.aural.ACssPitch -pitch-range: org.w3c.css.aural.ACssPitchRange -stress: org.w3c.css.aural.ACssStress -richness: org.w3c.css.aural.ACssRichness -speak-punctuation: org.w3c.css.aural.ACssSpeakPunctuation -speak-date: org.w3c.css.aural.ACssSpeakDate -speak-numeral: org.w3c.css.aural.ACssSpeakNumeral -speak-time: org.w3c.css.aural.ACssSpeakTime -speak: org.w3c.css.aural.ACssSpeak -azimuth: org.w3c.css.aural.ACssAzimuth +volume: org.w3c.css.properties.aural.ACssVolume +pause-before: org.w3c.css.properties.aural.ACssPauseBefore +pause-after: org.w3c.css.properties.aural.ACssPauseAfter +pause: org.w3c.css.properties.aural.ACssPause +cue-before: org.w3c.css.properties.aural.ACssCueBefore +cue-after: org.w3c.css.properties.aural.ACssCueAfter +cue: org.w3c.css.properties.aural.ACssCue +play-during: org.w3c.css.properties.aural.ACssPlayDuring +voice-family: org.w3c.css.properties.aural.ACssVoiceFamily +elevation: org.w3c.css.properties.aural.ACssElevation +speech-rate: org.w3c.css.properties.aural.ACssSpeechRate +pitch: org.w3c.css.properties.aural.ACssPitch +pitch-range: org.w3c.css.properties.aural.ACssPitchRange +stress: org.w3c.css.properties.aural.ACssStress +richness: org.w3c.css.properties.aural.ACssRichness +speak-punctuation: org.w3c.css.properties.aural.ACssSpeakPunctuation +speak-date: org.w3c.css.properties.aural.ACssSpeakDate +speak-numeral: org.w3c.css.properties.aural.ACssSpeakNumeral +speak-time: org.w3c.css.properties.aural.ACssSpeakTime +speak: org.w3c.css.properties.aural.ACssSpeak +azimuth: org.w3c.css.properties.aural.ACssAzimuth # Table properties @@ -130,39 +130,39 @@ outline-style: org.w3c.css.user.OutlineStyle outline-color: org.w3c.css.user.OutlineColor -page-break-before: org.w3c.css.paged.PageBreakBefore -page-break-after: org.w3c.css.paged.PageBreakAfter -page-break-inside: org.w3c.css.paged.PageBreakInside -page: org.w3c.css.paged.Page -orphans: org.w3c.css.paged.Orphans -widows: org.w3c.css.paged.Widows +page-break-before: org.w3c.css.properties.paged.PageBreakBefore +page-break-after: org.w3c.css.properties.paged.PageBreakAfter +page-break-inside: org.w3c.css.properties.paged.PageBreakInside +page: org.w3c.css.properties.paged.Page +orphans: org.w3c.css.properties.paged.Orphans +widows: org.w3c.css.properties.paged.Widows # PROPERTIES PER MEDIUM # Aural Properties -aural.volume: org.w3c.css.aural.ACssVolume -aural.pause-before: org.w3c.css.aural.ACssPauseBefore -aural.pause-after: org.w3c.css.aural.ACssPauseAfter -aural.pause: org.w3c.css.aural.ACssPause -aural.cue-before: org.w3c.css.aural.ACssCueBefore -aural.cue-after: org.w3c.css.aural.ACssCueAfter -aural.cue: org.w3c.css.aural.ACssCue -aural.play-during: org.w3c.css.aural.ACssPlayDuring -aural.voice-family: org.w3c.css.aural.ACssVoiceFamily -aural.elevation: org.w3c.css.aural.ACssElevation -aural.speech-rate: org.w3c.css.aural.ACssSpeechRate -aural.pitch: org.w3c.css.aural.ACssPitch -aural.pitch-range: org.w3c.css.aural.ACssPitchRange -aural.stress: org.w3c.css.aural.ACssStress -aural.richness: org.w3c.css.aural.ACssRichness -aural.speak-punctuation: org.w3c.css.aural.ACssSpeakPunctuation -aural.speak-date: org.w3c.css.aural.ACssSpeakDate -aural.speak-numeral: org.w3c.css.aural.ACssSpeakNumeral -aural.speak-time: org.w3c.css.aural.ACssSpeakTime -aural.speak: org.w3c.css.aural.ACssSpeak -aural.azimuth: org.w3c.css.aural.ACssAzimuth +aural.volume: org.w3c.css.properties.aural.ACssVolume +aural.pause-before: org.w3c.css.properties.aural.ACssPauseBefore +aural.pause-after: org.w3c.css.properties.aural.ACssPauseAfter +aural.pause: org.w3c.css.properties.aural.ACssPause +aural.cue-before: org.w3c.css.properties.aural.ACssCueBefore +aural.cue-after: org.w3c.css.properties.aural.ACssCueAfter +aural.cue: org.w3c.css.properties.aural.ACssCue +aural.play-during: org.w3c.css.properties.aural.ACssPlayDuring +aural.voice-family: org.w3c.css.properties.aural.ACssVoiceFamily +aural.elevation: org.w3c.css.properties.aural.ACssElevation +aural.speech-rate: org.w3c.css.properties.aural.ACssSpeechRate +aural.pitch: org.w3c.css.properties.aural.ACssPitch +aural.pitch-range: org.w3c.css.properties.aural.ACssPitchRange +aural.stress: org.w3c.css.properties.aural.ACssStress +aural.richness: org.w3c.css.properties.aural.ACssRichness +aural.speak-punctuation: org.w3c.css.properties.aural.ACssSpeakPunctuation +aural.speak-date: org.w3c.css.properties.aural.ACssSpeakDate +aural.speak-numeral: org.w3c.css.properties.aural.ACssSpeakNumeral +aural.speak-time: org.w3c.css.properties.aural.ACssSpeakTime +aural.speak: org.w3c.css.properties.aural.ACssSpeak +aural.azimuth: org.w3c.css.properties.aural.ACssAzimuth content: org.w3c.css.properties.CssContentCSS2 counter-reset: org.w3c.css.properties.CssCounterReset counter-increment: org.w3c.css.properties.CssCounterIncrement @@ -210,14 +210,14 @@ @page.bottom: org.w3c.css.properties.CssBottom @page.float: org.w3c.css.properties.CssFloat @page.clear: org.w3c.css.properties.CssClear -@page.size: org.w3c.css.paged.Size -@page.marks: org.w3c.css.paged.Marks -@page.page-break-before: org.w3c.css.paged.PageBreakBefore -@page.page-break-after: org.w3c.css.paged.PageBreakAfter -@page.page-break-inside: org.w3c.css.paged.PageBreakInside -@page.page: org.w3c.css.paged.Page -@page.orphans: org.w3c.css.paged.Orphans -@page.widows: org.w3c.css.paged.Widows +@page.size: org.w3c.css.properties.paged.Size +@page.marks: org.w3c.css.properties.paged.Marks +@page.page-break-before: org.w3c.css.properties.paged.PageBreakBefore +@page.page-break-after: org.w3c.css.properties.paged.PageBreakAfter +@page.page-break-inside: org.w3c.css.properties.paged.PageBreakInside +@page.page: org.w3c.css.properties.paged.Page +@page.orphans: org.w3c.css.properties.paged.Orphans +@page.widows: org.w3c.css.properties.paged.Widows # Font properties @font-face.font-style: org.w3c.css.font.FontStyle @@ -394,49 +394,49 @@ # Aural Properties -volume: org.w3c.css.aural.ACssVolume -pause-before: org.w3c.css.aural.ACssPauseBefore -pause-after: org.w3c.css.aural.ACssPauseAfter -pause: org.w3c.css.aural.ACssPause -cue-before: org.w3c.css.aural.ACssCueBefore -cue-after: org.w3c.css.aural.ACssCueAfter -cue: org.w3c.css.aural.ACssCue -play-during: org.w3c.css.aural.ACssPlayDuring -voice-family: org.w3c.css.aural.ACssVoiceFamily -elevation: org.w3c.css.aural.ACssElevation -speech-rate: org.w3c.css.aural.ACssSpeechRate -pitch: org.w3c.css.aural.ACssPitch -pitch-range: org.w3c.css.aural.ACssPitchRange -stress: org.w3c.css.aural.ACssStress -richness: org.w3c.css.aural.ACssRichness -speak-punctuation: org.w3c.css.aural.ACssSpeakPunctuation -speak-date: org.w3c.css.aural.ACssSpeakDate -speak-numeral: org.w3c.css.aural.ACssSpeakNumeral -speak-time: org.w3c.css.aural.ACssSpeakTime -speak: org.w3c.css.aural.ACssSpeak -azimuth: org.w3c.css.aural.ACssAzimuth +volume: org.w3c.css.properties.aural.ACssVolume +pause-before: org.w3c.css.properties.aural.ACssPauseBefore +pause-after: org.w3c.css.properties.aural.ACssPauseAfter +pause: org.w3c.css.properties.aural.ACssPause +cue-before: org.w3c.css.properties.aural.ACssCueBefore +cue-after: org.w3c.css.properties.aural.ACssCueAfter +cue: org.w3c.css.properties.aural.ACssCue +play-during: org.w3c.css.properties.aural.ACssPlayDuring +voice-family: org.w3c.css.properties.aural.ACssVoiceFamily +elevation: org.w3c.css.properties.aural.ACssElevation +speech-rate: org.w3c.css.properties.aural.ACssSpeechRate +pitch: org.w3c.css.properties.aural.ACssPitch +pitch-range: org.w3c.css.properties.aural.ACssPitchRange +stress: org.w3c.css.properties.aural.ACssStress +richness: org.w3c.css.properties.aural.ACssRichness +speak-punctuation: org.w3c.css.properties.aural.ACssSpeakPunctuation +speak-date: org.w3c.css.properties.aural.ACssSpeakDate +speak-numeral: org.w3c.css.properties.aural.ACssSpeakNumeral +speak-time: org.w3c.css.properties.aural.ACssSpeakTime +speak: org.w3c.css.properties.aural.ACssSpeak +azimuth: org.w3c.css.properties.aural.ACssAzimuth -aural.volume: org.w3c.css.aural.ACssVolume -aural.pause-before: org.w3c.css.aural.ACssPauseBefore -aural.pause-after: org.w3c.css.aural.ACssPauseAfter -aural.pause: org.w3c.css.aural.ACssPause -aural.cue-before: org.w3c.css.aural.ACssCueBefore -aural.cue-after: org.w3c.css.aural.ACssCueAfter -aural.cue: org.w3c.css.aural.ACssCue -aural.play-during: org.w3c.css.aural.ACssPlayDuring -aural.voice-family: org.w3c.css.aural.ACssVoiceFamily -aural.elevation: org.w3c.css.aural.ACssElevation -aural.speech-rate: org.w3c.css.aural.ACssSpeechRate -aural.pitch: org.w3c.css.aural.ACssPitch -aural.pitch-range: org.w3c.css.aural.ACssPitchRange -aural.stress: org.w3c.css.aural.ACssStress -aural.richness: org.w3c.css.aural.ACssRichness -aural.speak-punctuation: org.w3c.css.aural.ACssSpeakPunctuation -aural.speak-date: org.w3c.css.aural.ACssSpeakDate -aural.speak-numeral: org.w3c.css.aural.ACssSpeakNumeral -aural.speak-time: org.w3c.css.aural.ACssSpeakTime -aural.speak: org.w3c.css.aural.ACssSpeak -aural.azimuth: org.w3c.css.aural.ACssAzimuth +aural.volume: org.w3c.css.properties.aural.ACssVolume +aural.pause-before: org.w3c.css.properties.aural.ACssPauseBefore +aural.pause-after: org.w3c.css.properties.aural.ACssPauseAfter +aural.pause: org.w3c.css.properties.aural.ACssPause +aural.cue-before: org.w3c.css.properties.aural.ACssCueBefore +aural.cue-after: org.w3c.css.properties.aural.ACssCueAfter +aural.cue: org.w3c.css.properties.aural.ACssCue +aural.play-during: org.w3c.css.properties.aural.ACssPlayDuring +aural.voice-family: org.w3c.css.properties.aural.ACssVoiceFamily +aural.elevation: org.w3c.css.properties.aural.ACssElevation +aural.speech-rate: org.w3c.css.properties.aural.ACssSpeechRate +aural.pitch: org.w3c.css.properties.aural.ACssPitch +aural.pitch-range: org.w3c.css.properties.aural.ACssPitchRange +aural.stress: org.w3c.css.properties.aural.ACssStress +aural.richness: org.w3c.css.properties.aural.ACssRichness +aural.speak-punctuation: org.w3c.css.properties.aural.ACssSpeakPunctuation +aural.speak-date: org.w3c.css.properties.aural.ACssSpeakDate +aural.speak-numeral: org.w3c.css.properties.aural.ACssSpeakNumeral +aural.speak-time: org.w3c.css.properties.aural.ACssSpeakTime +aural.speak: org.w3c.css.properties.aural.ACssSpeak +aural.azimuth: org.w3c.css.properties.aural.ACssAzimuth # Table properties @@ -500,21 +500,21 @@ @page.bottom: org.w3c.css.properties.CssBottom @page.float: org.w3c.css.properties3.CssFloatCSS3 @page.clear: org.w3c.css.properties3.CssClear -@page.size: org.w3c.css.paged.Size -@page.marks: org.w3c.css.paged.Marks -@page.page-break-before: org.w3c.css.paged.PageBreakBefore -@page.page-break-after: org.w3c.css.paged.PageBreakAfter -@page.page-break-inside: org.w3c.css.paged.PageBreakInside -@page.page: org.w3c.css.paged.Page -@page.orphans: org.w3c.css.paged.Orphans -@page.widows: org.w3c.css.paged.Widows +@page.size: org.w3c.css.properties.paged.Size +@page.marks: org.w3c.css.properties.paged.Marks +@page.page-break-before: org.w3c.css.properties.paged.PageBreakBefore +@page.page-break-after: org.w3c.css.properties.paged.PageBreakAfter +@page.page-break-inside: org.w3c.css.properties.paged.PageBreakInside +@page.page: org.w3c.css.properties.paged.Page +@page.orphans: org.w3c.css.properties.paged.Orphans +@page.widows: org.w3c.css.properties.paged.Widows -page-break-before: org.w3c.css.paged.PageBreakBefore -page-break-after: org.w3c.css.paged.PageBreakAfter -page-break-inside: org.w3c.css.paged.PageBreakInside -page: org.w3c.css.paged.Page -orphans: org.w3c.css.paged.Orphans -widows: org.w3c.css.paged.Widows +page-break-before: org.w3c.css.properties.paged.PageBreakBefore +page-break-after: org.w3c.css.properties.paged.PageBreakAfter +page-break-inside: org.w3c.css.properties.paged.PageBreakInside +page: org.w3c.css.properties.paged.Page +orphans: org.w3c.css.properties.paged.Orphans +widows: org.w3c.css.properties.paged.Widows # Font properties @@ -863,14 +863,14 @@ @page.bottom: org.w3c.css.properties.CssBottom @page.float: org.w3c.css.properties.CssFloat @page.clear: org.w3c.css.properties.CssClear -@page.size: org.w3c.css.paged.Size -@page.marks: org.w3c.css.paged.Marks -@page.page-break-before: org.w3c.css.paged.PageBreakBefore -@page.page-break-after: org.w3c.css.paged.PageBreakAfter -@page.page-break-inside: org.w3c.css.paged.PageBreakInside -@page.page: org.w3c.css.paged.Page -@page.orphans: org.w3c.css.paged.Orphans -@page.widows: org.w3c.css.paged.Widows +@page.size: org.w3c.css.properties.paged.Size +@page.marks: org.w3c.css.properties.paged.Marks +@page.page-break-before: org.w3c.css.properties.paged.PageBreakBefore +@page.page-break-after: org.w3c.css.properties.paged.PageBreakAfter +@page.page-break-inside: org.w3c.css.properties.paged.PageBreakInside +@page.page: org.w3c.css.properties.paged.Page +@page.orphans: org.w3c.css.properties.paged.Orphans +@page.widows: org.w3c.css.properties.paged.Widows # Font properties @font-face.font-style: org.w3c.css.font.FontStyle @@ -1024,9 +1024,9 @@ outline-width: org.w3c.css.user.OutlineWidthATSC outline-style: org.w3c.css.user.OutlineStyleATSC outline-color: org.w3c.css.user.OutlineColorATSC -page-break-before: org.w3c.css.paged.PageBreakBeforeATSC -page-break-after: org.w3c.css.paged.PageBreakAfterATSC -page-break-inside: org.w3c.css.paged.PageBreakInsideATSC -page: org.w3c.css.paged.PageATSC -orphans: org.w3c.css.paged.OrphansATSC -widows: org.w3c.css.paged.WidowsATSC +page-break-before: org.w3c.css.properties.paged.PageBreakBeforeATSC +page-break-after: org.w3c.css.properties.paged.PageBreakAfterATSC +page-break-inside: org.w3c.css.properties.paged.PageBreakInsideATSC +page: org.w3c.css.properties.paged.PageATSC +orphans: org.w3c.css.properties.paged.OrphansATSC +widows: org.w3c.css.properties.paged.WidowsATSC Index: CssPrinterStyle.java =================================================================== RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/CssPrinterStyle.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- CssPrinterStyle.java 8 Apr 2002 21:24:12 -0000 1.2 +++ CssPrinterStyle.java 23 Aug 2005 16:22:54 -0000 1.3 @@ -6,6 +6,12 @@ // Please first read the full copyright statement in file COPYRIGHT.html /* * $Log$ + * Revision 1.3 2005/08/23 16:22:54 ylafon + * Patch by Jean-Guilhem Rouel + * + * Better handling of media and properties files + * Major reorganization of those properties files + * * Revision 1.2 2002/04/08 21:24:12 plehegar * New * @@ -15,7 +21,7 @@ */ package org.w3c.css.parser; -import org.w3c.css.properties.CssProperty; +import org.w3c.css.properties.css1.CssProperty; /** * This class is invoke by all propperties when a print is required. @@ -29,8 +35,8 @@ * Print this property. * * @param property The property to print. - * @see org.w3c.css.properties.CssProperty#toString - * @see org.w3c.css.properties.CssProperty#getPropertyName + * @see org.w3c.css.properties.css1.CssProperty#toString + * @see org.w3c.css.properties.css1.CssProperty#getPropertyName */ public void print(CssProperty property); }
Received on Tuesday, 23 August 2005 16:26:20 UTC