html5/markup/tools Output.java,1.1,1.2 generate-spec-source.xsl,1.220,1.221 specgen.xsl,1.42,1.43 trang.jar,1.1,1.2

Update of /sources/public/html5/markup/tools
In directory hutz:/tmp/cvs-serv10872/tools

Modified Files:
	Output.java generate-spec-source.xsl specgen.xsl trang.jar 
Log Message:
prose model

Index: generate-spec-source.xsl
===================================================================
RCS file: /sources/public/html5/markup/tools/generate-spec-source.xsl,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -d -r1.220 -r1.221
--- generate-spec-source.xsl	29 Jan 2010 05:25:52 -0000	1.220
+++ generate-spec-source.xsl	29 Jan 2010 10:17:10 -0000	1.221
@@ -1933,7 +1933,7 @@
       ">
       <div class="no-number no-toc" id="{$name}-attributes">
         <xsl:text>&#10;        </xsl:text>
-        <h2 class="element-subhead">Attributes specific to this element</h2>
+        <h2 class="element-subhead">Descriptions for attributes specific to this element</h2>
         <xsl:text>&#10;        </xsl:text>
         <dl class="attr-defs">
           <xsl:choose>

Index: specgen.xsl
===================================================================
RCS file: /sources/public/html5/markup/tools/specgen.xsl,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- specgen.xsl	28 Jan 2010 17:38:37 -0000	1.42
+++ specgen.xsl	29 Jan 2010 10:17:10 -0000	1.43
@@ -665,6 +665,14 @@
         </a>
       </xsl:otherwise>
     </xsl:choose>
+    <xsl:if test="
+    not(. = 'common.attrs')
+    and not(following-sibling::*[1][self::h:span[contains(@class,'postfix')]])
+    and ancestor::h:*[@class='attr-content-models']
+    ">
+      <xsl:text> </xsl:text>
+      <span class="postfix required">[required]</span>
+    </xsl:if>
   </xsl:template>
   <xsl:template match="h:div[@id='tocjump']">
     <div id="tocjump" class="skip-link" style="text-align: center">

Index: Output.java
===================================================================
RCS file: /sources/public/html5/markup/tools/Output.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Output.java	29 Aug 2009 01:43:06 -0000	1.1
+++ Output.java	29 Jan 2010 10:17:10 -0000	1.2
@@ -653,17 +653,17 @@
     }
 
     public VoidValue visitOneOrMore(OneOrMorePattern p) {
-      postfix(p, "<a href='#one-or-more' title='ONE OR MORE' class='rnc-symbol'>+</a>");
+      postfix(p, " <span class='postfix oneormore'>[one or more]</span> ");
       return VoidValue.VOID;
     }
 
     public VoidValue visitZeroOrMore(ZeroOrMorePattern p) {
-      postfix(p, "<a href='#zero-or-more' title='ZERO OR MORE' class='rnc-symbol'>*</a>");
+      postfix(p, " <span class='postfix zeroormore'>[zero or more]</span> ");
       return VoidValue.VOID;
     }
 
     public VoidValue visitOptional(OptionalPattern p) {
-      postfix(p, "<a href='#optional' title='OPTIONAL (ZERO OR ONE)' class='rnc-symbol'>?</a>");
+      postfix(p, " <span class='postfix optional'>[optional]</span> ");
       return VoidValue.VOID;
     }
 
@@ -824,17 +824,17 @@
     }
 
     public VoidValue visitChoice(ChoicePattern p) {
-      composite(p, "<a href='#choice' title='EITHER/OR CHOICE' class='rnc-symbol'>|</a> ", false);
+      composite(p, " or ", false);
       return VoidValue.VOID;
     }
 
     public VoidValue visitInterleave(InterleavePattern p) {
-      composite(p, "<a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&amp;</a> ", false);
+      composite(p, " &amp; ", false);
       return VoidValue.VOID;
     }
 
     public VoidValue visitGroup(GroupPattern p) {
-      composite(p, "<a href='#in-order' title='ORDERED GROUP' class='rnc-symbol'>,</a>", true);
+      composite(p, " followed by ", 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, "<a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&amp;</a> "); 
+      ret_amp.replace(idx, idx+1, " &amp; "); 
       while( (idx=str.lastIndexOf("&", idx-1)) != -1 ) { 
-        ret_amp.replace(idx, idx+1, "<a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&amp;</a> "); 
+        ret_amp.replace(idx, idx+1, " &amp; "); 
       } 
       escaped = ret_amp.toString(); 
     } 

Index: trang.jar
===================================================================
RCS file: /sources/public/html5/markup/tools/trang.jar,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvs75Pwcg and /tmp/cvsehVPRo differ

Received on Friday, 29 January 2010 10:17:14 UTC