[jboss-cvs] jboss-seam ...

[Gavin King]

  User: gavin   
  Date: 07/01/26 15:22:57

  Modified:    jboss-seam  seam-text.g
  Log:
  allow ; as line sep
  
  Revision  Changes    Path
  1.25      +17 -4     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.24
  retrieving revision 1.25
  diff -u -b -r1.24 -r1.25
  --- seam-text.g	26 Jan 2007 18:15:40 -0000	1.24
  +++ seam-text.g	26 Jan 2007 20:22:57 -0000	1.25
  @@ -75,7 +75,7 @@
   formatted: bold|underline|italic|monospace|superscript|deleted
       ;
   
  -plain: word|punctuation|escape|space|link
  +plain: word|punctuation|escape|space|link|entity
       ;
     
   word: w:WORD { append( w.getText() ); }
  @@ -99,6 +99,7 @@
           | e:ESCAPE { append( e.getText() ); }
           | t:TWIDDLE { append( t.getText() ); }
           | u:UNDERSCORE { append( u.getText() ); }
  +        | sc:SEMICOLON { append( sc.getText() ); }
       ;
   
   htmlSpecialChars: 
  @@ -108,6 +109,12 @@
       | AMPERSAND { append("&"); }
       ;
       
  +entity: AMPERSAND { append("&"); } 
  +        ( HASH { append("#"); } )? 
  +        word 
  +        SEMICOLON { append(";"); }
  +    ;
  +    
   link: OPEN 
         { beginCapture(); } 
         (plain)* 
  @@ -150,7 +157,7 @@
       ;
       
   preformatted: BACKTICK { append("<pre>"); }
  -              (word|punctuation|specialChars|htmlSpecialChars|space|newline)*
  +              (word|punctuation|specialChars|htmlSpecialChars|space|simpleNewline)*
                 BACKTICK { append("</pre>"); }
       ;
       
  @@ -192,7 +199,10 @@
   space: s:SPACE { append( s.getText() ); }
       ;
   
  -newline: n:NEWLINE { append( n.getText() ); }
  +simpleNewline: n:NEWLINE { append( n.getText() ); }
  +    ;
  +
  +newline: SEMICOLON { append("\n"); } | simpleNewline
       ;
       
   newlineOrEof: newline | EOF
  @@ -234,7 +244,7 @@
   WORD: ('a'..'z'|'A'..'Z'|'0'..'9')+
       ;
       
  -PUNCTUATION: ':' | ';' | '(' | ')' | '?' | '!' | '@' | '%' | '.' | ',' | '\''
  +PUNCTUATION: ':' | '(' | ')' | '?' | '!' | '@' | '%' | '.' | ',' | '\''
       ;
       
   EQ: '='
  @@ -288,6 +298,9 @@
   LT: '<'
       ;
       
  +SEMICOLON: ';'
  +    ;
  +    
   AMPERSAND: '&'
       ;