[jboss-cvs] jboss-seam ...

[Gavin King]

  User: gavin   
  Date: 07/01/12 04:29:09

  Modified:    jboss-seam  seam-text.g
  Log:
  MUCH more flexible
  
  Revision  Changes    Path
  1.14      +6 -12     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.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- seam-text.g	12 Jan 2007 09:21:17 -0000	1.13
  +++ seam-text.g	12 Jan 2007 09:29:09 -0000	1.14
  @@ -36,7 +36,7 @@
   paragraph: { append("<p>\n"); } (line newline)+ { append("</p>\n"); } newlineOrEof
       ;
       
  -line: (plain|formatted) (plain|formatted|inlineTag)*
  +line: (plain|formatted) (plain|formatted|preformatted|quoted|html)*
       ;
       
   plain: word|punctuation|escape|space
  @@ -151,28 +151,22 @@
   newlineOrEof: newline | EOF
       ;
   
  -html: openTag (attribute)* ( ( tagContent htmlText closeTagWithContent ) | closeTagWithNoContent ) 
  +html: openTag (attribute)* ( ( beforeBody body closeTagWithBody ) | closeTagWithNoBody ) 
       ;
   
  -htmlText: (plain|formatted|preformatted|quoted|html|(list newline)|newline)*
  -    ;
  -    
  -inlineTag: openTag (attribute)* ( ( tagContent inlineTagText closeTagWithContent ) | closeTagWithNoContent )
  -    ;
  -    
  -inlineTagText: (plain|formatted)*
  +body: (plain|formatted|preformatted|quoted|html|(list newline)|newline)*
       ;
   
   openTag: LT name:WORD { append("<"); append(name.getText()); }
       ;
       
  -tagContent: GT { append(">"); }
  +beforeBody: GT { append(">"); }
       ;
       
  -closeTagWithContent: LT SLASH name:WORD GT { append("</"); append(name.getText()); append(">"); }
  +closeTagWithBody: LT SLASH name:WORD GT { append("</"); append(name.getText()); append(">"); }
       ;
       
  -closeTagWithNoContent: SLASH GT { append("/>"); } 
  +closeTagWithNoBody: SLASH GT { append("/>"); } 
       ;
       
   attribute: space att:WORD EQ