Author: abelevich Date: 2008-11-10 05:02:28 -0500 (Mon, 10 Nov 2008) New Revision: 11063 Modified: trunk/sandbox/ui/editor/src/main/antlr/html-seamtext.g Log: Modified: trunk/sandbox/ui/editor/src/main/antlr/html-seamtext.g =================================================================== --- trunk/sandbox/ui/editor/src/main/antlr/html-seamtext.g 2008-11-08 15:19:18 UTC (rev 11062) +++ trunk/sandbox/ui/editor/src/main/antlr/html-seamtext.g 2008-11-10 10:02:28 UTC (rev 11063) @@ -165,6 +165,32 @@ return seamHeader.toString(); } + public void healingHeaderMarkup(java.util.Stack <Token> htmlElementStack) throws TokenStreamException, SemanticException{ + int EOF = 1; + int ALPHANUMERICWORD = 4; + int i = 0; + Token token; + + boolean containText = false; + + do { + i++; + token = LT(i); + + if (token.getType() == ALPHANUMERICWORD) { + if(!isHeader(token)) { + containText = true; + } + break; + } + + } while ( token.getType() != EOF); + + if (!containText) { + append("<span></span>"); + } + } + public boolean isList(Token token){ String name = token.getText(); return ("ul".equals(name) || "ol".equals(name)); @@ -193,7 +219,7 @@ } public boolean isPlainHMTLRequired(Token name, java.util.Stack <Token> htmlElementStack) throws SemanticException { - boolean require = false; + boolean required = false; if(!htmlElementStack.isEmpty()) { for(Token token : htmlElementStack) { if(token.getText().equals("h1") || token.getText().equals("h2") || token.getText().equals("h3") @@ -202,38 +228,11 @@ } } } - - - return require; - + + return required; } + - public void healingHeaderMarkup(java.util.Stack <Token> htmlElementStack) throws TokenStreamException, SemanticException{ - int EOF = 1; - int ALPHANUMERICWORD = 4; - int i = 0; - Token token; - - boolean containText = false; - - do { - i++; - token = LT(i); - - if (token.getType() == ALPHANUMERICWORD) { - if(!isHeader(token)) { - containText = true; - } - break; - } - - } while ( token.getType() != EOF); - - if (!containText) { - append("<span></span>"); - } - } - public String createSimpleSeamText(Token token) throws SemanticException{ String name = token.getText().toLowerCase(); @@ -323,7 +322,7 @@ | gt:ESCAPED_GT {append(escapeSeamText(gt, htmlElementStack));} | amp:ESCAPED_AMP {append(escapeSeamText(amp, htmlElementStack));} | qout:ESCAPED_QOUT {append(escapeSeamText(qout, htmlElementStack));} - | nbsp:NBSP {append(nbsp.getText());} + | nbsp:ESCAPED_NBSP {append(nbsp.getText());} ; eof: EOF; @@ -800,7 +799,8 @@ ESCAPED_QOUT : "&quot;" ; -NBSP : "&nbsp;" + +ESCAPED_NBSP : "&nbsp;" ;