[jboss-cvs] jboss-seam ...

[Gavin King]

  User: gavin   
  Date: 07/01/12 15:55:50

  Modified:    jboss-seam  seam-text.g
  Log:
  dont hog apostrophe
  
  Revision  Changes    Path
  1.17      +9 -5      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.16
  retrieving revision 1.17
  diff -u -b -r1.16 -r1.17
  --- seam-text.g	12 Jan 2007 09:32:14 -0000	1.16
  +++ seam-text.g	12 Jan 2007 20:55:50 -0000	1.17
  @@ -24,7 +24,7 @@
       }
   }
   
  -startRule: ( (heading)? text (heading text)* )?
  +startRule: (newline)* ( (heading)? text (heading text)* )?
       ;
   
   text: ( (paragraph|special|html) (newline)* )+
  @@ -64,6 +64,7 @@
           | eq:EQ { append( eq.getText() ); }
           | hh:HASH { append( hh.getText() ); }
           | e:ESCAPE { append( e.getText() ); }
  +        | t:TWIDDLE { append( t.getText() ); }
           | u:UNDERSCORE { append( u.getText() ); }
       ;
   
  @@ -104,9 +105,9 @@
            MINUS { append("</del>"); }
       ;
       
  -preformatted: QUOTE { append("<pre>"); }
  +preformatted: BACKTICK { append("<pre>"); }
                 (word|punctuation|specialChars|htmlSpecialChars|space|newline)*
  -              QUOTE { append("</pre>"); }
  +              BACKTICK { append("</pre>"); }
       ;
       
   quoted: DOUBLEQUOTE { append("<quote>"); }
  @@ -187,7 +188,7 @@
   WORD: ('a'..'z'|'A'..'Z'|'0'..'9')+
       ;
       
  -PUNCTUATION: ':' | ';' | '(' | ')' | '?' | '!' | '@' | '%' | '.' | ','
  +PUNCTUATION: ':' | ';' | '(' | ')' | '?' | '!' | '@' | '%' | '.' | ',' | '\''
       ;
       
   EQ: '='
  @@ -214,7 +215,10 @@
   MINUS: '-'
       ;
       
  -QUOTE: '\''
  +BACKTICK: '`'
  +    ;
  +    
  +TWIDDLE: '~'
       ;
   
   DOUBLEQUOTE: '"'