- From: Julien Grand-Mourcel via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 31 Jul 2007 09:50:57 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/css
In directory hutz:/tmp/cvs-serv13494/org/w3c/css/css
Modified Files:
soap12.properties xml.properties ucn.properties
Log Message:
Updating the templates (ucn, soap & xml) so they can display some css
NB: xml is still a working draft
Index: soap12.properties
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/soap12.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- soap12.properties 24 Jul 2007 10:32:56 -0000 1.2
+++ soap12.properties 31 Jul 2007 09:50:55 -0000 1.3
@@ -78,6 +78,52 @@
#end
</m:warnings>
+#if ( $rules_count > 0 )
+ <m:css>
+ #if ($style_charset)
+
+ <m:vCharset>@charset</vCharset>
+ #end
+
+ #foreach ( $rules in $at_rules_list )
+ #if ( $rules.AtRule != "" )
+
+ <m:atRule>
+ <m:atSelector>$rules.AtRule</m:atSelector>
+ #elseif ( !$rules.Empty )
+
+ <m:noAtRule>
+ #end
+ #foreach ( $rule in $rules.StyleRules )
+
+ <m:selector>
+ <m:selectorValue>$rule.Selectors</m:selectorValue>
+ <m:RuleList>
+ #foreach ( $property in $rule.Properties )
+
+ <m:Rule>
+ <m:Property>$property.PropertyName</m:Property>
+ <m:PropertyValue>$property</m:PropertyValue>
+ <m:important>#if ( $property.Important ) true #else false #end</m:important>
+ </m:Rule>
+ #end
+
+ </m:RuleList>
+ </m:selector>
+ #end
+ #if ( $rules.AtRule != "" )
+
+ </m:atRule>
+ #elseif ( !$rules.Empty )
+
+ </m:noAtRule>
+ #end
+ #end
+
+ </m:css>
+#else
+ <m:css>$CSS_not_found</m:css>
+#end
</m:result>
</m:cssvalidationresponse>
</env:Body>
Index: ucn.properties
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/ucn.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ucn.properties 24 Jul 2007 10:32:56 -0000 1.2
+++ ucn.properties 31 Jul 2007 09:50:55 -0000 1.3
@@ -8,39 +8,63 @@
<date>$currentdate</date>
<passed>$is_valid</passed>
<result>
-#if ( $errors_count > 0 )
<errors xml:lang="$lang">
<errorcount>$errors_count</errorcount>
+#if ( $errors_count > 0 )
+
+ <errorlist>
+ #set ( $sf = "" )
#foreach ( $error_content in $errors_content )
#set ( $err = $error_content.get("Error") )
#set ( $error_msg = $error_content.get("ErrorMsg") )
#set ( $context_name = $error_content.get("CtxName") )
#set ( $context_msg = $error_content.get("CtxMsg") )
#set ( $class_name = $error_content.get("ClassName") )
-
- <error>
- <line_number>$err.Line</line_number>
- <context_msg name="$context_name">#if ( $context_msg ) $context_msg #end</context_msg>
- <message name="$class_name">$error_msg</message>
- </error>
+ #if ( $sf != $err.SourceFile )
+ #set ( $sf = $err.SourceFile )
+
+ <uri>$sf</uri>
+ #end
+
+ <error>
+ <line>$err.Line</line>
+ <context name="$context_name">#if ( $context_msg ) $context_msg #end</context>
+ <errortype>$class_name</errortype>
+ <message>$error_msg</message>
+ </error>
#end
-
- </errors>
+
+ </errorlist>
#end
-#if ( $warnings_count > 0 )
+
+ </errors>
+
+
<warnings xml:lang="$lang">
<warningcount>$warnings_count</warningcount>
+#if ( $warnings_count > 0 )
+
+ <warninglist>
+ #set ( $sf = "" )
#foreach ( $warning in $warnings_list )
-
- <warning>
- <line_number>$warning.Line</line_number>
- <code_context>#if ( $warning.Context ) $warning.Context #end</code_context>
- <message level="$warning.Level">$warning.WarningMessage</message>
- </warning>
+ #if ( $sf != $err.SourceFile )
+ #set ( $sf = $err.SourceFile )
+
+ <uri>$sf</uri>
+ #end
+
+ <warning>
+ <line>$warning.Line</line>
+ <code_context>#if ( $warning.Context ) $warning.Context #end</code_context>
+ <message level="$warning.Level">$warning.WarningMessage</message>
+ </warning>
#end
+
+ </warninglist>
+#end
</warnings>
-#end
+
#if ( $errors_count == 0 )
<informations xml:lang="$lang">
@@ -82,5 +106,52 @@
</infolist>
</informations>
#end
+
+#if ( $rules_count > 0 )
+ <css>
+ #if ($style_charset)
+
+ <vCharset>@charset</vCharset>
+ #end
+
+ #foreach ( $rules in $at_rules_list )
+ #if ( $rules.AtRule != "" )
+
+ <atRule>
+ <atSelector>$rules.AtRule</atSelector>
+ #elseif ( !$rules.Empty )
+
+ <noAtRule>
+ #end
+ #foreach ( $rule in $rules.StyleRules )
+
+ <selector>
+ <selectorValue>$rule.Selectors</selectorValue>
+ <RuleList>
+ #foreach ( $property in $rule.Properties )
+
+ <Rule>
+ <Property>$property.PropertyName</Property>
+ <PropertyValue>$property</PropertyValue>
+ <important>#if ( $property.Important ) true #else false #end</important>
+ </Rule>
+ #end
+
+ </RuleList>
+ </selector>
+ #end
+ #if ( $rules.AtRule != "" )
+
+ </atRule>
+ #elseif ( !$rules.Empty )
+
+ </noAtRule>
+ #end
+ #end
+
+ </css>
+#else
+ <css>$CSS_not_found</css>
+#end
</result>
</observationresponse>
Index: xml.properties
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/xml.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xml.properties 13 Jul 2007 13:32:19 -0000 1.2
+++ xml.properties 31 Jul 2007 09:50:55 -0000 1.3
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="$charset"?>
<!DOCTYPE xml-css>
<xml-css>
<!-- file : $file_title -->
@@ -8,15 +8,54 @@
It is inappropriate to use W3C Working Drafts as reference material or to
cite them as other than "work in progress".
-->
- <rule>
- <selector type="$element"
- id="$id"
- class="$class"
- pseudo-class="$pseudo-class"
- pseudo-element="$pseudo-element" />
- <declaration property="$property-name"
- value="$property-value"
- important />
- </rule>
+
+#if ( $rules_count > 0 )
+ #if ($style_charset)
+
+ <vCharset>@charset</vCharset>
+ #end
+
+ #foreach ( $rules in $at_rules_list )
+ #if ( $rules.AtRule != "" )
+
+ <atRule>
+ <atSelector>$rules.AtRule</atSelector>
+ #elseif ( !$rules.Empty )
+
+ <noAtRule>
+ #end
+ #foreach ( $rule in $rules.StyleRules )
+
+ <selector>
+ <selectorValue>$rule.Selectors</selectorValue>
+ <RuleList>
+ #foreach ( $property in $rule.Properties )
+
+ <rule>
+ <selector type="$element"
+ id="$id"
+ class="$class"
+ pseudo-class="$pseudo-class"
+ pseudo-element="$pseudo-element" />
+ <declaration property="$property.PropertyName"
+ value="$property"
+ #if ( $property.Important ) true #end />
+ </rule>
+ #end
+
+ </RuleList>
+ </selector>
+ #end
+ #if ( $rules.AtRule != "" )
+
+ </atRule>
+ #elseif ( !$rules.Empty )
+
+ </noAtRule>
+ #end
+ #end
+#else
+ $CSS_not_found
+#end
</xml-css>
Received on Tuesday, 31 July 2007 09:51:11 UTC