[jboss-cvs] jboss-seam ...

[Gavin King]

  User: gavin   
  Date: 07/01/09 22:37:37

  Modified:    jboss-seam  seam-text.g
  Log:
  working on ws
  
  Revision  Changes    Path
  1.4       +5 -3      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.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- seam-text.g	10 Jan 2007 03:09:16 -0000	1.3
  +++ seam-text.g	10 Jan 2007 03:37:37 -0000	1.4
  @@ -50,6 +50,7 @@
           | eq:EQ { append( eq.getText() ); }
           | e:ESCAPE { append( e.getText() ); }
           | u:UNDERSCORE { append( u.getText() ); }
  +        | n:NEWLINE { append( n.getText() ); }
       ;
   
   htmlSpecialChars: 
  @@ -99,10 +100,11 @@
           DOUBLEQUOTE { append("</quote>"); }
       ;
       
  -ws: WS { append(" "); }
  +ws: w:WS { append( w.getText() ); }
       ;
           
  -para: NEWLINE NEWLINE { append("\n</p>\n<p>\n"); }
  +para: n:NEWLINE { append( n.getText() ); } 
  +      NEWLINE { append("</p>\n<p>\n"); }
       ;
   
   span: LT tag:WORD { append("<" + tag.getText()); } 
  @@ -184,7 +186,7 @@
   AMPERSAND: '&'
       ;
       
  -WS: (' ' | '\t')+
  +WS: (' '|'\t')+
       ;
   
   NEWLINE: '\r' '\n'   // DOS