Index: richtext/resources/src/main/resources/xinha/XinhaCore.js
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- richtext/resources/src/main/resources/xinha/XinhaCore.js	(revision Local version)
+++ richtext/resources/src/main/resources/xinha/XinhaCore.js	(revision Shelved version)
@@ -3484,7 +3484,7 @@
       this.firePluginEvent('onBeforeMode', 'textmode');
       this._toolbarObjects.htmlmode.swapImage(this.config.iconList.wysiwygmode);
       this.setCC("iframe");
-      html = this.outwardHtml(this.getHTML());
+            html = this.outwardHtml(this.getHTML(true));
       this.setHTML(html);
 
       // Hide the iframe
@@ -5694,7 +5694,7 @@
  *  @private
  *  @returns {String} HTML content
  */
-Xinha.prototype.getHTML = function()
+Xinha.prototype.getHTML = function(beautify)
 {
   var html = '';
   switch ( this._editMode )
@@ -5702,11 +5702,11 @@
     case "wysiwyg":
       if ( !this.config.fullPage )
       {
-        html = Xinha.getHTML(this._doc.body, false, this).trim();
+                html = Xinha.getHTML(this._doc.body, false, this, beautify).trim();
       }
       else
       {
-        html = this.doctype + "\n" + Xinha.getHTML(this._doc.documentElement, true, this);
+                html = this.doctype + "\n" + Xinha.getHTML(this._doc.documentElement, true, this, beautify);
       }
       break;
     case "textmode":
Index: pom.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- pom.xml	(revision Local version)
+++ pom.xml	(revision Shelved version)
@@ -94,6 +94,7 @@
     <junit.version>4.10</junit.version>
     <xmlunit.version>1.3</xmlunit.version>
     <mockito.version>1.9.0</mockito.version>
+    <jasmin.version>1.2.0.0</jasmin.version>
 
     <!-- Project Dependencies -->
     <commons-codec.version>1.4</commons-codec.version>
Index: richtext/resources/src/main/resources/xinha/modules/GetHtml/TransformInnerHTML.js
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- richtext/resources/src/main/resources/xinha/modules/GetHtml/TransformInnerHTML.js	(revision Local version)
+++ richtext/resources/src/main/resources/xinha/modules/GetHtml/TransformInnerHTML.js	(revision Shelved version)
@@ -1,4 +1,511 @@
 /**
+ Style HTML
+ ---------------
+
+ Written by Nochum Sossonko, (nsossonko@hotmail.com)
+
+ Based on code initially developed by: Einar Lielmanis, <elfz@laacz.lv>
+ http://jsbeautifier.org/
+
+
+ You are free to use this in any way you want, in case you find this useful or working for you.
+ */
+JSBEAUTIFY = {};
+JSBEAUTIFY.style_html = function(html_source, options) {
+    //Wrapper function to invoke all the necessary constructors and deal with the output.
+
+    var multi_parser,
+            indent_size,
+            indent_character,
+            max_char,
+            brace_style,
+            unformatted;
+
+    options = options || {};
+    indent_size = options.indent_size || 4;
+    indent_character = options.indent_char || ' ';
+    brace_style = options.brace_style || 'collapse';
+    max_char = options.max_char == 0 ? Infinity : options.max_char || 70;
+    unformatted = options.unformatted || ['a', 'span', 'bdo', 'em', 'strong', 'dfn', 'code', 'samp', 'kbd', 'var', 'cite', 'abbr', 'acronym', 'q', 'sub', 'sup', 'tt', 'i', 'b', 'big', 'small', 'u', 's', 'strike', 'font', 'ins', 'del', 'pre', 'address', 'dt', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6'];
+
+    function Parser() {
+
+        this.pos = 0; //Parser position
+        this.token = '';
+        this.current_mode = 'CONTENT'; //reflects the current Parser mode: TAG/CONTENT
+        this.tags = { //An object to hold tags, their position, and their parent-tags, initiated with default values
+            parent: 'parent1',
+            parentcount: 1,
+            parent1: ''
+        };
+        this.tag_type = '';
+        this.token_text = this.last_token = this.last_text = this.token_type = '';
+
+        this.Utils = { //Uilities made available to the various functions
+            whitespace: "\n\r\t ".split(''),
+            single_token: 'br,input,link,meta,!doctype,basefont,base,area,hr,wbr,param,img,isindex,?xml,embed,?php,?,?='.split(','), //all the single tags for HTML
+            extra_liners: 'head,body,/html'.split(','), //for tags that need a line of whitespace before them
+            in_array: function (what, arr) {
+                for (var i=0; i<arr.length; i++) {
+                    if (what === arr[i]) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+        }
+
+        this.get_content = function () { //function to capture regular content between tags
+
+            var input_char = '',
+                    content = [],
+                    space = false; //if a space is needed
+
+            while (this.input.charAt(this.pos) !== '<') {
+                if (this.pos >= this.input.length) {
+                    return content.length?content.join(''):['', 'TK_EOF'];
+                }
+
+                input_char = this.input.charAt(this.pos);
+                this.pos++;
+                this.line_char_count++;
+
+                if (this.Utils.in_array(input_char, this.Utils.whitespace)) {
+                    if (content.length) {
+                        space = true;
+                    }
+                    this.line_char_count--;
+                    continue; //don't want to insert unnecessary space
+                }
+                else if (space) {
+                    if (this.line_char_count >= this.max_char) { //insert a line when the max_char is reached
+                        content.push('\n');
+                        for (var i=0; i<this.indent_level; i++) {
+                            content.push(this.indent_string);
+                        }
+                        this.line_char_count = 0;
+                    }
+                    else{
+                        content.push(' ');
+                        this.line_char_count++;
+                    }
+                    space = false;
+                }
+                content.push(input_char); //letter at-a-time (or string) inserted to an array
+            }
+            return content.length?content.join(''):'';
+        }
+
+        this.get_contents_to = function (name) { //get the full content of a script or style to pass to js_beautify
+            if (this.pos == this.input.length) {
+                return ['', 'TK_EOF'];
+            }
+            var input_char = '';
+            var content = '';
+            var reg_match = new RegExp('\<\/' + name + '\\s*\>', 'igm');
+            reg_match.lastIndex = this.pos;
+            var reg_array = reg_match.exec(this.input);
+            var end_script = reg_array?reg_array.index:this.input.length; //absolute end of script
+            if(this.pos < end_script) { //get everything in between the script tags
+                content = this.input.substring(this.pos, end_script);
+                this.pos = end_script;
+            }
+            return content;
+        }
+
+        this.record_tag = function (tag){ //function to record a tag and its parent in this.tags Object
+            if (this.tags[tag + 'count']) { //check for the existence of this tag type
+                this.tags[tag + 'count']++;
+                this.tags[tag + this.tags[tag + 'count']] = this.indent_level; //and record the present indent level
+            }
+            else { //otherwise initialize this tag type
+                this.tags[tag + 'count'] = 1;
+                this.tags[tag + this.tags[tag + 'count']] = this.indent_level; //and record the present indent level
+            }
+            this.tags[tag + this.tags[tag + 'count'] + 'parent'] = this.tags.parent; //set the parent (i.e. in the case of a div this.tags.div1parent)
+            this.tags.parent = tag + this.tags[tag + 'count']; //and make this the current parent (i.e. in the case of a div 'div1')
+        }
+
+        this.retrieve_tag = function (tag) { //function to retrieve the opening tag to the corresponding closer
+            if (this.tags[tag + 'count']) { //if the openener is not in the Object we ignore it
+                var temp_parent = this.tags.parent; //check to see if it's a closable tag.
+                while (temp_parent) { //till we reach '' (the initial value);
+                    if (tag + this.tags[tag + 'count'] === temp_parent) { //if this is it use it
+                        break;
+                    }
+                    temp_parent = this.tags[temp_parent + 'parent']; //otherwise keep on climbing up the DOM Tree
+                }
+                if (temp_parent) { //if we caught something
+                    this.indent_level = this.tags[tag + this.tags[tag + 'count']]; //set the indent_level accordingly
+                    this.tags.parent = this.tags[temp_parent + 'parent']; //and set the current parent
+                }
+                delete this.tags[tag + this.tags[tag + 'count'] + 'parent']; //delete the closed tags parent reference...
+                delete this.tags[tag + this.tags[tag + 'count']]; //...and the tag itself
+                if (this.tags[tag + 'count'] == 1) {
+                    delete this.tags[tag + 'count'];
+                }
+                else {
+                    this.tags[tag + 'count']--;
+                }
+            }
+        }
+
+        this.get_tag = function () { //function to get a full tag and parse its type
+            var input_char = '',
+                    content = [],
+                    space = false,
+                    tag_start, tag_end;
+
+            do {
+                if (this.pos >= this.input.length) {
+                    return content.length?content.join(''):['', 'TK_EOF'];
+                }
+
+                input_char = this.input.charAt(this.pos);
+                this.pos++;
+                this.line_char_count++;
+
+                if (this.Utils.in_array(input_char, this.Utils.whitespace)) { //don't want to insert unnecessary space
+                    space = true;
+                    this.line_char_count--;
+                    continue;
+                }
+
+                if (input_char === "'" || input_char === '"') {
+                    if (!content[1] || content[1] !== '!') { //if we're in a comment strings don't get treated specially
+                        input_char += this.get_unformatted(input_char);
+                        space = true;
+                    }
+                }
+
+                if (input_char === '=') { //no space before =
+                    space = false;
+                }
+
+                if (content.length && content[content.length-1] !== '=' && input_char !== '>'
+                        && space) { //no space after = or before >
+                    if (this.line_char_count >= this.max_char) {
+                        this.print_newline(false, content);
+                        this.line_char_count = 0;
+                    }
+                    else {
+                        content.push(' ');
+                        this.line_char_count++;
+                    }
+                    space = false;
+                }
+                if (input_char === '<') {
+                    tag_start = this.pos - 1;
+                }
+                content.push(input_char); //inserts character at-a-time (or string)
+            } while (input_char !== '>');
+
+            var tag_complete = content.join('');
+            var tag_index;
+            if (tag_complete.indexOf(' ') != -1) { //if there's whitespace, thats where the tag name ends
+                tag_index = tag_complete.indexOf(' ');
+            }
+            else { //otherwise go with the tag ending
+                tag_index = tag_complete.indexOf('>');
+            }
+            var tag_check = tag_complete.substring(1, tag_index).toLowerCase();
+            if (tag_complete.charAt(tag_complete.length-2) === '/' ||
+                    this.Utils.in_array(tag_check, this.Utils.single_token)) { //if this tag name is a single tag type (either in the list or has a closing /)
+                this.tag_type = 'SINGLE';
+            }
+            else if (tag_check === 'script') { //for later script handling
+                this.record_tag(tag_check);
+                this.tag_type = 'SCRIPT';
+            }
+            else if (tag_check === 'style') { //for future style handling (for now it justs uses get_content)
+                this.record_tag(tag_check);
+                this.tag_type = 'STYLE';
+            }
+            else if (this.Utils.in_array(tag_check, unformatted)) { // do not reformat the "unformatted" tags
+                var comment = this.get_unformatted('</'+tag_check+'>', tag_complete); //...delegate to get_unformatted function
+                content.push(comment);
+                // Preserve collapsed whitespace either before or after this tag.
+                if (tag_start > 0 && this.Utils.in_array(this.input.charAt(tag_start - 1), this.Utils.whitespace)){
+                    content.splice(0, 0, this.input.charAt(tag_start - 1));
+                }
+                tag_end = this.pos - 1;
+                if (this.Utils.in_array(this.input.charAt(tag_end + 1), this.Utils.whitespace)){
+                    content.push(this.input.charAt(tag_end + 1));
+                }
+                this.tag_type = 'SINGLE';
+            }
+            else if (tag_check.charAt(0) === '!') { //peek for <!-- comment
+                if (tag_check.indexOf('[if') != -1) { //peek for <!--[if conditional comment
+                    if (tag_complete.indexOf('!IE') != -1) { //this type needs a closing --> so...
+                        var comment = this.get_unformatted('-->', tag_complete); //...delegate to get_unformatted
+                        content.push(comment);
+                    }
+                    this.tag_type = 'START';
+                }
+                else if (tag_check.indexOf('[endif') != -1) {//peek for <!--[endif end conditional comment
+                    this.tag_type = 'END';
+                    this.unindent();
+                }
+                else if (tag_check.indexOf('[cdata[') != -1) { //if it's a <[cdata[ comment...
+                    var comment = this.get_unformatted(']]>', tag_complete); //...delegate to get_unformatted function
+                    content.push(comment);
+                    this.tag_type = 'SINGLE'; //<![CDATA[ comments are treated like single tags
+                }
+                else {
+                    var comment = this.get_unformatted('-->', tag_complete);
+                    content.push(comment);
+                    this.tag_type = 'SINGLE';
+                }
+            }
+            else {
+                if (tag_check.charAt(0) === '/') { //this tag is a double tag so check for tag-ending
+                    this.retrieve_tag(tag_check.substring(1)); //remove it and all ancestors
+                    this.tag_type = 'END';
+                }
+                else { //otherwise it's a start-tag
+                    this.record_tag(tag_check); //push it on the tag stack
+                    this.tag_type = 'START';
+                }
+                if (this.Utils.in_array(tag_check, this.Utils.extra_liners)) { //check if this double needs an extra line
+                    this.print_newline(true, this.output);
+                }
+            }
+            return content.join(''); //returns fully formatted tag
+        }
+
+        this.get_unformatted = function (delimiter, orig_tag) { //function to return unformatted content in its entirety
+
+            if (orig_tag && orig_tag.toLowerCase().indexOf(delimiter) != -1) {
+                return '';
+            }
+            var input_char = '';
+            var content = '';
+            var space = true;
+            do {
+
+                if (this.pos >= this.input.length) {
+                    return content;
+                }
+
+                input_char = this.input.charAt(this.pos);
+                this.pos++
+
+                if (this.Utils.in_array(input_char, this.Utils.whitespace)) {
+                    if (!space) {
+                        this.line_char_count--;
+                        continue;
+                    }
+                    if (input_char === '\n' || input_char === '\r') {
+                        content += '\n';
+                        /*  Don't change tab indention for unformatted blocks.  If using code for html editing, this will greatly affect <pre> tags if they are specified in the 'unformatted array'
+                         for (var i=0; i<this.indent_level; i++) {
+                         content += this.indent_string;
+                         }
+                         space = false; //...and make sure other indentation is erased
+                         */
+                        this.line_char_count = 0;
+                        continue;
+                    }
+                }
+                content += input_char;
+                this.line_char_count++;
+                space = true;
+
+
+            } while (content.toLowerCase().indexOf(delimiter) == -1);
+            return content;
+        }
+
+        this.get_token = function () { //initial handler for token-retrieval
+            var token;
+
+            if (this.last_token === 'TK_TAG_SCRIPT' || this.last_token === 'TK_TAG_STYLE') { //check if we need to format javascript
+                var type = this.last_token.substr(7)
+                token = this.get_contents_to(type);
+                if (typeof token !== 'string') {
+                    return token;
+                }
+                return [token, 'TK_' + type];
+            }
+            if (this.current_mode === 'CONTENT') {
+                token = this.get_content();
+                if (typeof token !== 'string') {
+                    return token;
+                }
+                else {
+                    return [token, 'TK_CONTENT'];
+                }
+            }
+
+            if (this.current_mode === 'TAG') {
+                token = this.get_tag();
+                if (typeof token !== 'string') {
+                    return token;
+                }
+                else {
+                    var tag_name_type = 'TK_TAG_' + this.tag_type;
+                    return [token, tag_name_type];
+                }
+            }
+        }
+
+        this.get_full_indent = function (level) {
+            level = this.indent_level + level || 0;
+            if (level < 1)
+                return '';
+
+            return Array(level + 1).join(this.indent_string);
+        }
+
+
+        this.printer = function (js_source, indent_character, indent_size, max_char, brace_style) { //handles input/output and some other printing functions
+
+            this.input = js_source || ''; //gets the input for the Parser
+            this.output = [];
+            this.indent_character = indent_character;
+            this.indent_string = '';
+            this.indent_size = indent_size;
+            this.brace_style = brace_style;
+            this.indent_level = 0;
+            this.max_char = max_char;
+            this.line_char_count = 0; //count to see if max_char was exceeded
+
+            for (var i=0; i<this.indent_size; i++) {
+                this.indent_string += this.indent_character;
+            }
+
+            this.print_newline = function (ignore, arr) {
+                this.line_char_count = 0;
+                if (!arr || !arr.length) {
+                    return;
+                }
+                if (!ignore) { //we might want the extra line
+                    while (this.Utils.in_array(arr[arr.length-1], this.Utils.whitespace)) {
+                        arr.pop();
+                    }
+                }
+                arr.push('\n');
+                for (var i=0; i<this.indent_level; i++) {
+                    arr.push(this.indent_string);
+                }
+            }
+
+            this.print_token = function (text) {
+                this.output.push(text);
+            }
+
+            this.indent = function () {
+                this.indent_level++;
+            }
+
+            this.unindent = function () {
+                if (this.indent_level > 0) {
+                    this.indent_level--;
+                }
+            }
+        }
+        return this;
+    }
+
+    /*_____________________--------------------_____________________*/
+
+    multi_parser = new Parser(); //wrapping functions Parser
+    multi_parser.printer(html_source, indent_character, indent_size, max_char, brace_style); //initialize starting values
+
+    while (true) {
+        var t = multi_parser.get_token();
+        multi_parser.token_text = t[0];
+        multi_parser.token_type = t[1];
+
+        if (multi_parser.token_type === 'TK_EOF') {
+            break;
+        }
+
+        switch (multi_parser.token_type) {
+            case 'TK_TAG_START':
+                multi_parser.print_newline(false, multi_parser.output);
+                multi_parser.print_token(multi_parser.token_text);
+                multi_parser.indent();
+                multi_parser.current_mode = 'CONTENT';
+                break;
+            case 'TK_TAG_STYLE':
+            case 'TK_TAG_SCRIPT':
+                multi_parser.print_newline(false, multi_parser.output);
+                multi_parser.print_token(multi_parser.token_text);
+                multi_parser.current_mode = 'CONTENT';
+                break;
+            case 'TK_TAG_END':
+                //Print new line only if the tag has no content and has child
+                if (multi_parser.last_token === 'TK_CONTENT' && multi_parser.last_text === '') {
+                    var tag_name = multi_parser.token_text.match(/\w+/)[0];
+                    var tag_extracted_from_last_output = multi_parser.output[multi_parser.output.length -1].match(/<\s*(\w+)/);
+                    if (tag_extracted_from_last_output === null || tag_extracted_from_last_output[1] !== tag_name)
+                        multi_parser.print_newline(true, multi_parser.output);
+                }
+                multi_parser.print_token(multi_parser.token_text);
+                multi_parser.current_mode = 'CONTENT';
+                break;
+            case 'TK_TAG_SINGLE':
+                // Don't add a newline before elements that should remain unformatted.
+                var tag_check = multi_parser.token_text.match(/^\s*<([a-z]+)/i);
+                if (!tag_check || !multi_parser.Utils.in_array(tag_check[1], unformatted)){
+                    multi_parser.print_newline(false, multi_parser.output);
+                }
+                multi_parser.print_token(multi_parser.token_text);
+                multi_parser.current_mode = 'CONTENT';
+                break;
+            case 'TK_CONTENT':
+                if (multi_parser.token_text !== '') {
+                    multi_parser.print_token(multi_parser.token_text);
+                }
+                multi_parser.current_mode = 'TAG';
+                break;
+            case 'TK_STYLE':
+            case 'TK_SCRIPT':
+                if (multi_parser.token_text !== '') {
+                    multi_parser.output.push('\n');
+                    var text = multi_parser.token_text;
+                    if (multi_parser.token_type == 'TK_SCRIPT') {
+                        var _beautifier = typeof js_beautify == 'function' && js_beautify;
+                    } else if (multi_parser.token_type == 'TK_STYLE') {
+                        var _beautifier = typeof css_beautify == 'function' && css_beautify;
+                    }
+
+                    if (options.indent_scripts == "keep") {
+                        var script_indent_level = 0;
+                    } else if (options.indent_scripts == "separate") {
+                        var script_indent_level = -multi_parser.indent_level;
+                    } else {
+                        var script_indent_level = 1;
+                    }
+
+                    var indentation = multi_parser.get_full_indent(script_indent_level);
+                    if (_beautifier) {
+                        // call the Beautifier if avaliable
+                        text = _beautifier(text.replace(/^\s*/, indentation), options);
+                    } else {
+                        // simply indent the string otherwise
+                        var white = text.match(/^\s*/)[0];
+                        var _level = white.match(/[^\n\r]*$/)[0].split(multi_parser.indent_string).length - 1;
+                        var reindent = multi_parser.get_full_indent(script_indent_level -_level);
+                        text = text.replace(/^\s*/, indentation)
+                                .replace(/\r\n|\r|\n/g, '\n' + reindent)
+                                .replace(/\s*$/, '');
+                    }
+                    if (text) {
+                        multi_parser.print_token(text);
+                        multi_parser.print_newline(true, multi_parser.output);
+                    }
+                }
+                multi_parser.current_mode = 'TAG';
+                break;
+        }
+        multi_parser.last_token = multi_parser.token_type;
+        multi_parser.last_text = multi_parser.token_text;
+    }
+    return multi_parser.output.join('');
+}
+/**
   * Based on XML_Utility functions submitted by troels_kn.
   * credit also to adios, who helped with reg exps:
   * http://www.sitepoint.com/forums/showthread.php?t=201052
@@ -104,51 +611,7 @@
 	return sHtml;
 };
 
-/**
-  * Prettyfies html by inserting linebreaks before tags, and indenting blocklevel tags
-  */
-Xinha.indent = function(s, sindentChar) {
-	Xinha.__nindent = 0;
-	Xinha.__sindent = "";
-	Xinha.__sindentChar = (typeof sindentChar == "undefined") ? "  " : sindentChar;
-	var c = Xinha.RegExpCache;
-	if(Xinha.is_gecko) { //moz changes returns into <br> inside <pre> tags
-		s = s.replace(c[19], function(str){return str.replace(/<br \/>/g,"\n")});
-	}
-	s = s.replace(c[18], function(strn) { //skip pre and script tags
-	  strn = strn.replace(c[20], function(st,$1,$2) { //exclude comments
-		string = $2.replace(/[\n\r]/gi, " ").replace(/\s+/gi," ").replace(c[14], function(str) {
-			if (str.match(c[16])) {
-				var s = "\n" + Xinha.__sindent + str;
-				// blocklevel openingtag - increase indent
-				Xinha.__sindent += Xinha.__sindentChar;
-				++Xinha.__nindent;
-				return s;
-			} else if (str.match(c[15])) {
-				// blocklevel closingtag - decrease indent
-				--Xinha.__nindent;
-				Xinha.__sindent = "";
-				for (var i=Xinha.__nindent;i>0;--i) {
-					Xinha.__sindent += Xinha.__sindentChar;
-				}
-				return "\n" + Xinha.__sindent + str;
-			} else if (str.match(c[17])) {
-				// singlet tag
-				return "\n" + Xinha.__sindent + str;
-			}
-			return str; // this won't actually happen
-		});
-		return $1 + string;
-	  });return strn;
-    });
-    //final cleanup
-    s = s.replace(/^\s*/,'').//strip leading whitespace
-        replace(/ +\n/g,'\n').//strip spaces at end of lines
-        replace(/[\r\n]+(\s+)<\/script>/g,'\n$1</script>');//strip returns added into scripts
-    return s;
-};
-
-Xinha.getHTML = function(root, outputRoot, editor) {
+Xinha.getHTML = function(root, outputRoot, editor, beautify) {
 	var html = "";
 	var c = Xinha.RegExpCache;
 
@@ -219,7 +682,13 @@
 		if (outputRoot) {
 			html += "</" + root_tag + ">";
 		}
+
+        // html = html.replace(/<p>\s*<a/g, '<p><a');
+
+        if (beautify) {
+            //html = JSBEAUTIFY.style_html(html, {max_char: 120});
-		html = Xinha.indent(html);
+            html = Xinha.indent(html);
+        }
 	};
 //	html = Xinha.htmlEncode(html);
 
Index: richtext/resources/pom.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- richtext/resources/pom.xml	(revision Local version)
+++ richtext/resources/pom.xml	(revision Shelved version)
@@ -48,6 +48,26 @@
           <overwrite>true</overwrite>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>com.github.searls</groupId>
+        <artifactId>jasmine-maven-plugin</artifactId>
+        <version>${jasmin.version}</version>
+        <extensions>true</extensions>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <sourceExcludes>
+            <exclude>**/lang/*.js</exclude>
+          </sourceExcludes>
+          <jsSrcDir>${project.basedir}/src/main/external</jsSrcDir>
+          <jsSrcDir>${project.basedir}/src/main/resources</jsSrcDir>
+        </configuration>
+      </plugin>
     </plugins>
 
   </build>
Index: richtext/resources/src/test/javascript/xinha/MarkupIndentationTest.js
===================================================================
--- richtext/resources/src/test/javascript/xinha/MarkupIndentationTest.js	(revision Shelved version)
+++ richtext/resources/src/test/javascript/xinha/MarkupIndentationTest.js	(revision Shelved version)
@@ -0,0 +1,214 @@
+Hippo = typeof(Hippo) !== 'undefined' ? Hippo : {};
+Hippo.Richtext = typeof(Hippo.Richtext) !== 'undefined' || {};
+
+Hippo.Richtext.TestUtils = {
+    attributesEqual: function(node1, node2) {
+        if (!node1
+            || !node2
+            || node1.attributes.length !== node2.attributes.length) {
+            return false;
+        }
+        for (var i,len=node1.attributes.length; i<len; i++) {
+            var attribute = node1.attributes[i];
+            if (node2.getAttribute(attribute.name) !== attribute.value) {
+                return false;
+            }
+        }
+        return true;
+    },
+
+    stripStartEnd: function(str) {
+        var newString = str.replace(/^\s*/g, '');
+        newString = newString.replace(/\s*$/g, '');
+        return newString;
+    },
+
+    textNodeEqual: function(node1, node2) {
+        if (node1.nodeType !== 3 || node2.nodeType !== 3) {
+            return false;
+        }
+        return this.stripStartEnd(node1.data) === this.stripStartEnd(node2.data);
+    },
+
+    isWhiteSpaceTextNode: function(node) {
+        return node && node.nodeType === 3 && /^\s*$/.test(node.data);
+    },
+
+    getNextNonWhiteSpaceTextNode: function(node, index) {
+        if (!node) {
+            return null;
+        }
+        var tmp = node.nextSibling;
+        while (this.isWhiteSpaceTextNode(tmp)) {
+            tmp = tmp.nextSibling;
+        }
+        return tmp;
+    },
+
+    treesEqual: function(node1, node2) {
+        if (!node1
+                || !node2
+                || node1.nodeType !== node2.nodeType
+                || node1.nodeName !== node2.nodeName
+                || node1.hasChildNodes() !== node2.hasChildNodes()) {
+            return false;
+        } else if (node1.nodeType === 3 && node2.nodeType === 3) {
+            return this.textNodeEqual(node1, node2);
+        } else if (!this.attributesEqual(node1, node2)) {
+            return false;
+        }
+
+        if (node1.hasChildNodes()) {
+            var node1Child = node1.childNodes[0];
+            if (this.isWhiteSpaceTextNode(node1Child)) {
+                node1Child = this.getNextNonWhiteSpaceTextNode(node1Child);
+            }
+            var node2Child = node2.childNodes[0];
+            if (this.isWhiteSpaceTextNode(node2Child)) {
+                node2Child = this.getNextNonWhiteSpaceTextNode(node2Child);
+            }
+
+            while (true) {
+                if (node1Child === null && node2Child === null) {
+                    return true;
+                } else if (!this.treesEqual(node1Child, node2Child)) {
+                    return false;
+                }
+                node1Child = this.getNextNonWhiteSpaceTextNode(node1Child);
+                node2Child = this.getNextNonWhiteSpaceTextNode(node2Child);
+            }
+        }
+        return true;
+    },
+
+    createTree: function(domString, rootElementNodeName) {
+        var node = document.createElement(rootElementNodeName || 'div');
+        node.innerHTML = domString;
+        return node;
+    }
+};
+
+describe('Markup Indentation Test', function () {
+
+    // redefine xinha indent function
+    Xinha.indent = function(s, sindentChar) {
+        Xinha.__nindent = 0;
+        Xinha.__sindent = "";
+        Xinha.__sindentChar = (typeof sindentChar == "undefined") ? "  " : sindentChar;
+        var c = Xinha.RegExpCache;
+        if(Xinha.is_gecko) { //moz changes returns into <br> inside <pre> tags
+            s = s.replace(c[19], function(str){return str.replace(/<br \/>/g,"\n")});
+        }
+        s = s.replace(c[18], function(strn) { //skip pre and script tags
+            strn = strn.replace(c[20], function(st,$1,$2) { //exclude comments
+                string = $2.replace(/[\n\r]/gi, " ").replace(/\s+/gi," ").replace(c[14], function(str) {
+                    if (str.match(c[16])) {
+                        var s = "\n" + Xinha.__sindent + str;
+                        // blocklevel openingtag - increase indent
+                        Xinha.__sindent += Xinha.__sindentChar;
+                        ++Xinha.__nindent;
+                        return s;
+                    } else if (str.match(c[15])) {
+                        // blocklevel closingtag - decrease indent
+                        --Xinha.__nindent;
+                        Xinha.__sindent = "";
+                        for (var i=Xinha.__nindent;i>0;--i) {
+                            Xinha.__sindent += Xinha.__sindentChar;
+                        }
+                        return "\n" + Xinha.__sindent + str;
+                    } else if (str.match(c[17])) {
+                        // singlet tag
+                        return "\n" + Xinha.__sindent + str;
+                    }
+                    return str; // this won't actually happen
+                });
+                return $1 + string;
+            });return strn;
+        });
+        //final cleanup
+        s = s.replace(/^\s*/,'').//strip leading whitespace
+                replace(/ +\n/g,'\n').//strip spaces at end of lines
+                replace(/[\r\n]+(\s+)<\/script>/g,'\n$1</script>');//strip returns added into scripts
+        return s;
+    };
+
+    describe('tree equal', function() {
+
+        var tree = Hippo.Richtext.TestUtils.createTree('<div><p>test tree</p><span>foo</span></div>');
+        var treeAdditionalTextNodes = Hippo.Richtext.TestUtils.createTree('<div>\n<p>test tree</p> <span>foo</span></div>');
+        var treeAdditionalWhiteSpaceTextNode = Hippo.Richtext.TestUtils.createTree('<div><p> test tree\n</p><span>foo</span></div>');
+        var structuralAlteredTree = Hippo.Richtext.TestUtils.createTree('<div><div>test tree</div><span>foo</span></div>');
+
+        it ('should equal tree with itself', function () {
+            expect(Hippo.Richtext.TestUtils.treesEqual(tree, tree)).toBe(true);
+        });
+
+        it ('should equal tree with structural same additional text node tree', function () {
+            expect(Hippo.Richtext.TestUtils.treesEqual(tree, treeAdditionalTextNodes)).toBe(true);
+        });
+
+        it ('should not equal tree with text node altered tree content', function () {
+            expect(Hippo.Richtext.TestUtils.treesEqual(tree, treeAdditionalWhiteSpaceTextNode)).toBe(true);
+        });
+
+        it ('should not equal tree with structural altered tree', function () {
+            expect(Hippo.Richtext.TestUtils.treesEqual(tree, structuralAlteredTree)).toBe(false);
+        });
+
+    });
+
+
+    var html = '<html>                <body>                <p>                <a title="w:Greenpeace" href="http://en.wikipedia.org/wiki/Greenpeace">Greenpeace</a> activists                scattered schools                of <a title="w:Menhaden" href="http://en.wikipedia.org/wiki/Menhaden">menhaden</a> <a title="w:Bait fish" href="http://en.wikipedia.org/wiki/Bait_fish">bait                fish</a> in                the <a title="w:Chesapeake Bay" href="http://en.wikipedia.org/wiki/Chesapeake_Bay">Chesapeake                Bay</a> on Tuesday when fishing ships belonging to Omega Protein Corp. were                about to drop their sceine nets.</p>                <p>The Omega fleet consisted of two spotter planes and four fishing boats with                eight <a title="w:Ships tender" href="http://en.wikipedia.org/wiki/Ships_tender">tenders</a>.                Greenpeace arrived with four fast moving out-board motor boats, manned by                thirteen activists, who attempted to drive away the fish. The Coast Guard was                called in and ended the confrontation peacefully.</p>                <p>                The <a title="w:Houston, Texas" href="http://en.wikipedia.org/wiki/Houston,_Texas">Houston</a>-based                Omega Protein Corporation is the largest processor and distributor of                protein-rich menhaden and fish oil products in                the <a title="w:United States" href="http://en.wikipedia.org/wiki/United_States">United                States</a>. The company acggcounts for nearly 90% of the entire East Coast                menhaden catch.</p>                <p>An Omega spokesman Toby Gascon said of Greenpeace, "They have now                demonstrated that their real agenda is to put Omega out of business, even if it                means risking the safety of Omegas fishermen." Their fleet is out of                Reedville, <a title="w:Virginia" href="http://en.wikipedia.org/wiki/Virginia">Virginia</a>,                now a                top <a title="w:United States" href="http://en.wikipedia.org/wiki/United_States">U.S.</a> fishing                port due to the recent Omega processing plant opened there.</p>                <p>Chesapeake Bay menhaden are considered an important food source for fish                species popular with sports fisherman. They are also, next to oysters, a                prime <a title="w:Filter feeder" href="http://en.wikipedia.org/wiki/Filter_feeder">filter                feeder</a> in bay waters. The bay oyster population has suffered drastic                declines from disease over the last two decades. Studies of menhaden populations                are still inconclusive as scientists try to determine the overall number of bay                menhaden.</p>                <p>Greenpeace says the species is near historic lows and predators that depend                on the fish as a food source, such                as <a title="w:Striped bass" href="http://en.wikipedia.org/wiki/Striped_bass">striped                bass</a>, show signs of suffering from malnutrition and poor body condition.                </p>                <p>The <em>Chesapeake Bay Foundation</em>, a not-for-profit organization, had                praise                for <a title="w:Maryland" href="http://en.wikipedia.org/wiki/Maryland">Maryland</a> Governor <a title="w:Robert L. Ehrlich" href="http://en.wikipedia.org/wiki/Robert_L._Ehrlich">Robert                Ehrlich</a>, and the states Department of Natural Resources. They secured a                commitment from the Atlantic States Marine Fisheries Commission (ASMFC) to seek                a cap on commercial harvesting of Atlantic Menhaden.</p>                <p>A coalition of recreational anglers and environmentalists,                called <em>Menhaden Matter</em>, also joined the debate by saying coast-wide                population of Atlantic Menhaden has fallen to near record lows. They are also                against an encroachment by Omega into Chesapeake waters.</p>                <p>The issue is a cap proposed by ASMFC on the menhaden harvest. The Board                recommended a Draft Addendum to limit the menhaden harvest to 110,400 metric                tons, which is the average over five years of consecutive declines in harvests                for the species. The limit would apply to Atlantic and in-land waters of the                species. The proposed cap is for years 2006 and 2007 and open to public debate.                </p>                <p>ASMFC recently rejected an offer by Omega that would voluntarily cap their                harvest at 135,000 metric tons annually for the next four years. They noted                Omega also seeks to reopen some waters in Maryland and New Jersey which are                currently closed to industrial purse seine operations. A public hearing is                scheduled                in <a title="w:Alexandria, Virginia" href="http://en.wikipedia.org/wiki/Alexandria,_Virginia">Alexandria</a>,                Virginia in the next few days.</p>                <p>Omega says that ASMFCs own reports indicate the population levels of                Atlantic menhaden are healthy.</p>                <p>A <em>Chesapeake Bay Foundation</em> senior scientist, William J.                Goldsborough, said, "I believe that a cap on the purse seine catch of menhaden                at current levels, covering the total catch as well as removals from Chesapeake                Bay, would be a prudent measure to adopt."</p>                </body>                </html>';
+    var htmlTree = Hippo.Richtext.TestUtils.createTree(html);
+    var html2 = '<html><body><h2><strong>So what is vegetarian cuisine? </strong> </h2><p>It refers to<a title="Food" href="http://en.wikipedia.org/wiki/Food">food</a> that meets<a title="Vegetarianism" href="http://en.wikipedia.org/wiki/Vegetarianism">vegetarianstandards</a> by not including<a title="Meat" href="http://en.wikipedia.org/wiki/Meat">meat</a> and animaltissue products. For<a title="Lacto-ovo vegetarianism" href="http://en.wikipedia.org/wiki/Lacto-ovo_vegetarianism">lacto-ovovegetarianism</a> (the most common type of vegetarianism in the<a title="Western world" href="http://en.wikipedia.org/wiki/Western_world">Westernworld</a>),<a title="Egg (food)" href="http://en.wikipedia.org/wiki/Egg_(food)">eggs</a>and<a title="Dairy product" href="http://en.wikipedia.org/wiki/Dairy_product">dairyproducts</a> such as<a title="Milk" href="http://en.wikipedia.org/wiki/Milk">milk</a> and<a title="Cheese" href="http://en.wikipedia.org/wiki/Cheese">cheese</a> arepermitted. For<a title="Lacto vegetarianism" href="http://en.wikipedia.org/wiki/Lacto_vegetarianism">lactovegetarianism</a>, the earliest known type of vegetarianism (recorded in<a title="India" href="http://en.wikipedia.org/wiki/India">India</a>),<a title="Dairy product" href="http://en.wikipedia.org/wiki/Dairy_product">dairyproducts</a> such as<a title="Milk" href="http://en.wikipedia.org/wiki/Milk">milk</a> and<a title="Cheese" href="http://en.wikipedia.org/wiki/Cheese">cheese</a> arepermitted.<sup><a href="http://en.wikipedia.org/wiki/Vegetarian_cuisine#cite_note-0">[1]</a></sup>The strictest forms of vegetarianism are<a title="Veganism" href="http://en.wikipedia.org/wiki/Veganism">veganism</a>and<a title="Fruitarianism" href="http://en.wikipedia.org/wiki/Fruitarianism">fruitarianism</a>,which exclude all<a title="Animal product" href="http://en.wikipedia.org/wiki/Animal_product">animalproducts</a>, including dairy products as well as<a title="Honey" href="http://en.wikipedia.org/wiki/Honey">honey</a>, and evensome refined<a title="Sugar" href="http://en.wikipedia.org/wiki/Sugar">sugars</a> iffiltered and whitened with<a title="Bone char" href="http://en.wikipedia.org/wiki/Bone_char">bonechar</a>.</p><h2>Classification  </h2><p>Vegetarian foods can be classified into several different types:</p><ul><li>Traditional foods that have always been<a title="Vegetarian" href="http://en.wikipedia.org/wiki/Vegetarian">vegetarian</a>(<a title="Cereal" href="http://en.wikipedia.org/wiki/Cereal">cereals</a>/grains,<a title="Fruit" href="http://en.wikipedia.org/wiki/Fruit">fruits</a>,<a title="Vegetable" href="http://en.wikipedia.org/wiki/Vegetable">vegetables</a>,<a title="Nut (fruit)" href="http://en.wikipedia.org/wiki/Nut_(fruit)">nuts</a>,etc.)</li><li>Soy products including<a title="Tofu" href="http://en.wikipedia.org/wiki/Tofu">tofu</a> and<a title="Tempeh" href="http://en.wikipedia.org/wiki/Tempeh">tempeh</a> whichare common protein sources</li><li><a title="Textured vegetable protein" href="http://en.wikipedia.org/wiki/Textured_vegetable_protein">Texturedvegetable protein</a> (TVP), made from defatted soy flour, often included inchili and burger recipes in place of ground meat</li><li><a title="Meat analogue" href="http://en.wikipedia.org/wiki/Meat_analogue">Meatanalogues</a>, which mimic the taste, texture, and appearance of meat and areoften used in<a title="Recipe" href="http://en.wikipedia.org/wiki/Recipe">recipes</a> thattraditionally contained meat.</li><li>Vegans may also use analogues for eggs and dairy products</li></ul><h2>Suitable for vegetarians?  </h2><p>Food regarded as suitable for vegetarians typically includes:</p><ul><li><a title="Cereal" href="http://en.wikipedia.org/wiki/Cereal">Cereals</a>/<a title="Grain" href="http://en.wikipedia.org/wiki/Grain">grains</a>:<a title="Maize" href="http://en.wikipedia.org/wiki/Maize">maize</a>,<a title="Hempseed" href="http://en.wikipedia.org/wiki/Hempseed">hempseed</a>,<a title="Sweet corn" href="http://en.wikipedia.org/wiki/Sweet_corn">corn</a>,<a title="Wheat" href="http://en.wikipedia.org/wiki/Wheat">wheat</a>,<a title="Rice" href="http://en.wikipedia.org/wiki/Rice">rice</a>,<a title="Barley" href="http://en.wikipedia.org/wiki/Barley">barley</a>,<a title="Sorghum" href="http://en.wikipedia.org/wiki/Sorghum">sorghum</a>,<a title="Millet" href="http://en.wikipedia.org/wiki/Millet">millet</a>,<a title="Oat" href="http://en.wikipedia.org/wiki/Oat">oats</a>,<a title="Rye" href="http://en.wikipedia.org/wiki/Rye">rye</a>,<a title="Triticale" href="http://en.wikipedia.org/wiki/Triticale">triticale</a>,<a title="Buckwheat" href="http://en.wikipedia.org/wiki/Buckwheat">buckwheat</a>,<a title="Fonio" href="http://en.wikipedia.org/wiki/Fonio">fonio</a>,<a title="Quinoa" href="http://en.wikipedia.org/wiki/Quinoa">quinoa</a>; derivedproducts such as<a title="Flour" href="http://en.wikipedia.org/wiki/Flour">flour</a>(<a title="Dough" href="http://en.wikipedia.org/wiki/Dough">dough</a>,<a title="Bread" href="http://en.wikipedia.org/wiki/Bread">bread</a>,<a title="Pasta" href="http://en.wikipedia.org/wiki/Pasta">pasta</a>,<a title="Baking" href="http://en.wikipedia.org/wiki/Baking">baked goods</a>).</li><li><a title="Vegetable" href="http://en.wikipedia.org/wiki/Vegetable">Vegetables</a>(fresh or<a title="Pickling" href="http://en.wikipedia.org/wiki/Pickling">pickled</a>)and<a title="Edible mushroom" href="http://en.wikipedia.org/wiki/Edible_mushroom">mushrooms</a>(though somestrict<sup>[<em><a title="Wikipedia:Please clarify" href="http://en.wikipedia.org/wiki/Wikipedia:Please_clarify">clarificationneeded</a></em>]</sup> Indian vegetarians do not eat mushrooms); derivedproducts such as<a title="Vegetable fats and oils" href="http://en.wikipedia.org/wiki/Vegetable_fats_and_oils">vegetablefats and oils</a></li><li><a title="Fruit" href="http://en.wikipedia.org/wiki/Fruit">Fruit</a> (freshor<a title="Dried fruit" href="http://en.wikipedia.org/wiki/Dried_fruit">dried</a>)</li><li><a title="Legumes" href="http://en.wikipedia.org/wiki/Legumes">Legumes</a>:<a title="Bean" href="http://en.wikipedia.org/wiki/Bean">beans</a> (including<a title="Soybean" href="http://en.wikipedia.org/wiki/Soybean">soybeans</a> andsoy products such as<a title="Tempeh" href="http://en.wikipedia.org/wiki/Tempeh">tempeh</a>,<a title="Tofu" href="http://en.wikipedia.org/wiki/Tofu">tofu</a>,<a title="Soy milk" href="http://en.wikipedia.org/wiki/Soy_milk">soy milk</a>,and<a title="Textured vegetable protein" href="http://en.wikipedia.org/wiki/Textured_vegetable_protein">TVP</a>),<a title="Chickpea" href="http://en.wikipedia.org/wiki/Chickpea">chickpeas</a>,<a title="Pea" href="http://en.wikipedia.org/wiki/Pea">peas</a>,<a title="Lentil" href="http://en.wikipedia.org/wiki/Lentil">lentils</a>,<a title="Peanut" href="http://en.wikipedia.org/wiki/Peanut">peanuts</a>)</li><li><a title="Nut (fruit)" href="http://en.wikipedia.org/wiki/Nut_(fruit)">Treenuts</a> and<a title="List of edible seeds" href="http://en.wikipedia.org/wiki/List_of_edible_seeds">seeds</a></li><li><a title="Spice" href="http://en.wikipedia.org/wiki/Spice">Spices</a> and<a title="Herb" href="http://en.wikipedia.org/wiki/Herb">herbs</a></li><li>Other foods such as<a title="Seaweed" href="http://en.wikipedia.org/wiki/Seaweed">seaweed</a>(however seaweed is considered inedible by some strict vegetarians for the samereason it can be considered as non-kosher by some: the possibility that varioustiny animals may be found adhering toit.)<sup><a href="http://en.wikipedia.org/wiki/Vegetarian_cuisine#cite_note-1">[2]</a></sup></li></ul><p>Food suitable for several types of the vegetarian cuisine:</p><ul><li><a title="Dairy product" href="http://en.wikipedia.org/wiki/Dairy_product">Dairyproducts</a>(<a title="Milk" href="http://en.wikipedia.org/wiki/Milk">milk</a>,<a title="Butter" href="http://en.wikipedia.org/wiki/Butter">butter</a>,<a title="Cheese" href="http://en.wikipedia.org/wiki/Cheese">cheese</a> (exceptfor cheese containing<a title="Rennet" href="http://en.wikipedia.org/wiki/Rennet">rennet</a> ofanimal origin),<a title="Yogurt" href="http://en.wikipedia.org/wiki/Yogurt">yogurt</a>(excluding yogurt made with<a title="Gelatin" href="http://en.wikipedia.org/wiki/Gelatin">gelatin</a>),etc.) – <em>not eaten by vegans and pure ovo-vegetarians</em></li><li>Eggs – <em>not eaten by vegans and pure lacto-vegetarians</em></li><li>Honey – <em>not eaten by most vegans</em></li></ul></body></html>';
+    var html2Tree = Hippo.Richtext.TestUtils.createTree(html2);
+
+    describe('xinha indenter', function () {
+
+        var xinhaIndented1 = Hippo.Richtext.TestUtils.createTree(Xinha.indent(html));
+
+        it ('should not have changed html', function() {
+            expect(Hippo.Richtext.TestUtils.treesEqual(htmlTree, xinhaIndented1), true);
+        });
+
+        var xinhaIndented2 = Hippo.Richtext.TestUtils.createTree(Xinha.indent(html2));
+
+        it ('should not have changed html2', function() {
+            expect(Hippo.Richtext.TestUtils.treesEqual(html2Tree, xinhaIndented2), true);
+        });
+
+    });
+
+    describe('html beautifier', function () {
+
+        var beautifiedTree1 = JSBEAUTIFY.style_html(html, {max_char: 120});
+
+        it ('should not have changed ', function() {
+            expect(Hippo.Richtext.TestUtils.treesEqual(htmlTree, beautifiedTree1), true);
+        });
+
+        var beautifiedTree2 = JSBEAUTIFY.style_html(html2, {max_char: 120});
+
+        it ('should not have changed html2', function() {
+            expect(Hippo.Richtext.TestUtils.treesEqual(html2Tree, beautifiedTree2), true);
+        });
+
+    });
+
+    describe('xinha indenter vs. html beautifier', function() {
+        var xinhaIndented1 = Hippo.Richtext.TestUtils.createTree(Xinha.indent(html));
+        var beautifiedTree1 = Hippo.Richtext.TestUtils.createTree(JSBEAUTIFY.style_html(html, {max_char: 120}));
+
+        it ('should not have changed html', function() {
+            expect(Hippo.Richtext.TestUtils.treesEqual(xinhaIndented1, beautifiedTree1), true);
+        });
+
+        var xinhaIndented2 = Hippo.Richtext.TestUtils.createTree(Xinha.indent(html2));
+        var beautifiedTree2 = Hippo.Richtext.TestUtils.createTree(JSBEAUTIFY.style_html(html2, {max_char: 120}));
+
+        it ('should not have changed html2', function() {
+            expect(Hippo.Richtext.TestUtils.treesEqual(xinhaIndented2, beautifiedTree2))
+        });
+    });
+
+});
