[jboss-cvs] jboss-seam ...

[Gavin King]

  User: gavin   
  Date: 07/01/10 02:31:47

  Modified:    jboss-seam  seam-text.g
  Log:
  lists using = and #
  
  Revision  Changes    Path
  1.6       +21 -9     jboss-seam/seam-text.g
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: seam-text.g
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/seam-text.g,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- seam-text.g	10 Jan 2007 06:59:22 -0000	1.5
  +++ seam-text.g	10 Jan 2007 07:31:47 -0000	1.6
  @@ -67,32 +67,32 @@
       ;
       
   bold: STAR { append("<b>"); }
  -      (word|punctuation|escape|underline|italic|monospace|superscript|deleted|space|newline)*
  +      (word|punctuation|escape|underline|italic|monospace|superscript|deleted|space|newline)+
         STAR { append("</b>"); }
       ;
       
   underline: UNDERSCORE { append("<u>"); }
  -           (word|punctuation|escape|bold|italic|monospace|superscript|deleted|space|newline)*
  +           (word|punctuation|escape|bold|italic|monospace|superscript|deleted|space|newline)+
              UNDERSCORE { append("</u>"); }
       ;
       
   italic: SLASH { append("<i>"); }
  -        (word|punctuation|escape|bold|underline|monospace|superscript|deleted|space|newline)*
  +        (word|punctuation|escape|bold|underline|monospace|superscript|deleted|space|newline)+
           SLASH { append("</i>"); }
       ;
       
   monospace: BAR { append("<tt>"); }
  -           (word|punctuation|escape|bold|underline|italic|superscript|deleted|space|newline)*
  +           (word|punctuation|escape|bold|underline|italic|superscript|deleted|space|newline)+
              BAR { append("</tt>"); }
       ;
       
   superscript: HAT { append("<sup>"); }
  -             (word|punctuation|escape|bold|underline|italic|monospace|deleted|space|newline)*
  +             (word|punctuation|escape|bold|underline|italic|monospace|deleted|space|newline)+
                HAT { append("</sup>"); }
       ;
       
   deleted: MINUS { append("<del>"); }
  -         (word|punctuation|escape|bold|underline|italic|monospace|superscript|space|newline)*
  +         (word|punctuation|escape|bold|underline|italic|monospace|superscript|space|newline)+
            MINUS { append("</del>"); }
       ;
       
  @@ -106,10 +106,22 @@
           DOUBLEQUOTE { append("</p></quote>"); newLinesSinceWord=0; }
       ;
       
  -list: para { append("<ol>\n"); } (listItem)+ { append("</ol>\n"); }
  +list: olist | ulist
       ;
       
  -listItem: HASH { append("<li>"); newLinesSinceWord=0; }
  +olist: para { append("<ol>\n"); } (olistItem)+ { append("</ol>\n"); }
  +    ;
  +    
  +olistItem: HASH { append("<li>"); newLinesSinceWord=0; }
  +      (word|punctuation|escape|bold|underline|italic|monospace|superscript|deleted|space)*
  +      { append("</li>"); } 
  +      para
  +    ;
  +    
  +ulist: para { append("<ul>\n"); } (ulistItem)+ { append("</ul>\n"); }
  +    ;
  +    
  +ulistItem: EQ { append("<li>"); newLinesSinceWord=0; }
         (word|punctuation|escape|bold|underline|italic|monospace|superscript|deleted|space)*
         { append("</li>"); } 
         para
  @@ -157,7 +169,7 @@
   WORD: ('a'..'z'|'A'..'Z'|'0'..'9')+
       ;
       
  -PUNCTUATION: ':' | ';' | '(' | ')' | '?' | '!' | '@' | '%' | '.'
  +PUNCTUATION: ':' | ';' | '(' | ')' | '?' | '!' | '@' | '%' | '.' | ','
       ;
       
   EQ: '='