typo 5.0.3.98.1 → 5.1

data/app/views/admin/textfilters/new.html.erb

@@ -1,5 +1,7 @@
   <% @page_heading = _('Create Text Filter') %>
-  <% subtabs_for(:sidebar) %>
+  <% content_for('tasks') do %>
+    <%= task_overview %>
+  <% end %>
   <% form_tag({ :action => "new" }, :id => "textfilter_form") do %>
 
   <div class="admin">

data/app/views/admin/trackbacks/show.html.erb

@@ -1,7 +1,7 @@
   <% @page_heading = _("Trackbacks for") + " #{ link_to h(@article.title), :controller => '/admin/content', :action => 'show', :id => @article }" %>
 
   <% content_for('tasks') do %>
-    <%= task_edit _('Edit this trackback'), @trackback.id %>
+    <%= task_overview %>
   <% end %>
 
   <div class="form">

data/app/views/admin/users/destroy.html.erb

@@ -1,7 +1,7 @@
   <% @page_heading = _('Users') %>
 
   <% content_for('tasks') do %>
-    <%= task_show _('Show this user'), @user.id %>
+    <%= task_overview %>
   <% end %>
 
   <h3><%= _("Really delete user")%> "<%= @user.name || @user.login %>" ?</h3>

data/app/views/admin/users/edit.html.erb

@@ -1,9 +1,5 @@
   <% @page_heading = _('Edit User') %>
-  <% content_for('tasks') do %>
-    <%= task_overview %>
-    <%= tab _("New User"), :controller=>"users", :action=>"new"%>
-  <% end%>
-
+  <% subtabs_for(:users) %>
   <% form_tag :action=>"edit", :id => @user.id do %>
 
   <div class="admin">

data/app/views/admin/users/index.html.erb

@@ -1,4 +1,4 @@
-  <% @page_heading = _('Users') + ' <span> &raquo; '+ link_to('add new', :action=>'new') +'</span>'%>
+  <% @page_heading = _('Users') + ' <span> &raquo; '+ link_to('add new', :action=>'new') +'</span>' %>
   <% subtabs_for(:users) %>
 
 <div class="list">

data/app/views/articles/_comment_failed.html.erb

@@ -0,0 +1,3 @@
+<li>
+  <%= _("Opps, something wrong happened, the comment could not be saved")%>
+</li>

data/config/initializers/access_rules.rb

@@ -65,8 +65,8 @@ AccessControl.map :require => [ :admin, :publisher ]  do |map|
   end
 
   map.project_module :feedback, nil do |project|
-    project.menu    _("Feedback"),              { :controller => "admin/feedback",  :action     => "index" }
-    project.submenu _("Unapproved comments"),   { :controller => "admin/feedback",  :action     => "index" }    
+    project.menu    _("Feedback"),              { :controller => "admin/feedback",  :confirmed => "f" }
+    project.submenu _("Unapproved comments"),   { :controller => "admin/feedback",  :confirmed     => "f" }    
     project.submenu _("Limit to spam"),         { :controller => "admin/feedback",  :published  => "f" }
     project.submenu _("Blacklist"),             { :controller => "admin/blacklist", :action => "index" }
     project.submenu _(""),                      { :controller => "admin/comments", :action => "show" }
@@ -88,7 +88,6 @@ AccessControl.map :require => [ :admin, :publisher ]  do |map|
   
   map.project_module :sidebar, "admin/sidebar" do |project|
     project.menu    _("Sidebar"),               { :action     => "index" }
-    project.submenu _("Text Filters"),          { :controller => "textfilters", :action => "index" }
   end  
   
   map.project_module :users, "admin/users" do |project|
@@ -104,6 +103,7 @@ AccessControl.map :require => [ :admin, :publisher ]  do |map|
     project.submenu _("Feedback"),              { :controller => "admin/settings", :action => "feedback" }			
     project.submenu _("Spam"),                  { :controller => "admin/settings", :action => "spam" }
     project.submenu _("Podcasts"),              { :controller => "admin/settings", :action => "podcast" }
+    project.submenu _("Text Filters"),          { :controller => "admin/textfilters", :action => "index" }
     project.submenu _("Empty Fragment Cache"),  { :controller => "admin/cache",    :action => "sweep" }
     project.submenu _("Rebuild cached HTML"),   { :controller => "admin/cache",    :action => "sweep_html" }
   end  

data/db/migrate/070_add_users_to_non_admins.rb

@@ -0,0 +1,17 @@
+class AddUsersToNonAdmins < ActiveRecord::Migration
+  class Profile < ActiveRecord::Base
+    include BareMigration
+
+    serialize :profiles
+  end
+
+  def self.up
+    Profile.find_by_label("publisher").update_attributes(:modules => [:dashboard, :write, :content, :feedback, :users ])
+    Profile.find_by_label("contributor").update_attributes(:modules => [:dashboard, :users ])
+  end
+
+  def self.down
+    Profile.find_by_label("publisher").update_attributes(:modules => [:dashboard, :write, :content, :feedback ])
+    Profile.find_by_label("contributor").update_attributes(:modules => [])
+  end
+end

data/installer/rails_installer_defaults.yml

@@ -1,5 +1,5 @@
 --- 
 rails-environment: production
-database: sqlite
+database: mysql
 web-server: mongrel
 threads: 2

data/lib/tasks/release.rake

@@ -1,7 +1,7 @@
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
 
-PKG_VERSION = "5.0.3.98.1"
+PKG_VERSION = "5.1"
 PKG_NAME = "typo"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 RUBY_FORGE_PROJECT = 'typo'
@@ -33,14 +33,14 @@ spec = Gem::Specification.new do |s|
   s.add_dependency("rails", "= 2.0.2")
   s.add_dependency("mongrel", ">= 1.1.3")
   s.add_dependency("mongrel_cluster", ">= 0.2.0")
-  s.add_dependency("sqlite3-ruby", ">= 1.1.0")
+  s.add_dependency("mysql", ">= 2.7")
   s.add_dependency("rails-app-installer", ">= 0.2.0")
   s.add_dependency("ruby-debug", ">= 0.10.1")
   s.add_dependency("flexmock", ">= 0.8.2")
 end
 
 Rake::GemPackageTask.new(spec) do |p|
-#  p.gem_spec = spec
+  p.gem_spec = spec
   p.need_tar = true
   p.need_zip = true
 end

data/lib/typo_version.rb

@@ -1 +1 @@
-TYPO_VERSION = '5.0.3.98.1'
+TYPO_VERSION = '5.1'

data/public/javascripts/controls.js

@@ -1,3 +1,5 @@
+// script.aculo.us controls.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008
+
 // Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
 //           (c) 2005-2007 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
 //           (c) 2005-2007 Jon Tirsen (http://www.tirsen.com)

data/public/javascripts/dragdrop.js

@@ -1,3 +1,5 @@
+// script.aculo.us dragdrop.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008
+
 // Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
 //           (c) 2005-2007 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz)
 // 

data/public/javascripts/effects.js

@@ -1,3 +1,5 @@
+// script.aculo.us effects.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008
+
 // Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
 // Contributors:
 //  Justin Palmer (http://encytemedia.com/)
@@ -1074,11 +1076,11 @@ if (document.defaultView && document.defaultView.getComputedStyle) {
   Element.getStyles = function(element) {
     element = $(element);
     var css = element.currentStyle, styles;
-    styles = Element.CSS_PROPERTIES.inject({ }, function(hash, property) {
-      hash.set(property, css[property]);
-      return hash;
+    styles = Element.CSS_PROPERTIES.inject({ }, function(results, property) {
+      results[property] = css[property];
+      return results;
     });
-    if (!styles.opacity) styles.set('opacity', element.getOpacity());
+    if (!styles.opacity) styles.opacity = element.getOpacity();
     return styles;
   };
 };

data/public/javascripts/fckeditor/editor/_source/classes/fckcontextmenu.js

@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -26,7 +26,7 @@ var FCKContextMenu = function( parentWindow, langDir )
 	this.CtrlDisable = false ;
 
 	var oPanel = this._Panel = new FCKPanel( parentWindow ) ;
-	oPanel.AppendStyleSheet( FCKConfig.SkinPath + 'fck_editor.css' ) ;
+	oPanel.AppendStyleSheet( FCKConfig.SkinEditorCSS ) ;
 	oPanel.IsContextMenu = true ;
 
 	// The FCKTools.DisableSelection doesn't seems to work to avoid dragging of the icons in Mozilla
@@ -56,9 +56,13 @@ FCKContextMenu.prototype.SetMouseClickWindow = function( mouseClickWindow )
 	}
 }
 
-FCKContextMenu.prototype.AddItem = function( name, label, iconPathOrStripInfoArrayOrIndex, isDisabled )
+/**
+ The customData parameter is just a value that will be send to the command that is executed,
+ so it's possible to reuse the same command for several items just by assigning different data for each one.
+*/
+FCKContextMenu.prototype.AddItem = function( name, label, iconPathOrStripInfoArrayOrIndex, isDisabled, customData )
 {
-	var oItem = this._MenuBlock.AddItem( name, label, iconPathOrStripInfoArrayOrIndex, isDisabled) ;
+	var oItem = this._MenuBlock.AddItem( name, label, iconPathOrStripInfoArrayOrIndex, isDisabled, customData ) ;
 	this._Redraw = true ;
 	return oItem ;
 }
@@ -122,7 +126,7 @@ function FCKContextMenu_Document_OnMouseDown( e )
 			var overrideButton = FCKContextMenu_OverrideButton ;
 			if( !overrideButton )
 			{
-				var doc = e.target.ownerDocument ;
+				var doc = FCKTools.GetElementDocument( e.target ) ;
 				overrideButton = FCKContextMenu_OverrideButton = doc.createElement('input') ;
 				overrideButton.type = 'button' ;
 				var buttonHolder = doc.createElement('p') ;
@@ -130,8 +134,8 @@ function FCKContextMenu_Document_OnMouseDown( e )
 				buttonHolder.appendChild( overrideButton ) ;
 			}
 
-			overrideButton.style.cssText = 'position:absolute;top:' + ( e.clientY - 2 ) + 
-				'px;left:' + ( e.clientX - 2 ) + 
+			overrideButton.style.cssText = 'position:absolute;top:' + ( e.clientY - 2 ) +
+				'px;left:' + ( e.clientX - 2 ) +
 				'px;width:5px;height:5px;opacity:0.01' ;
 		}
 		el = el.parentNode ;
@@ -155,6 +159,7 @@ function FCKContextMenu_Document_OnMouseUp( e )
 			return false ;
 		}
 	}
+	return true ;
 }
 
 function FCKContextMenu_AttachedElement_OnContextMenu( ev, fckContextMenu, el )
@@ -175,7 +180,7 @@ function FCKContextMenu_AttachedElement_OnContextMenu( ev, fckContextMenu, el )
 		fckContextMenu._MenuBlock.Create( fckContextMenu._Panel.MainNode ) ;
 		fckContextMenu._Redraw = false ;
 	}
-	
+
 	// This will avoid that the content of the context menu can be dragged in IE
 	// as the content of the panel is recreated we need to do it every time
 	FCKTools.DisableSelection( fckContextMenu._Panel.Document.body ) ;

data/public/javascripts/fckeditor/editor/_source/classes/fckdataprocessor.js

@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -116,4 +116,4 @@ FCKDataProcessor.prototype =
 	{
 		return html ;
 	}
-} ;
+} ;

data/public/javascripts/fckeditor/editor/_source/classes/fckdocumentfragment_gecko.js

@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -43,4 +43,4 @@ FCKDocumentFragment.prototype =
 	{
 		FCKDomTools.InsertAfterNode( existingNode, this.RootNode ) ;
 	}
-}
+}

data/public/javascripts/fckeditor/editor/_source/classes/fckdocumentfragment_ie.js

@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -55,4 +55,4 @@ FCKDocumentFragment.prototype =
 		while( ( eLast = eRoot.lastChild ) )
 			FCKDomTools.InsertAfterNode( existingNode, eRoot.removeChild( eLast ) ) ;
 	}
-} ;
+} ;

data/public/javascripts/fckeditor/editor/_source/classes/fckdomrange.js

@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -98,12 +98,15 @@ FCKDomRange.prototype =
 			this._UpdateElementInfo() ;
 			return docFrag ;
 		}
+		return null ;
 	},
 
 	CheckIsCollapsed : function()
 	{
 		if ( this._Range )
 			return this._Range.collapsed ;
+
+		return false ;
 	},
 
 	Collapse : function( toStart )
@@ -145,12 +148,20 @@ FCKDomRange.prototype =
 	// is "<p><b><i>^</i></b> Text</p>" (inside <i>).
 	MoveToElementEditStart : function( targetElement )
 	{
-		var child ;
+		var editableElement ;
+
+		while ( targetElement && targetElement.nodeType == 1 )
+		{
+			if ( FCKDomTools.CheckIsEditable( targetElement ) )
+				editableElement = targetElement ;
+			else if ( editableElement )
+				break ;		// If we already found an editable element, stop the loop.
 
-		while ( ( child = targetElement.firstChild ) && child.nodeType == 1 && FCKListsLib.EmptyElements[ child.nodeName.toLowerCase() ] == null )
-			targetElement = child ;
+			targetElement = targetElement.firstChild ;
+		}
 
-		this.MoveToElementStart( targetElement ) ;
+		if ( editableElement )
+			this.MoveToElementStart( editableElement ) ;
 	},
 
 	InsertNode : function( node )
@@ -173,93 +184,150 @@ FCKDomRange.prototype =
 		return ( eToolDiv.innerHTML.length == 0 ) ;
 	},
 
+	/**
+	 * Checks if the start boundary of the current range is "visually" (like a
+	 * selection caret) at the beginning of the block. It means that some
+	 * things could be brefore the range, like spaces or empty inline elements,
+	 * but it would still be considered at the beginning of the block.
+	 */
 	CheckStartOfBlock : function()
 	{
-		var bIsStartOfBlock = this._Cache.IsStartOfBlock ;
+		var cache = this._Cache ;
+		var bIsStartOfBlock = cache.IsStartOfBlock ;
 
 		if ( bIsStartOfBlock != undefined )
 			return bIsStartOfBlock ;
 
-		// Create a clone of the current range.
-		var oTestRange = this.Clone() ;
+		// Take the block reference.
+		var block = this.StartBlock || this.StartBlockLimit ;
 
-		// Collapse it to its start point.
-		oTestRange.Collapse( true ) ;
+		var container	= this._Range.startContainer ;
+		var offset		= this._Range.startOffset ;
+		var currentNode ;
 
-		// Move the start boundary to the start of the block.
-		oTestRange.SetStart( oTestRange.StartBlock || oTestRange.StartBlockLimit, 1 ) ;
+		if ( offset > 0 )
+		{
+			// First, check the start container. If it is a text node, get the
+			// substring of the node value before the range offset.
+			if ( container.nodeType == 3 )
+			{
+				var textValue = container.nodeValue.substr( 0, offset ).Trim() ;
 
-		if ( oTestRange.CheckIsCollapsed() )
-			bIsStartOfBlock = true ;
-		else
+				// If we have some text left in the container, we are not at
+				// the end for the block.
+				if ( textValue.length != 0 )
+					return cache.IsStartOfBlock = false ;
+			}
+			else
+				currentNode = container.childNodes[ offset - 1 ] ;
+		}
+
+		// We'll not have a currentNode if the container was a text node, or
+		// the offset is zero.
+		if ( !currentNode )
+			currentNode = FCKDomTools.GetPreviousSourceNode( container, true, null, block ) ;
+
+		while ( currentNode )
 		{
-			// Inserts the contents of the range in a div tag.
-			var eToolDiv = oTestRange.Window.document.createElement( 'div' ) ;
-			oTestRange._Range.cloneContents().AppendTo( eToolDiv ) ;
+			switch ( currentNode.nodeType )
+			{
+				case 1 :
+					// It's not an inline element.
+					if ( !FCKListsLib.InlineChildReqElements[ currentNode.nodeName.toLowerCase() ] )
+						return cache.IsStartOfBlock = false ;
 
-			// This line is why we don't use CheckIsEmpty() here...
-			// Because using RTrimNode() or TrimNode() would be incorrect - 
-			// TrimNode() and RTrimNode() would delete <br> nodes at the end of the div node,
-			// but for checking start of block they are actually meaningful. (Bug #1350)
-			FCKDomTools.LTrimNode( eToolDiv ) ;
+					break ;
 
-			bIsStartOfBlock = ( eToolDiv.innerHTML.length == 0 ) ;
-		}
+				case 3 :
+					// It's a text node with real text.
+					if ( currentNode.nodeValue.Trim().length > 0 )
+						return cache.IsStartOfBlock = false ;
+			}
 
-		oTestRange.Release() ;
+			currentNode = FCKDomTools.GetPreviousSourceNode( currentNode, false, null, block ) ;
+		}
 
-		return ( this._Cache.IsStartOfBlock = bIsStartOfBlock ) ;
+		return cache.IsStartOfBlock = true ;
 	},
 
+	/**
+	 * Checks if the end boundary of the current range is "visually" (like a
+	 * selection caret) at the end of the block. It means that some things
+	 * could be after the range, like spaces, empty inline elements, or a
+	 * single <br>, but it would still be considered at the end of the block.
+	 */
 	CheckEndOfBlock : function( refreshSelection )
 	{
-		var bIsEndOfBlock = this._Cache.IsEndOfBlock ;
+		var isEndOfBlock = this._Cache.IsEndOfBlock ;
 
-		if ( bIsEndOfBlock != undefined )
-			return bIsEndOfBlock ;
+		if ( isEndOfBlock != undefined )
+			return isEndOfBlock ;
 
-		// Create a clone of the current range.
-		var oTestRange = this.Clone() ;
+		// Take the block reference.
+		var block = this.EndBlock || this.EndBlockLimit ;
 
-		// Collapse it to its end point.
-		oTestRange.Collapse( false ) ;
+		var container	= this._Range.endContainer ;
+		var offset			= this._Range.endOffset ;
+		var currentNode ;
 
-		// Move the end boundary to the end of the block.
-		oTestRange.SetEnd( oTestRange.EndBlock || oTestRange.EndBlockLimit, 2 ) ;
+		// First, check the end container. If it is a text node, get the
+		// substring of the node value after the range offset.
+		if ( container.nodeType == 3 )
+		{
+			var textValue = container.nodeValue ;
+			if ( offset < textValue.length )
+			{
+				textValue = textValue.substr( offset ) ;
 
-		bIsEndOfBlock = oTestRange.CheckIsCollapsed() ;
+				// If we have some text left in the container, we are not at
+				// the end for the block.
+				if ( textValue.Trim().length != 0 )
+					return this._Cache.IsEndOfBlock = false ;
+			}
+		}
+		else
+			currentNode = container.childNodes[ offset ] ;
+
+		// We'll not have a currentNode if the container was a text node, of
+		// the offset is out the container children limits (after it probably).
+		if ( !currentNode )
+			currentNode = FCKDomTools.GetNextSourceNode( container, true, null, block ) ;
 
-		if ( !bIsEndOfBlock )
+		var hadBr = false ;
+
+		while ( currentNode )
 		{
-			// Inserts the contents of the range in a div tag.
-			var eToolDiv = this.Window.document.createElement( 'div' ) ;
-			oTestRange._Range.cloneContents().AppendTo( eToolDiv ) ;
-			FCKDomTools.TrimNode( eToolDiv ) ;
-
-			// Find out if we are in an empty tree of inline elements, like <b><i><span></span></i></b>
-			bIsEndOfBlock = true ;
-			var eLastChild = eToolDiv ;
-			while ( ( eLastChild = eLastChild.lastChild ) )
+			switch ( currentNode.nodeType )
 			{
-				// Check the following:
-				//		1. Is there more than one node in the parents children?
-				//		2. Is the node not an element node?
-				//		3. Is it not a inline element.
-				if ( eLastChild.previousSibling || eLastChild.nodeType != 1 || FCKListsLib.InlineChildReqElements[ eLastChild.nodeName.toLowerCase() ] == null )
-				{
-					// So we are not in the end of the range.
-					bIsEndOfBlock = false ;
-					break ;
-				}
+				case 1 :
+					var nodeName = currentNode.nodeName.toLowerCase() ;
+
+					// It's an inline element.
+					if ( FCKListsLib.InlineChildReqElements[ nodeName ] )
+						break ;
+
+					// It is the first <br> found.
+					if ( nodeName == 'br' && !hadBr )
+					{
+						hadBr = true ;
+						break ;
+					}
+
+					return this._Cache.IsEndOfBlock = false ;
+
+				case 3 :
+					// It's a text node with real text.
+					if ( currentNode.nodeValue.Trim().length > 0 )
+						return this._Cache.IsEndOfBlock = false ;
 			}
-		}
 
-		oTestRange.Release() ;
+			currentNode = FCKDomTools.GetNextSourceNode( currentNode, false, null, block ) ;
+		}
 
 		if ( refreshSelection )
 			this.Select() ;
 
-		return this._Cache.IsEndOfBlock = bIsEndOfBlock ;
+		return this._Cache.IsEndOfBlock = true ;
 	},
 
 	// This is an "intrusive" way to create a bookmark. It includes <span> tags
@@ -320,7 +388,7 @@ FCKDomRange.prototype =
 			oBookmark.StartNode = eStartSpan ;
 			oBookmark.EndNode = eEndSpan ;
 		}
-		
+
 		// Update the range position.
 		if ( eEndSpan )
 		{
@@ -329,7 +397,7 @@ FCKDomRange.prototype =
 		}
 		else
 			this.MoveToPosition( eStartSpan, 4 ) ;
-		
+
 		return oBookmark ;
 	},
 
@@ -382,22 +450,58 @@ FCKDomRange.prototype =
 			"Start" : [ this._Range.startOffset ],
 			"End" : [ this._Range.endOffset ]
 		} ;
+		// Since we're treating the document tree as normalized, we need to backtrack the text lengths
+		// of previous text nodes into the offset value.
 		var curStart = this._Range.startContainer.previousSibling ;
 		var curEnd = this._Range.endContainer.previousSibling ;
+
+		// Also note that the node that we use for "address base" would change during backtracking.
+		var addrStart = this._Range.startContainer ;
+		var addrEnd = this._Range.endContainer ;
 		while ( curStart && curStart.nodeType == 3 )
 		{
 			bookmark.Start[0] += curStart.length ;
+			addrStart = curStart ;
 			curStart = curStart.previousSibling ;
 		}
 		while ( curEnd && curEnd.nodeType == 3 )
 		{
 			bookmark.End[0] += curEnd.length ;
+			addrEnd = curEnd ;
 			curEnd = curEnd.previousSibling ;
 		}
+
+		// If the object pointed to by the startOffset and endOffset are text nodes, we need
+		// to backtrack and add in the text offset to the bookmark addresses.
+		if ( addrStart.nodeType == 1 && addrStart.childNodes[bookmark.Start[0]] && addrStart.childNodes[bookmark.Start[0]].nodeType == 3 )
+		{
+			var curNode = addrStart.childNodes[bookmark.Start[0]] ;
+			var offset = 0 ;
+			while ( curNode.previousSibling && curNode.previousSibling.nodeType == 3 )
+			{
+				curNode = curNode.previousSibling ;
+				offset += curNode.length ;
+			}
+			addrStart = curNode ;
+			bookmark.Start[0] = offset ;
+		}
+		if ( addrEnd.nodeType == 1 && addrEnd.childNodes[bookmark.End[0]] && addrEnd.childNodes[bookmark.End[0]].nodeType == 3 )
+		{
+			var curNode = addrEnd.childNodes[bookmark.End[0]] ;
+			var offset = 0 ;
+			while ( curNode.previousSibling && curNode.previousSibling.nodeType == 3 )
+			{
+				curNode = curNode.previousSibling ;
+				offset += curNode.length ;
+			}
+			addrEnd = curNode ;
+			bookmark.End[0] = offset ;
+		}
+
 		// Then, we record down the precise position of the container nodes
 		// by walking up the DOM tree and counting their childNode index
-		bookmark.Start = FCKDomTools.GetNodeAddress( this._Range.startContainer, true ).concat( bookmark.Start ) ;
-		bookmark.End = FCKDomTools.GetNodeAddress( this._Range.endContainer, true ).concat( bookmark.End ) ;
+		bookmark.Start = FCKDomTools.GetNodeAddress( addrStart, true ).concat( bookmark.Start ) ;
+		bookmark.End = FCKDomTools.GetNodeAddress( addrEnd, true ).concat( bookmark.End ) ;
 		return bookmark;
 	},
 
@@ -530,7 +634,7 @@ FCKDomRange.prototype =
 
 					if ( oNode.nodeType != 1 )
 						oNode = oNode.previousSibling ? null : oNode.parentNode ;
-					
+
 					if ( oNode )
 					{
 						while ( FCKListsLib.InlineNonEmptyElements[ oNode.nodeName.toLowerCase() ] )
@@ -643,7 +747,7 @@ FCKDomRange.prototype =
 	 * It returns and object with the following properties:
 	 *		- PreviousBlock	: a reference to the block element that preceeds
 	 *		  the range after the split.
-	 *		- NextBlock : a reference to the block element that preceeds the
+	 *		- NextBlock : a reference to the block element that follows the
 	 *		  range after the split.
 	 *		- WasStartOfBlock : a boolean indicating that the range was
 	 *		  originaly at the start of the block.
@@ -654,8 +758,10 @@ FCKDomRange.prototype =
 	 * and the PreviousBlock value will be null. The same is valid for the
 	 * NextBlock value if the range was at the end of the block.
 	 */
-	SplitBlock : function()
+	SplitBlock : function( forceBlockTag )
 	{
+		var blockTag = forceBlockTag || FCKConfig.EnterMode ;
+
 		if ( !this._Range )
 			this.MoveToSelection() ;
 
@@ -665,17 +771,18 @@ FCKDomRange.prototype =
 			// Get the current blocks.
 			var eStartBlock		= this.StartBlock ;
 			var eEndBlock		= this.EndBlock ;
+			var oElementPath	= null ;
 
-			if ( FCKConfig.EnterMode != 'br' )
+			if ( blockTag != 'br' )
 			{
 				if ( !eStartBlock )
 				{
-					eStartBlock = this.FixBlock( true ) ;
+					eStartBlock = this.FixBlock( true, blockTag ) ;
 					eEndBlock	= this.EndBlock ;	// FixBlock may have fixed the EndBlock too.
 				}
 
 				if ( !eEndBlock )
-					eEndBlock = this.FixBlock( false ) ;
+					eEndBlock = this.FixBlock( false, blockTag ) ;
 			}
 
 			// Get the range position.
@@ -690,11 +797,13 @@ FCKDomRange.prototype =
 			{
 				if ( bIsEndOfBlock )
 				{
+					oElementPath = new FCKElementPath( this.StartContainer ) ;
 					this.MoveToPosition( eEndBlock, 4 ) ;
 					eEndBlock = null ;
 				}
 				else if ( bIsStartOfBlock )
 				{
+					oElementPath = new FCKElementPath( this.StartContainer ) ;
 					this.MoveToPosition( eStartBlock, 3 ) ;
 					eStartBlock = null ;
 				}
@@ -727,7 +836,8 @@ FCKDomRange.prototype =
 				PreviousBlock	: eStartBlock,
 				NextBlock		: eEndBlock,
 				WasStartOfBlock : bIsStartOfBlock,
-				WasEndOfBlock	: bIsEndOfBlock
+				WasEndOfBlock	: bIsEndOfBlock,
+				ElementPath		: oElementPath
 			} ;
 		}
 
@@ -735,7 +845,7 @@ FCKDomRange.prototype =
 	},
 
 	// Transform a block without a block tag in a valid block (orphan text in the body or td, usually).
-	FixBlock : function( isStart )
+	FixBlock : function( isStart, blockTag )
 	{
 		// Bookmark the range so we can restore it later.
 		var oBookmark = this.CreateBookmark() ;
@@ -747,7 +857,7 @@ FCKDomRange.prototype =
 		this.Expand( 'block_contents' ) ;
 
 		// Create the fixed block.
-		var oFixedBlock = this.Window.document.createElement( FCKConfig.EnterMode ) ;
+		var oFixedBlock = this.Window.document.createElement( blockTag ) ;
 
 		// Move the contents of the temporary range to the fixed block.
 		this.ExtractContents().AppendTo( oFixedBlock ) ;
@@ -783,26 +893,26 @@ FCKDomRange.prototype =
 	{
 		return !!this._Range ;
 	},
-	
+
 	GetTouchedStartNode : function()
 	{
 		var range = this._Range ;
 		var container = range.startContainer ;
-		
+
 		if ( range.collapsed || container.nodeType != 1 )
 			return container ;
-		
+
 		return container.childNodes[ range.startOffset ] || container ;
 	},
-	
+
 	GetTouchedEndNode : function()
 	{
 		var range = this._Range ;
 		var container = range.endContainer ;
-		
+
 		if ( range.collapsed || container.nodeType != 1 )
 			return container ;
-		
+
 		return container.childNodes[ range.endOffset - 1 ] || container ;
 	}
 } ;