[jboss-cvs] jboss-seam ...

[Gavin King]

  User: gavin   
  Date: 07/09/06 22:15:05

  Modified:    jboss-seam  seam-text.g
  Log:
  JBSEAM-1890
  
  Revision  Changes    Path
  1.39      +17 -15    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.38
  retrieving revision 1.39
  diff -u -b -r1.38 -r1.39
  --- seam-text.g	19 Jul 2007 10:56:35 -0000	1.38
  +++ seam-text.g	7 Sep 2007 02:15:05 -0000	1.39
  @@ -61,10 +61,7 @@
   startRule: (newline)* ( (heading (newline)* )? text (heading (newline)* text)* )?
       ;
   
  -text: ( (paragraph|special|html) (newline)* )+
  -    ;
  -    
  -special: (preformatted|quoted|list) newlineOrEof
  +text: ( (paragraph|preformatted|blockquote|list|html) (newline)* )+
       ;
   
   paragraph: { append("<p>\n"); } (line newlineOrEof)+ { append("</p>\n"); } newlineOrEof
  @@ -73,12 +70,22 @@
   line: (plain|formatted) (plain|formatted|preformatted|quoted|html)*
       ;
       
  -formatted: bold|underline|italic|monospace|superscript|deleted
  +blockquote: DOUBLEQUOTE { append("<blockquote>\n"); }
  +            (plain|formatted|preformatted|newline|html|list)*
  +            DOUBLEQUOTE newlineOrEof { append("</blockquote>\n"); }
  +    ;
  +    
  +preformatted: BACKTICK { append("<pre>"); }
  +              (word|punctuation|specialChars|moreSpecialChars|htmlSpecialChars|space|newline)*
  +              BACKTICK { append("</pre>"); }
       ;
   
   plain: word|punctuation|escape|space|link|macro
       ;
     
  +formatted: bold|underline|italic|monospace|superscript|deleted
  +    ;
  +
   word: w:WORD { append( w.getText() ); }
       ;
   
  @@ -178,13 +185,8 @@
            TWIDDLE { append("</del>"); }
       ;
       
  -preformatted: BACKTICK { append("<pre>"); }
  -              (word|punctuation|specialChars|moreSpecialChars|htmlSpecialChars|space|newline)*
  -              BACKTICK { append("</pre>"); }
  -    ;
  -    
   quoted: DOUBLEQUOTE { append("<q>"); }
  -        (plain|formatted|preformatted|html|(list newline)|newline)*
  +        (plain|bold|underline|italic|monospace|superscript|deleted|newline)+
           DOUBLEQUOTE { append("</q>"); }
       ;
   
  @@ -203,7 +205,7 @@
   h4: PLUS PLUS PLUS PLUS { append("<h4>"); } line { append("</h4>"); }
       ;
    
  -list: olist | ulist
  +list: ( olist | ulist ) newlineOrEof
       ;
       
   olist: { append("<ol>\n"); } (olistLine newlineOrEof)+ { append("</ol>\n"); }
  @@ -230,7 +232,7 @@
   html: openTag ( space | space attribute )* ( ( beforeBody body closeTagWithBody ) | closeTagWithNoBody ) 
       ;
   
  -body: (plain|formatted|preformatted|quoted|html|(list newline)|newline)*
  +body: (plain|formatted|preformatted|quoted|html|list|newline)*
       ;
   
   openTag: LT name:WORD { validateElement(name); append("<"); append(name.getText()); }