W3C home > Mailing lists > Public > public-html-commits@w3.org > January 2010

html5/markup/tools Output.java,1.2,1.3 generate-spec-source.xsl,1.221,1.222 specgen.xsl,1.43,1.44 trang.jar,1.2,1.3

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Sat, 30 Jan 2010 04:44:29 +0000
To: public-html-commits@w3.org
Message-Id: <E1Nb5C9-0007NH-7j@lionel-hutz.w3.org>
Update of /sources/public/html5/markup/tools
In directory hutz:/tmp/cvs-serv27927/tools

Modified Files:
	Output.java generate-spec-source.xsl specgen.xsl trang.jar 
Log Message:
added star for required attributes

Index: generate-spec-source.xsl
===================================================================
RCS file: /sources/public/html5/markup/tools/generate-spec-source.xsl,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -d -r1.221 -r1.222
--- generate-spec-source.xsl	29 Jan 2010 10:17:10 -0000	1.221
+++ generate-spec-source.xsl	30 Jan 2010 04:44:26 -0000	1.222
@@ -1704,9 +1704,6 @@
           <xsl:choose>
             <xsl:when test="@name='embed'">
               <div class="attr-content-models">
-                <xsl:for-each
-                  select="document($rnc-html)//*[@class='pattern']
-                  [@id='embed.attrs' or @id='embed.attrs.other']">
                   <div class="attr-content-model">
                     <!-- * <a class="attribute-pattern-name" -->
                       <!-- * id="{@id}" -->
@@ -1715,16 +1712,19 @@
                       <!-- * <xsl:value-of select="@id"/> -->
                     <!-- * </a> -->
                     <!-- * <xsl:text> = </xsl:text> -->
+                  <xsl:for-each
+                    select="document($rnc-html)//*[@class='pattern']
+                    [@id='embed.attrs']/node()">
                     <xsl:choose>
-                      <xsl:when test="@id='embed.attrs.other'">
-                        <span class="attr-prose-desc">Any other attribute that has no namespace.</span>
-                      </xsl:when>
+                      <xsl:when test="contains(@class,'zeroormore')"/>
                       <xsl:otherwise>
-                        <xsl:copy-of select="node()"/>
+                        <xsl:copy-of select="."/>
                       </xsl:otherwise>
                     </xsl:choose>
-                  </div>
-                </xsl:for-each>
+                  </xsl:for-each>
+                  <xsl:text> </xsl:text>
+                 <span class="attr-prose-desc">Any other attribute that has no namespace</span>
+                </div>
               </div>
             </xsl:when>
             <xsl:when test="@name='colgroup'">

Index: specgen.xsl
===================================================================
RCS file: /sources/public/html5/markup/tools/specgen.xsl,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- specgen.xsl	29 Jan 2010 10:17:10 -0000	1.43
+++ specgen.xsl	30 Jan 2010 04:44:26 -0000	1.44
@@ -627,6 +627,16 @@
               <xsl:apply-templates/>
             </a>
           </xsl:when>
+          <xsl:when test=". ='common.attrs'">
+            <a>
+              <xsl:copy-of select="@*"/>
+              <xsl:attribute name="href">
+                <xsl:text>common-attributes.html</xsl:text>
+              </xsl:attribute>
+              <xsl:text>common attributes</xsl:text>
+            </a>
+          </xsl:when>
+          <xsl:when test=". = 'embed.attrs.other'"/>
           <xsl:when test="$href='forms-attributes'">
             <a>
               <xsl:copy-of select="@*"/>
@@ -658,6 +668,10 @@
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
+      <xsl:when test=". = 'common.attrs'">
+        <a href="#common-attributes">common attributes</a>
+      </xsl:when>
+      <xsl:when test=". = 'embed.attrs.other'"/>
       <xsl:otherwise>
         <a>
           <xsl:copy-of select="@*"/>
@@ -666,12 +680,12 @@
       </xsl:otherwise>
     </xsl:choose>
     <xsl:if test="
-    not(. = 'common.attrs')
-    and not(following-sibling::*[1][self::h:span[contains(@class,'postfix')]])
+    not(.='embed.attrs.other')
+    and not(starts-with(.,'common.'))
+    and not(following-sibling::*[1][self::h:span[contains(@class,'optional')]])
     and ancestor::h:*[@class='attr-content-models']
     ">
-      <xsl:text> </xsl:text>
-      <span class="postfix required">[required]</span>
+      <span class="postfix required" title="REQUIRED">&#x2605;</span>
     </xsl:if>
   </xsl:template>
   <xsl:template match="h:div[@id='tocjump']">

Index: Output.java
===================================================================
RCS file: /sources/public/html5/markup/tools/Output.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Output.java	29 Jan 2010 10:17:10 -0000	1.2
+++ Output.java	30 Jan 2010 04:44:26 -0000	1.3
@@ -653,17 +653,17 @@
     }
 
     public VoidValue visitOneOrMore(OneOrMorePattern p) {
-      postfix(p, " <span class='postfix oneormore'>[one or more]</span> ");
+      postfix(p, "<span class='postfix oneormore' title='ONE OR MORE'>+</span> ");
       return VoidValue.VOID;
     }
 
     public VoidValue visitZeroOrMore(ZeroOrMorePattern p) {
-      postfix(p, " <span class='postfix zeroormore'>[zero or more]</span> ");
+      postfix(p, "<span class='postfix zeroormore' title='ZERO OR MORE'>*</span> ");
       return VoidValue.VOID;
     }
 
     public VoidValue visitOptional(OptionalPattern p) {
-      postfix(p, " <span class='postfix optional'>[optional]</span> ");
+      postfix(p, "<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> ");
       return VoidValue.VOID;
     }
 
@@ -824,17 +824,17 @@
     }
 
     public VoidValue visitChoice(ChoicePattern p) {
-      composite(p, " or ", false);
+      composite(p, " <span class='postfix or'>or</span> ", false);
       return VoidValue.VOID;
     }
 
     public VoidValue visitInterleave(InterleavePattern p) {
-      composite(p, " &amp; ", false);
+      composite(p, " <span class='postfix &amp;'>&amp;</span> ", false);
       return VoidValue.VOID;
     }
 
     public VoidValue visitGroup(GroupPattern p) {
-      composite(p, " followed by ", true);
+      composite(p, " <span class='postfix followedby'>followed by</span> ", true);
       return VoidValue.VOID;
     }
 
@@ -1296,9 +1296,9 @@
     int idx = escaped.lastIndexOf("&"); 
     if ( idx != -1 ) { 
       StringBuffer ret_amp = new StringBuffer(str); 
-      ret_amp.replace(idx, idx+1, " &amp; "); 
+      ret_amp.replace(idx, idx+1, " <span class='postfix &amp;' title='INTERLEAVED IN ANY ORDER'>&amp;</span> "); 
       while( (idx=str.lastIndexOf("&", idx-1)) != -1 ) { 
-        ret_amp.replace(idx, idx+1, " &amp; "); 
+        ret_amp.replace(idx, idx+1, " <span class='postfix &amp;' title='INTERLEAVED IN ANY ORDER'>&amp;</span> "); 
       } 
       escaped = ret_amp.toString(); 
     } 

Index: trang.jar
===================================================================
RCS file: /sources/public/html5/markup/tools/trang.jar,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsSe6tLI and /tmp/cvsBkpwS2 differ
Received on Saturday, 30 January 2010 04:44:30 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Saturday, 30 January 2010 04:44:39 GMT