- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 26 Aug 2005 14:09:51 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/css
In directory hutz:/tmp/cvs-serv31827/org/w3c/css/css
Modified Files:
CssRuleList.java CssStyleRule.java StyleSheet.java
StyleSheetGeneratorHTML2.java StyleSheetParser.java
Log Message:
All changes made by Jean-Guilhem Rouel:
Fix for bugs: 1269, 979, 791, 777, 776, 767, 765, 763, 576, 363
Errors in font, the handling of 'transparent', CSS Parser reinits...
http://www.w3.org/Bugs/Public/show_bug.cgi?id=1269
http://www.w3.org/Bugs/Public/show_bug.cgi?id=979
http://www.w3.org/Bugs/Public/show_bug.cgi?id=791
http://www.w3.org/Bugs/Public/show_bug.cgi?id=777
http://www.w3.org/Bugs/Public/show_bug.cgi?id=776
http://www.w3.org/Bugs/Public/show_bug.cgi?id=767
http://www.w3.org/Bugs/Public/show_bug.cgi?id=765
http://www.w3.org/Bugs/Public/show_bug.cgi?id=763
http://www.w3.org/Bugs/Public/show_bug.cgi?id=576
http://www.w3.org/Bugs/Public/show_bug.cgi?id=363
Index: StyleSheetGeneratorHTML2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/StyleSheetGeneratorHTML2.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- StyleSheetGeneratorHTML2.java 23 Aug 2005 16:22:54 -0000 1.15
+++ StyleSheetGeneratorHTML2.java 26 Aug 2005 14:09:49 -0000 1.16
@@ -172,9 +172,8 @@
}
// prints the stylesheet at the screen
- public void produceStyleSheet() {
-
- Vector atRules = style.newGetRules();
+ public void produceStyleSheet() {
+ Vector atRules = style.newGetRules();
for (int idx = 0; idx < atRules.size(); idx++) {
// out.print(((CssRuleList)atRules.elementAt(idx)).toHTML());
((CssRuleList) atRules.elementAt(idx)).toHTML(out);
@@ -437,10 +436,11 @@
str = str.substring(lastIndexOfEntity + 3);
i = 0;
}
- } else if (entity.equals("selector")) {
+ } else if (entity.equals("selector")) {
str = str.substring(lastIndexOfEntity + 3);
i = 0;
} else if (entity.equals("charset")) {
+ out.print(str.substring(0, i));
str = str.substring(lastIndexOfEntity+3);
i = 0;
out.print(style.charset);
@@ -466,7 +466,7 @@
general.get("file-title").toString()));
} else {
out.println(ac.getMsg().getGeneratorString("doc"));
- }
+ }
} else {
String value = prop.getProperty(entity);
if (value != null) {
Index: StyleSheet.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/StyleSheet.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- StyleSheet.java 23 Aug 2005 16:22:54 -0000 1.8
+++ StyleSheet.java 26 Aug 2005 14:09:49 -0000 1.9
@@ -242,7 +242,7 @@
public void endOfRule() {
CssRuleList rulelist;
boolean useless;
- if (!doNotAddRule) {
+ if (!doNotAddRule) {
CssStyleRule stylerule = new CssStyleRule(indent, selectortext,
properties, important);
if (!atRuleList.isEmpty()) {
Index: CssRuleList.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/CssRuleList.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- CssRuleList.java 8 Aug 2005 13:18:04 -0000 1.9
+++ CssRuleList.java 26 Aug 2005 14:09:49 -0000 1.10
@@ -104,17 +104,17 @@
if (null != atRule && atRule.isEmpty()) {
if (!atRuleString.equals("")) {
out.print("<li><span class='atSelector'>");
- out.print(Util.escapeHTML(atRuleString));
+ out.print(Util.escapeHTML(atRuleString));
out.print("</span></li> \n\n");
}
} else {
if (!atRuleString.equals("")) {
out.print("<li><span class='atSelector'>");
- out.print(Util.escapeHTML(atRuleString));
+ out.print(Util.escapeHTML(atRuleString));
out.print("</span> {\n<ul>\n");
}
for (int i = 0; i < rulelist.size() ; i++ ) {
- ((CssStyleRule)rulelist.elementAt(i)).toHTML(out);
+ ((CssStyleRule)rulelist.elementAt(i)).toHTML(out);
}
if (!atRuleString.equals("")) {
Index: CssStyleRule.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/CssStyleRule.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- CssStyleRule.java 23 Aug 2005 16:22:54 -0000 1.8
+++ CssStyleRule.java 26 Aug 2005 14:09:49 -0000 1.9
@@ -79,7 +79,7 @@
public void toHTML(PrintWriter out) {
if(properties != null) {
out.print("<li><span class='selector'>");
- if (selectors != null) {
+ if (selectors != null) {
out.print(selectors);
out.print("</span> {<ul class='vRule'>\n");
}
Index: StyleSheetParser.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/StyleSheetParser.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- StyleSheetParser.java 23 Aug 2005 16:22:54 -0000 1.5
+++ StyleSheetParser.java 26 Aug 2005 14:09:49 -0000 1.6
@@ -6,6 +6,24 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.6 2005/08/26 14:09:49 ylafon
+ * All changes made by Jean-Guilhem Rouel:
+ *
+ * Fix for bugs: 1269, 979, 791, 777, 776, 767, 765, 763, 576, 363
+ *
+ * Errors in font, the handling of 'transparent', CSS Parser reinits...
+ *
+ * http://www.w3.org/Bugs/Public/show_bug.cgi?id=1269
+ * http://www.w3.org/Bugs/Public/show_bug.cgi?id=979
+ * http://www.w3.org/Bugs/Public/show_bug.cgi?id=791
+ * http://www.w3.org/Bugs/Public/show_bug.cgi?id=777
+ * http://www.w3.org/Bugs/Public/show_bug.cgi?id=776
+ * http://www.w3.org/Bugs/Public/show_bug.cgi?id=767
+ * http://www.w3.org/Bugs/Public/show_bug.cgi?id=765
+ * http://www.w3.org/Bugs/Public/show_bug.cgi?id=763
+ * http://www.w3.org/Bugs/Public/show_bug.cgi?id=576
+ * http://www.w3.org/Bugs/Public/show_bug.cgi?id=363
+ *
* Revision 1.5 2005/08/23 16:22:54 ylafon
* Patch by Jean-Guilhem Rouel
*
@@ -198,12 +216,12 @@
try {
ac.setOrigin(origin);
- if (cssFouffa == null) {
- cssFouffa = new CssFouffa(ac, url);
- cssFouffa.addListener(this);
- } else {
- cssFouffa.ReInit(ac, url);
- }
+// if (cssFouffa == null) {
+ cssFouffa = new CssFouffa(ac, url);
+ cssFouffa.addListener(this);
+// } else {
+// cssFouffa.ReInit(ac, url);
+// }
// cssFouffa.setResponse(res);
@@ -258,12 +276,12 @@
}
try {
- if (cssFouffa == null) {
+// if (cssFouffa == null) {
cssFouffa = new CssFouffa(ac, input, url, lineno);
cssFouffa.addListener(this);
- } else {
- cssFouffa.ReInit(ac, input, url, lineno);
- }
+// } else {
+// cssFouffa.ReInit(ac, input, url, lineno);
+// }
// cssFouffa.setResponse(res);
// cssFouffa.setDefaultMedium(defaultmedium);
@@ -330,11 +348,11 @@
}
try {
- if (cssFouffa == null) {
+// if (cssFouffa == null) {
cssFouffa = new CssFouffa(ac, input, url, lineno);
cssFouffa.addListener(this);
- } else
- cssFouffa.ReInit(ac, input, url, lineno);
+// } else
+// cssFouffa.ReInit(ac, input, url, lineno);
CssSelectors selector = new CssSelectors(ac);
try {
Received on Friday, 26 August 2005 14:10:15 UTC