From 4bf77992875e0d614dc252d8758e84ad61d9a630 Mon Sep 17 00:00:00 2001
From: Tim <tim@widgit.com>
Date: Thu, 21 Aug 2014 23:54:01 +0100
Subject: [PATCH] Moved src/js to src

---
 builder/build.js                              |    2 +-
 demos/bold.html                               |   12 +-
 demos/bookmark.html                           |   10 +-
 demos/commands.html                           |   20 +-
 demos/commands_new.html                       |   20 +-
 demos/events.html                             |   14 +-
 demos/highlighter-old.html                    |   18 +-
 demos/highlighter.html                        |   16 +-
 demos/position.html                           |   12 +-
 demos/position2.html                          |   12 +-
 demos/scopedhighlights.html                   |   14 +-
 demos/textrange.html                          |   14 +-
 src/{js => }/core/core.js                     |  966 ++--
 src/{js => }/core/dom.js                      |  958 ++--
 src/{js => }/core/domrange.js                 |    0
 src/{js => }/core/wrappedrange.js             | 1248 +++---
 src/{js => }/core/wrappedselection.js         | 2008 ++++-----
 .../modules/commands/aryeh_implementation.js  |    0
 .../modules/commands/rangy-applyclass.js      |  362 +-
 src/{js => }/modules/commands/rangy-bold.js   |  220 +-
 .../modules/commands/rangy-bold_new.js        |  218 +-
 src/{js => }/modules/commands/rangy-italic.js |  174 +-
 src/{js => }/modules/rangy-classapplier.js    |    0
 src/{js => }/modules/rangy-commands.js        | 2996 ++++++-------
 src/{js => }/modules/rangy-commands_new.js    | 2718 +++++------
 src/{js => }/modules/rangy-events.js          |  266 +-
 src/{js => }/modules/rangy-highlighter-old.js |  516 +--
 src/{js => }/modules/rangy-highlighter.js     | 1180 ++---
 src/{js => }/modules/rangy-position.js        | 1074 ++---
 .../modules/rangy-selectionsaverestore.js     |  470 +-
 src/{js => }/modules/rangy-serializer.js      |  598 +--
 src/{js => }/modules/rangy-textcommands.js    | 1148 ++---
 src/{js => }/modules/rangy-textrange-old.js   | 3210 ++++++-------
 src/{js => }/modules/rangy-textrange.js       | 3980 ++++++++---------
 src/{js => }/modules/rangy-util.js            |  210 +-
 test/boldifier.html                           |   16 +-
 test/classapplier.html                        |   12 +-
 test/classappliertests.html                   |   12 +-
 test/commandnewtests.html                     |   14 +-
 test/commandtests.html                        |   14 +-
 test/controlrange.html                        |   10 +-
 test/controlrange2.html                       |   10 +-
 test/domrange.html                            |   10 +-
 test/featuretests.html                        |   10 +-
 test/highlightertests.html                    |   14 +-
 test/mutator.html                             |   14 +-
 test/mylib.html                               |    2 +-
 test/rangetests.html                          |    8 +-
 test/saverestore.html                         |   12 +-
 test/selectionsaverestoretests.html           |   12 +-
 test/selectiontests.html                      |   10 +-
 test/serializer.html                          |   12 +-
 test/serializertests.html                     |   12 +-
 test/textrangeperformance.html                |   12 +-
 test/textrangeperformancetests.html           |   10 +-
 test/textranges.html                          |   10 +-
 test/textrangetests-old.html                  |   12 +-
 test/textrangetests.html                      |   12 +-
 58 files changed, 12472 insertions(+), 12472 deletions(-)
 rename src/{js => }/core/core.js (97%)
 rename src/{js => }/core/dom.js (97%)
 rename src/{js => }/core/domrange.js (100%)
 rename src/{js => }/core/wrappedrange.js (97%)
 rename src/{js => }/core/wrappedselection.js (97%)
 rename src/{js => }/modules/commands/aryeh_implementation.js (100%)
 rename src/{js => }/modules/commands/rangy-applyclass.js (97%)
 rename src/{js => }/modules/commands/rangy-bold.js (97%)
 rename src/{js => }/modules/commands/rangy-bold_new.js (97%)
 rename src/{js => }/modules/commands/rangy-italic.js (97%)
 rename src/{js => }/modules/rangy-classapplier.js (100%)
 rename src/{js => }/modules/rangy-commands.js (97%)
 rename src/{js => }/modules/rangy-commands_new.js (97%)
 rename src/{js => }/modules/rangy-events.js (97%)
 rename src/{js => }/modules/rangy-highlighter-old.js (97%)
 rename src/{js => }/modules/rangy-highlighter.js (97%)
 rename src/{js => }/modules/rangy-position.js (97%)
 rename src/{js => }/modules/rangy-selectionsaverestore.js (97%)
 rename src/{js => }/modules/rangy-serializer.js (97%)
 rename src/{js => }/modules/rangy-textcommands.js (97%)
 rename src/{js => }/modules/rangy-textrange-old.js (97%)
 rename src/{js => }/modules/rangy-textrange.js (97%)
 rename src/{js => }/modules/rangy-util.js (96%)

diff --git a/builder/build.js b/builder/build.js
index 9ae190e6..55f7e20e 100644
--- a/builder/build.js
+++ b/builder/build.js
@@ -17,7 +17,7 @@ var buildSpec = {
 
 var buildDir = "dist/";
 
-var gitDir = buildDir + "repository/", srcDir = gitDir + "src/js/";
+var gitDir = buildDir + "repository/", srcDir = gitDir + "src/";
 var zipDir;
 var uncompressedBuildDir;
 var coreFilename = "rangy-core.js";
diff --git a/demos/bold.html b/demos/bold.html
index 46484f69..37e01bd6 100644
--- a/demos/bold.html
+++ b/demos/bold.html
@@ -15,12 +15,12 @@
         }
     </style>
     <script type="text/javascript" src="../external/log4javascript.js"></script>
-    <script type="text/javascript" src="../src/js/core/core.js"></script>
-    <script type="text/javascript" src="../src/js/core/dom.js"></script>
-    <script type="text/javascript" src="../src/js/core/domrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedselection.js"></script>
-    <script type="text/javascript" src="../src/js/modules/rangy-textcommands.js"></script>
+    <script type="text/javascript" src="../src/core/core.js"></script>
+    <script type="text/javascript" src="../src/core/dom.js"></script>
+    <script type="text/javascript" src="../src/core/domrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedselection.js"></script>
+    <script type="text/javascript" src="../src/modules/rangy-textcommands.js"></script>
     <script type="text/javascript">
         function gEBI(id) {
             return document.getElementById(id);
diff --git a/demos/bookmark.html b/demos/bookmark.html
index b8d9e1c5..2d0fc2a0 100644
--- a/demos/bookmark.html
+++ b/demos/bookmark.html
@@ -4,11 +4,11 @@
     <title>Rangy Core Demo</title>
     <link href="demo.css" rel="stylesheet" type="text/css">
     <script type="text/javascript" src="../external/log4javascript.js"></script>
-    <script type="text/javascript" src="../src/js/core/core.js"></script>
-    <script type="text/javascript" src="../src/js/core/dom.js"></script>
-    <script type="text/javascript" src="../src/js/core/domrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedselection.js"></script>
+    <script type="text/javascript" src="../src/core/core.js"></script>
+    <script type="text/javascript" src="../src/core/dom.js"></script>
+    <script type="text/javascript" src="../src/core/domrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedselection.js"></script>
     
     <style>
         #linkInput {
diff --git a/demos/commands.html b/demos/commands.html
index 576aab93..152a4c1c 100644
--- a/demos/commands.html
+++ b/demos/commands.html
@@ -28,16 +28,16 @@
         log4javascript.setShowStackTraces(true);
         //log4javascript.setEnabled(false);
     </script>
-    <script type="text/javascript" src="../src/js/core/core.js"></script>
-    <script type="text/javascript" src="../src/js/core/dom.js"></script>
-    <script type="text/javascript" src="../src/js/core/domrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedselection.js"></script>
-    <script type="text/javascript" src="../src/js/modules/rangy-commands.js"></script>
-    <script type="text/javascript" src="../src/js/modules/commands/rangy-bold.js"></script>
-    <script type="text/javascript" src="../src/js/modules/commands/rangy-italic.js"></script>
-    <script type="text/javascript" src="../src/js/modules/commands/rangy-applyclass.js"></script>
-    <script type="text/javascript" src="../src/js/modules/rangy-cssclassapplier.js"></script>
+    <script type="text/javascript" src="../src/core/core.js"></script>
+    <script type="text/javascript" src="../src/core/dom.js"></script>
+    <script type="text/javascript" src="../src/core/domrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedselection.js"></script>
+    <script type="text/javascript" src="../src/modules/rangy-commands.js"></script>
+    <script type="text/javascript" src="../src/modules/commands/rangy-bold.js"></script>
+    <script type="text/javascript" src="../src/modules/commands/rangy-italic.js"></script>
+    <script type="text/javascript" src="../src/modules/commands/rangy-applyclass.js"></script>
+    <script type="text/javascript" src="../src/modules/rangy-cssclassapplier.js"></script>
     <script type="text/javascript" src="../test/implementation.js"></script>
     <script type="text/javascript">
         var iframeDoc, iframeWin, contentHtmlTextArea, mainLoaded = false, iframeLoaded = false;
diff --git a/demos/commands_new.html b/demos/commands_new.html
index 461d6370..ac11f767 100644
--- a/demos/commands_new.html
+++ b/demos/commands_new.html
@@ -28,16 +28,16 @@
         log4javascript.setShowStackTraces(true);
         //log4javascript.setEnabled(false);
     </script>
-    <script type="text/javascript" src="../src/js/core/core.js"></script>
-    <script type="text/javascript" src="../src/js/core/dom.js"></script>
-    <script type="text/javascript" src="../src/js/core/domrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedselection.js"></script>
-    <script type="text/javascript" src="../src/js/modules/rangy-commands_new.js"></script>
-    <script type="text/javascript" src="../src/js/modules/commands/rangy-bold_new.js"></script>
-    <script type="text/javascript" src="../src/js/modules/commands/rangy-italic.js"></script>
-    <script type="text/javascript" src="../src/js/modules/commands/rangy-applyclass.js"></script>
-    <script type="text/javascript" src="../src/js/modules/rangy-cssclassapplier.js"></script>
+    <script type="text/javascript" src="../src/core/core.js"></script>
+    <script type="text/javascript" src="../src/core/dom.js"></script>
+    <script type="text/javascript" src="../src/core/domrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedselection.js"></script>
+    <script type="text/javascript" src="../src/modules/rangy-commands_new.js"></script>
+    <script type="text/javascript" src="../src/modules/commands/rangy-bold_new.js"></script>
+    <script type="text/javascript" src="../src/modules/commands/rangy-italic.js"></script>
+    <script type="text/javascript" src="../src/modules/commands/rangy-applyclass.js"></script>
+    <script type="text/javascript" src="../src/modules/rangy-cssclassapplier.js"></script>
     <script type="text/javascript" src="../test/implementation.js"></script>
     <script type="text/javascript">
         var iframeDoc, iframeWin, contentHtmlTextArea, mainLoaded = false, iframeLoaded = false;
diff --git a/demos/events.html b/demos/events.html
index 42a10fd5..20de4236 100644
--- a/demos/events.html
+++ b/demos/events.html
@@ -31,13 +31,13 @@
     </style>
     <script type="text/javascript" src="../external/log4javascript.js"></script>
 
-    <script type="text/javascript" src="../src/js/core/core.js"></script>
-    <script type="text/javascript" src="../src/js/core/dom.js"></script>
-    <script type="text/javascript" src="../src/js/core/domrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedselection.js"></script>
-    <script type="text/javascript" src="../src/js/modules/rangy-position.js"></script>
-    <script type="text/javascript" src="../src/js/modules/rangy-events.js"></script>
+    <script type="text/javascript" src="../src/core/core.js"></script>
+    <script type="text/javascript" src="../src/core/dom.js"></script>
+    <script type="text/javascript" src="../src/core/domrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedselection.js"></script>
+    <script type="text/javascript" src="../src/modules/rangy-position.js"></script>
+    <script type="text/javascript" src="../src/modules/rangy-events.js"></script>
 
     <script type="text/javascript">
         var selRanges = null;
diff --git a/demos/highlighter-old.html b/demos/highlighter-old.html
index 808243da..314106b3 100644
--- a/demos/highlighter-old.html
+++ b/demos/highlighter-old.html
@@ -13,15 +13,15 @@
         }
     </style>
     <script type="text/javascript" src="../external/log4javascript.js"></script>
-    <script type="text/javascript" src="../src/js/core/core.js"></script>
-    <script type="text/javascript" src="../src/js/core/dom.js"></script>
-    <script type="text/javascript" src="../src/js/core/domrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedselection.js"></script>
-    <script type="text/javascript" src="../src/js/modules/rangy-serializer.js"></script>
-    <script type="text/javascript" src="../src/js/modules/rangy-cssclassapplier.js"></script>
-    <script type="text/javascript" src="../src/js/modules/rangy-selectionsaverestore.js"></script>
-    <script type="text/javascript" src="../src/js/modules/rangy-highlighter-old.js"></script>
+    <script type="text/javascript" src="../src/core/core.js"></script>
+    <script type="text/javascript" src="../src/core/dom.js"></script>
+    <script type="text/javascript" src="../src/core/domrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedselection.js"></script>
+    <script type="text/javascript" src="../src/modules/rangy-serializer.js"></script>
+    <script type="text/javascript" src="../src/modules/rangy-cssclassapplier.js"></script>
+    <script type="text/javascript" src="../src/modules/rangy-selectionsaverestore.js"></script>
+    <script type="text/javascript" src="../src/modules/rangy-highlighter-old.js"></script>
     <script type="text/javascript">
         var serializedHighlights = decodeURIComponent(window.location.search.slice(window.location.search.indexOf("=") + 1));
         var highlighter;
diff --git a/demos/highlighter.html b/demos/highlighter.html
index 308e5ad4..f6e30ebd 100644
--- a/demos/highlighter.html
+++ b/demos/highlighter.html
@@ -17,16 +17,16 @@
         }
     </style>
     <script type="text/javascript" src="../external/log4javascript_stub.js"></script>
-    <script type="text/javascript" src="../src/js/core/core.js"></script>
-    <script type="text/javascript" src="../src/js/core/dom.js"></script>
-    <script type="text/javascript" src="../src/js/core/domrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedselection.js"></script>
-    <script type="text/javascript" src="../src/js/modules/rangy-classapplier.js"></script>
+    <script type="text/javascript" src="../src/core/core.js"></script>
+    <script type="text/javascript" src="../src/core/dom.js"></script>
+    <script type="text/javascript" src="../src/core/domrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedselection.js"></script>
+    <script type="text/javascript" src="../src/modules/rangy-classapplier.js"></script>
 <!--
-    <script type="text/javascript" src="../src/js/modules/rangy-textrange.js"></script>
+    <script type="text/javascript" src="../src/modules/rangy-textrange.js"></script>
 -->
-    <script type="text/javascript" src="../src/js/modules/rangy-highlighter.js"></script>
+    <script type="text/javascript" src="../src/modules/rangy-highlighter.js"></script>
 <!--
     <script type="text/javascript" src="http://rangy.googlecode.com/svn/trunk/dev/uncompressed/rangy-core.js"></script>
     <script type="text/javascript" src="http://rangy.googlecode.com/svn/trunk/dev/uncompressed/rangy-textrange.js"></script>
diff --git a/demos/position.html b/demos/position.html
index 648340fc..e1fff82c 100644
--- a/demos/position.html
+++ b/demos/position.html
@@ -35,12 +35,12 @@
 
     </style>
     <script type="text/javascript" src="../external/log4javascript.js"></script>
-    <script type="text/javascript" src="../src/js/core/core.js"></script>
-    <script type="text/javascript" src="../src/js/core/dom.js"></script>
-    <script type="text/javascript" src="../src/js/core/domrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedselection.js"></script>
-    <script type="text/javascript" src="../src/js/modules/rangy-position.js"></script>
+    <script type="text/javascript" src="../src/core/core.js"></script>
+    <script type="text/javascript" src="../src/core/dom.js"></script>
+    <script type="text/javascript" src="../src/core/domrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedselection.js"></script>
+    <script type="text/javascript" src="../src/modules/rangy-position.js"></script>
 
 
     <script type="text/javascript">
diff --git a/demos/position2.html b/demos/position2.html
index d883cbe2..2083359c 100644
--- a/demos/position2.html
+++ b/demos/position2.html
@@ -43,12 +43,12 @@
 
     </script>
 
-    <script type="text/javascript" src="../src/js/core/core.js"></script>
-    <script type="text/javascript" src="../src/js/core/dom.js"></script>
-    <script type="text/javascript" src="../src/js/core/domrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedselection.js"></script>
-    <script type="text/javascript" src="../src/js/modules/rangy-position.js"></script>
+    <script type="text/javascript" src="../src/core/core.js"></script>
+    <script type="text/javascript" src="../src/core/dom.js"></script>
+    <script type="text/javascript" src="../src/core/domrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedselection.js"></script>
+    <script type="text/javascript" src="../src/modules/rangy-position.js"></script>
 
 
     <script type="text/javascript">
diff --git a/demos/scopedhighlights.html b/demos/scopedhighlights.html
index e18cf704..c14ccae3 100644
--- a/demos/scopedhighlights.html
+++ b/demos/scopedhighlights.html
@@ -9,13 +9,13 @@
         }
     </style>
     <script type="text/javascript" src="../external/log4javascript_stub.js"></script>
-    <script type="text/javascript" src="../src/js/core/core.js"></script>
-    <script type="text/javascript" src="../src/js/core/dom.js"></script>
-    <script type="text/javascript" src="../src/js/core/domrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedselection.js"></script>
-    <script type="text/javascript" src="../src/js/modules/rangy-cssclassapplier.js"></script>
-    <script type="text/javascript" src="../src/js/modules/rangy-highlighter.js"></script>
+    <script type="text/javascript" src="../src/core/core.js"></script>
+    <script type="text/javascript" src="../src/core/dom.js"></script>
+    <script type="text/javascript" src="../src/core/domrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedselection.js"></script>
+    <script type="text/javascript" src="../src/modules/rangy-cssclassapplier.js"></script>
+    <script type="text/javascript" src="../src/modules/rangy-highlighter.js"></script>
     <script type="text/javascript">
         var serializedHighlights = decodeURIComponent(window.location.search.slice(window.location.search.indexOf("=") + 1));
         var highlighter;
diff --git a/demos/textrange.html b/demos/textrange.html
index 25a577a0..9c5e2aea 100644
--- a/demos/textrange.html
+++ b/demos/textrange.html
@@ -35,13 +35,13 @@
 
 <!--
     <script type="text/javascript" src="../lib/log4javascript.js"></script>
-    <script type="text/javascript" src="../src/js/core/core.js"></script>
-    <script type="text/javascript" src="../src/js/core/dom.js"></script>
-    <script type="text/javascript" src="../src/js/core/domrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedselection.js"></script>
-    <script type="text/javascript" src="../src/js/modules/rangy-cssclassapplier.js"></script>
-    <script type="text/javascript" src="../src/js/modules/rangy-textrange.js"></script>
+    <script type="text/javascript" src="../src/core/core.js"></script>
+    <script type="text/javascript" src="../src/core/dom.js"></script>
+    <script type="text/javascript" src="../src/core/domrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedselection.js"></script>
+    <script type="text/javascript" src="../src/modules/rangy-cssclassapplier.js"></script>
+    <script type="text/javascript" src="../src/modules/rangy-textrange.js"></script>
 -->
 
     <script type="text/javascript">
diff --git a/src/js/core/core.js b/src/core/core.js
similarity index 97%
rename from src/js/core/core.js
rename to src/core/core.js
index ac3b82c6..40984eee 100644
--- a/src/js/core/core.js
+++ b/src/core/core.js
@@ -1,484 +1,484 @@
-/**
- * Rangy, a cross-browser JavaScript range and selection library
- * http://code.google.com/p/rangy/
- *
- * Copyright %%build:year%%, Tim Down
- * Licensed under the MIT license.
- * Version: %%build:version%%
- * Build date: %%build:date%%
- */
-
-(function(factory, global) {
-    if (typeof define == "function" && define.amd) {
-        // AMD. Register as an anonymous module.
-        define(factory);
-    } else if (typeof module != "undefined" && typeof exports == "object") {
-        // Node/CommonJS style
-        module.exports = factory();
-    } else {
-        // No AMD or CommonJS support so we place Rangy in a global variable
-        global.rangy = factory();
-    }
-})(function() {
-    var log = log4javascript.getLogger("rangy.core");
-
-    var OBJECT = "object", FUNCTION = "function", UNDEFINED = "undefined";
-
-    // Minimal set of properties required for DOM Level 2 Range compliance. Comparison constants such as START_TO_START
-    // are omitted because ranges in KHTML do not have them but otherwise work perfectly well. See issue 113.
-    var domRangeProperties = ["startContainer", "startOffset", "endContainer", "endOffset", "collapsed",
-        "commonAncestorContainer"];
-
-    // Minimal set of methods required for DOM Level 2 Range compliance
-    var domRangeMethods = ["setStart", "setStartBefore", "setStartAfter", "setEnd", "setEndBefore",
-        "setEndAfter", "collapse", "selectNode", "selectNodeContents", "compareBoundaryPoints", "deleteContents",
-        "extractContents", "cloneContents", "insertNode", "surroundContents", "cloneRange", "toString", "detach"];
-
-    var textRangeProperties = ["boundingHeight", "boundingLeft", "boundingTop", "boundingWidth", "htmlText", "text"];
-
-    // Subset of TextRange's full set of methods that we're interested in
-    var textRangeMethods = ["collapse", "compareEndPoints", "duplicate", "moveToElementText", "parentElement", "select",
-        "setEndPoint", "getBoundingClientRect"];
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    // Trio of functions taken from Peter Michaux's article:
-    // http://peter.michaux.ca/articles/feature-detection-state-of-the-art-browser-scripting
-    function isHostMethod(o, p) {
-        var t = typeof o[p];
-        return t == FUNCTION || (!!(t == OBJECT && o[p])) || t == "unknown";
-    }
-
-    function isHostObject(o, p) {
-        return !!(typeof o[p] == OBJECT && o[p]);
-    }
-
-    function isHostProperty(o, p) {
-        return typeof o[p] != UNDEFINED;
-    }
-
-    // Creates a convenience function to save verbose repeated calls to tests functions
-    function createMultiplePropertyTest(testFunc) {
-        return function(o, props) {
-            var i = props.length;
-            while (i--) {
-                if (!testFunc(o, props[i])) {
-                    return false;
-                }
-            }
-            return true;
-        };
-    }
-
-    // Next trio of functions are a convenience to save verbose repeated calls to previous two functions
-    var areHostMethods = createMultiplePropertyTest(isHostMethod);
-    var areHostObjects = createMultiplePropertyTest(isHostObject);
-    var areHostProperties = createMultiplePropertyTest(isHostProperty);
-
-    function isTextRange(range) {
-        return range && areHostMethods(range, textRangeMethods) && areHostProperties(range, textRangeProperties);
-    }
-
-    function getBody(doc) {
-        return isHostObject(doc, "body") ? doc.body : doc.getElementsByTagName("body")[0];
-    }
-
-    var modules = {};
-
-    var isBrowser = (typeof window != UNDEFINED && typeof document != UNDEFINED);
-
-    var util = {
-        isHostMethod: isHostMethod,
-        isHostObject: isHostObject,
-        isHostProperty: isHostProperty,
-        areHostMethods: areHostMethods,
-        areHostObjects: areHostObjects,
-        areHostProperties: areHostProperties,
-        isTextRange: isTextRange,
-        getBody: getBody
-    };
-
-    var api = {
-        version: "%%build:version%%",
-        initialized: false,
-        isBrowser: isBrowser,
-        supported: true,
-        util: util,
-        features: {},
-        modules: modules,
-        config: {
-            alertOnFail: true,
-            alertOnWarn: false,
-            preferTextRange: false,
-            autoInitialize: (typeof rangyAutoInitialize == UNDEFINED) ? true : rangyAutoInitialize
-        }
-    };
-
-    function consoleLog(msg) {
-        if (isHostObject(global, "console") && isHostMethod(global.console, "log")) {
-            global.console.log(msg);
-        }
-    }
-
-    function alertOrLog(msg, shouldAlert) {
-        if (isBrowser && shouldAlert) {
-            alert(msg);
-        } else  {
-            consoleLog(msg);
-        }
-    }
-
-    function fail(reason) {
-        api.initialized = true;
-        api.supported = false;
-        alertOrLog("Rangy is not supported in this environment. Reason: " + reason, api.config.alertOnFail);
-    }
-
-    api.fail = fail;
-
-    function warn(msg) {
-        alertOrLog("Rangy warning: " + msg, api.config.alertOnWarn);
-    }
-
-    api.warn = warn;
-
-    // Add utility extend() method
-    var extend;
-    if ({}.hasOwnProperty) {
-        util.extend = extend = function(obj, props, deep) {
-            var o, p;
-            for (var i in props) {
-                if (props.hasOwnProperty(i)) {
-                    o = obj[i];
-                    p = props[i];
-                    if (deep && o !== null && typeof o == "object" && p !== null && typeof p == "object") {
-                        extend(o, p, true);
-                    }
-                    obj[i] = p;
-                }
-            }
-            // Special case for toString, which does not show up in for...in loops in IE <= 8
-            if (props.hasOwnProperty("toString")) {
-                obj.toString = props.toString;
-            }
-            return obj;
-        };
-
-        util.createOptions = function(optionsParam, defaults) {
-            var options = {};
-            extend(options, defaults);
-            if (optionsParam) {
-                extend(options, optionsParam, true);
-            }
-            return options;
-        };
-    } else {
-        fail("hasOwnProperty not supported");
-    }
-    
-    // Test whether we're in a browser and bail out if not
-    if (!isBrowser) {
-        fail("Rangy can only run in a browser");
-    }
-
-    // Test whether Array.prototype.slice can be relied on for NodeLists and use an alternative toArray() if not
-    (function() {
-        var toArray;
-
-        if (isBrowser) {
-            var el = document.createElement("div");
-            el.appendChild(document.createElement("span"));
-            var slice = [].slice;
-            try {
-                if (slice.call(el.childNodes, 0)[0].nodeType == 1) {
-                    toArray = function(arrayLike) {
-                        return slice.call(arrayLike, 0);
-                    };
-                }
-            } catch (e) {}
-        }
-
-        if (!toArray) {
-            toArray = function(arrayLike) {
-                var arr = [];
-                for (var i = 0, len = arrayLike.length; i < len; ++i) {
-                    arr[i] = arrayLike[i];
-                }
-                return arr;
-            };
-        }
-
-        util.toArray = toArray;
-    })();
-
-    // Very simple event handler wrapper function that doesn't attempt to solve issues such as "this" handling or
-    // normalization of event properties
-    var addListener;
-    if (isBrowser) {
-        if (isHostMethod(document, "addEventListener")) {
-            addListener = function(obj, eventType, listener) {
-                obj.addEventListener(eventType, listener, false);
-            };
-        } else if (isHostMethod(document, "attachEvent")) {
-            addListener = function(obj, eventType, listener) {
-                obj.attachEvent("on" + eventType, listener);
-            };
-        } else {
-            fail("Document does not have required addEventListener or attachEvent method");
-        }
-
-        util.addListener = addListener;
-    }
-
-    var initListeners = [];
-
-    function getErrorDesc(ex) {
-        return ex.message || ex.description || String(ex);
-    }
-
-    // Initialization
-    function init() {
-        if (!isBrowser || api.initialized) {
-            return;
-        }
-        var testRange;
-        var implementsDomRange = false, implementsTextRange = false;
-
-        // First, perform basic feature tests
-
-        if (isHostMethod(document, "createRange")) {
-            testRange = document.createRange();
-            if (areHostMethods(testRange, domRangeMethods) && areHostProperties(testRange, domRangeProperties)) {
-                implementsDomRange = true;
-            }
-        }
-
-        var body = getBody(document);
-        if (!body || body.nodeName.toLowerCase() != "body") {
-            fail("No body element found");
-            return;
-        }
-
-        if (body && isHostMethod(body, "createTextRange")) {
-            testRange = body.createTextRange();
-            if (isTextRange(testRange)) {
-                implementsTextRange = true;
-            }
-        }
-
-        if (!implementsDomRange && !implementsTextRange) {
-            fail("Neither Range nor TextRange are available");
-            return;
-        }
-
-        api.initialized = true;
-        api.features = {
-            implementsDomRange: implementsDomRange,
-            implementsTextRange: implementsTextRange
-        };
-
-        // Initialize modules
-        var module, errorMessage;
-        for (var moduleName in modules) {
-            if ( (module = modules[moduleName]) instanceof Module ) {
-                module.init(module, api);
-            }
-        }
-
-        // Call init listeners
-        for (var i = 0, len = initListeners.length; i < len; ++i) {
-            try {
-                initListeners[i](api);
-            } catch (ex) {
-                errorMessage = "Rangy init listener threw an exception. Continuing. Detail: " + getErrorDesc(ex);
-                log.error(errorMessage, ex);
-                consoleLog(errorMessage);
-            }
-        }
-    }
-
-    // Allow external scripts to initialize this library in case it's loaded after the document has loaded
-    api.init = init;
-
-    // Execute listener immediately if already initialized
-    api.addInitListener = function(listener) {
-        if (api.initialized) {
-            listener(api);
-        } else {
-            initListeners.push(listener);
-        }
-    };
-
-    var shimListeners = [];
-
-    api.addShimListener = function(listener) {
-        shimListeners.push(listener);
-    };
-
-    function shim(win) {
-        win = win || window;
-        init();
-
-        // Notify listeners
-        for (var i = 0, len = shimListeners.length; i < len; ++i) {
-            shimListeners[i](win);
-        }
-    }
-
-    if (isBrowser) {
-        api.shim = api.createMissingNativeApi = shim;
-    }
-
-    function Module(name, dependencies, initializer) {
-        this.name = name;
-        this.dependencies = dependencies;
-        this.initialized = false;
-        this.supported = false;
-        this.initializer = initializer;
-    }
-
-    Module.prototype = {
-        init: function() {
-            var requiredModuleNames = this.dependencies || [];
-            for (var i = 0, len = requiredModuleNames.length, requiredModule, moduleName; i < len; ++i) {
-                moduleName = requiredModuleNames[i];
-
-                requiredModule = modules[moduleName];
-                if (!requiredModule || !(requiredModule instanceof Module)) {
-                    throw new Error("required module '" + moduleName + "' not found");
-                }
-
-                requiredModule.init();
-
-                if (!requiredModule.supported) {
-                    throw new Error("required module '" + moduleName + "' not supported");
-                }
-            }
-            
-            // Now run initializer
-            this.initializer(this);
-        },
-        
-        fail: function(reason) {
-            this.initialized = true;
-            this.supported = false;
-            log.error("Module '" + this.name + "' failed to load: " + reason);
-            throw new Error("Module '" + this.name + "' failed to load: " + reason);
-        },
-
-        warn: function(msg) {
-            api.warn("Module " + this.name + ": " + msg);
-        },
-
-        deprecationNotice: function(deprecated, replacement) {
-            api.warn("DEPRECATED: " + deprecated + " in module " + this.name + "is deprecated. Please use " +
-                replacement + " instead");
-        },
-
-        createError: function(msg) {
-            return new Error("Error in Rangy " + this.name + " module: " + msg);
-        }
-    };
-    
-    function createModule(name, dependencies, initFunc) {
-        var newModule = new Module(name, dependencies, function(module) {
-            if (!module.initialized) {
-                module.initialized = true;
-                try {
-                    initFunc(api, module);
-                    module.supported = true;
-                } catch (ex) {
-                    var errorMessage = "Module '" + name + "' failed to load: " + getErrorDesc(ex);
-                    log.error(errorMessage, ex);
-                    consoleLog(errorMessage);
-                }
-            }
-        });
-        modules[name] = newModule;
-        return newModule;
-    }
-
-    api.createModule = function(name) {
-        // Allow 2 or 3 arguments (second argument is an optional array of dependencies)
-        var initFunc, dependencies;
-        if (arguments.length == 2) {
-            initFunc = arguments[1];
-            dependencies = [];
-        } else {
-            initFunc = arguments[2];
-            dependencies = arguments[1];
-        }
-
-        var module = createModule(name, dependencies, initFunc);
-
-        // Initialize the module immediately if the core is already initialized
-        if (api.initialized && api.supported) {
-            module.init();
-        }
-    };
-
-    api.createCoreModule = function(name, dependencies, initFunc) {
-        createModule(name, dependencies, initFunc);
-    };
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    // Ensure rangy.rangePrototype and rangy.selectionPrototype are available immediately
-
-    function RangePrototype() {}
-    api.RangePrototype = RangePrototype;
-    api.rangePrototype = new RangePrototype();
-
-    function SelectionPrototype() {}
-    api.selectionPrototype = new SelectionPrototype();
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    // Wait for document to load before running tests
-
-    var docReady = false;
-
-    var loadHandler = function(e) {
-        log.info("loadHandler triggered by " + (e ? e.type + " event" : "document already loaded"));
-        if (!docReady) {
-            docReady = true;
-            if (!api.initialized && api.config.autoInitialize) {
-                init();
-            }
-        }
-    };
-
-    if (isBrowser) {
-        // Test whether the document has already been loaded
-        if (/^(?:complete|interactive)$/.test(document.readyState)) {
-            loadHandler();
-        } else {
-            if (isHostMethod(document, "addEventListener")) {
-                document.addEventListener("DOMContentLoaded", loadHandler, false);
-            }
-
-            // Add a fallback in case the DOMContentLoaded event isn't supported
-            addListener(window, "load", loadHandler);
-        }
-    }
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-    
-    /* build:includeCoreModule(dom.js) */
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    /* build:includeCoreModule(domrange.js) */
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    /* build:includeCoreModule(wrappedrange.js) */
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    /* build:includeCoreModule(wrappedselection.js) */
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    return api;
+/**
+ * Rangy, a cross-browser JavaScript range and selection library
+ * http://code.google.com/p/rangy/
+ *
+ * Copyright %%build:year%%, Tim Down
+ * Licensed under the MIT license.
+ * Version: %%build:version%%
+ * Build date: %%build:date%%
+ */
+
+(function(factory, global) {
+    if (typeof define == "function" && define.amd) {
+        // AMD. Register as an anonymous module.
+        define(factory);
+    } else if (typeof module != "undefined" && typeof exports == "object") {
+        // Node/CommonJS style
+        module.exports = factory();
+    } else {
+        // No AMD or CommonJS support so we place Rangy in a global variable
+        global.rangy = factory();
+    }
+})(function() {
+    var log = log4javascript.getLogger("rangy.core");
+
+    var OBJECT = "object", FUNCTION = "function", UNDEFINED = "undefined";
+
+    // Minimal set of properties required for DOM Level 2 Range compliance. Comparison constants such as START_TO_START
+    // are omitted because ranges in KHTML do not have them but otherwise work perfectly well. See issue 113.
+    var domRangeProperties = ["startContainer", "startOffset", "endContainer", "endOffset", "collapsed",
+        "commonAncestorContainer"];
+
+    // Minimal set of methods required for DOM Level 2 Range compliance
+    var domRangeMethods = ["setStart", "setStartBefore", "setStartAfter", "setEnd", "setEndBefore",
+        "setEndAfter", "collapse", "selectNode", "selectNodeContents", "compareBoundaryPoints", "deleteContents",
+        "extractContents", "cloneContents", "insertNode", "surroundContents", "cloneRange", "toString", "detach"];
+
+    var textRangeProperties = ["boundingHeight", "boundingLeft", "boundingTop", "boundingWidth", "htmlText", "text"];
+
+    // Subset of TextRange's full set of methods that we're interested in
+    var textRangeMethods = ["collapse", "compareEndPoints", "duplicate", "moveToElementText", "parentElement", "select",
+        "setEndPoint", "getBoundingClientRect"];
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    // Trio of functions taken from Peter Michaux's article:
+    // http://peter.michaux.ca/articles/feature-detection-state-of-the-art-browser-scripting
+    function isHostMethod(o, p) {
+        var t = typeof o[p];
+        return t == FUNCTION || (!!(t == OBJECT && o[p])) || t == "unknown";
+    }
+
+    function isHostObject(o, p) {
+        return !!(typeof o[p] == OBJECT && o[p]);
+    }
+
+    function isHostProperty(o, p) {
+        return typeof o[p] != UNDEFINED;
+    }
+
+    // Creates a convenience function to save verbose repeated calls to tests functions
+    function createMultiplePropertyTest(testFunc) {
+        return function(o, props) {
+            var i = props.length;
+            while (i--) {
+                if (!testFunc(o, props[i])) {
+                    return false;
+                }
+            }
+            return true;
+        };
+    }
+
+    // Next trio of functions are a convenience to save verbose repeated calls to previous two functions
+    var areHostMethods = createMultiplePropertyTest(isHostMethod);
+    var areHostObjects = createMultiplePropertyTest(isHostObject);
+    var areHostProperties = createMultiplePropertyTest(isHostProperty);
+
+    function isTextRange(range) {
+        return range && areHostMethods(range, textRangeMethods) && areHostProperties(range, textRangeProperties);
+    }
+
+    function getBody(doc) {
+        return isHostObject(doc, "body") ? doc.body : doc.getElementsByTagName("body")[0];
+    }
+
+    var modules = {};
+
+    var isBrowser = (typeof window != UNDEFINED && typeof document != UNDEFINED);
+
+    var util = {
+        isHostMethod: isHostMethod,
+        isHostObject: isHostObject,
+        isHostProperty: isHostProperty,
+        areHostMethods: areHostMethods,
+        areHostObjects: areHostObjects,
+        areHostProperties: areHostProperties,
+        isTextRange: isTextRange,
+        getBody: getBody
+    };
+
+    var api = {
+        version: "%%build:version%%",
+        initialized: false,
+        isBrowser: isBrowser,
+        supported: true,
+        util: util,
+        features: {},
+        modules: modules,
+        config: {
+            alertOnFail: true,
+            alertOnWarn: false,
+            preferTextRange: false,
+            autoInitialize: (typeof rangyAutoInitialize == UNDEFINED) ? true : rangyAutoInitialize
+        }
+    };
+
+    function consoleLog(msg) {
+        if (isHostObject(global, "console") && isHostMethod(global.console, "log")) {
+            global.console.log(msg);
+        }
+    }
+
+    function alertOrLog(msg, shouldAlert) {
+        if (isBrowser && shouldAlert) {
+            alert(msg);
+        } else  {
+            consoleLog(msg);
+        }
+    }
+
+    function fail(reason) {
+        api.initialized = true;
+        api.supported = false;
+        alertOrLog("Rangy is not supported in this environment. Reason: " + reason, api.config.alertOnFail);
+    }
+
+    api.fail = fail;
+
+    function warn(msg) {
+        alertOrLog("Rangy warning: " + msg, api.config.alertOnWarn);
+    }
+
+    api.warn = warn;
+
+    // Add utility extend() method
+    var extend;
+    if ({}.hasOwnProperty) {
+        util.extend = extend = function(obj, props, deep) {
+            var o, p;
+            for (var i in props) {
+                if (props.hasOwnProperty(i)) {
+                    o = obj[i];
+                    p = props[i];
+                    if (deep && o !== null && typeof o == "object" && p !== null && typeof p == "object") {
+                        extend(o, p, true);
+                    }
+                    obj[i] = p;
+                }
+            }
+            // Special case for toString, which does not show up in for...in loops in IE <= 8
+            if (props.hasOwnProperty("toString")) {
+                obj.toString = props.toString;
+            }
+            return obj;
+        };
+
+        util.createOptions = function(optionsParam, defaults) {
+            var options = {};
+            extend(options, defaults);
+            if (optionsParam) {
+                extend(options, optionsParam, true);
+            }
+            return options;
+        };
+    } else {
+        fail("hasOwnProperty not supported");
+    }
+    
+    // Test whether we're in a browser and bail out if not
+    if (!isBrowser) {
+        fail("Rangy can only run in a browser");
+    }
+
+    // Test whether Array.prototype.slice can be relied on for NodeLists and use an alternative toArray() if not
+    (function() {
+        var toArray;
+
+        if (isBrowser) {
+            var el = document.createElement("div");
+            el.appendChild(document.createElement("span"));
+            var slice = [].slice;
+            try {
+                if (slice.call(el.childNodes, 0)[0].nodeType == 1) {
+                    toArray = function(arrayLike) {
+                        return slice.call(arrayLike, 0);
+                    };
+                }
+            } catch (e) {}
+        }
+
+        if (!toArray) {
+            toArray = function(arrayLike) {
+                var arr = [];
+                for (var i = 0, len = arrayLike.length; i < len; ++i) {
+                    arr[i] = arrayLike[i];
+                }
+                return arr;
+            };
+        }
+
+        util.toArray = toArray;
+    })();
+
+    // Very simple event handler wrapper function that doesn't attempt to solve issues such as "this" handling or
+    // normalization of event properties
+    var addListener;
+    if (isBrowser) {
+        if (isHostMethod(document, "addEventListener")) {
+            addListener = function(obj, eventType, listener) {
+                obj.addEventListener(eventType, listener, false);
+            };
+        } else if (isHostMethod(document, "attachEvent")) {
+            addListener = function(obj, eventType, listener) {
+                obj.attachEvent("on" + eventType, listener);
+            };
+        } else {
+            fail("Document does not have required addEventListener or attachEvent method");
+        }
+
+        util.addListener = addListener;
+    }
+
+    var initListeners = [];
+
+    function getErrorDesc(ex) {
+        return ex.message || ex.description || String(ex);
+    }
+
+    // Initialization
+    function init() {
+        if (!isBrowser || api.initialized) {
+            return;
+        }
+        var testRange;
+        var implementsDomRange = false, implementsTextRange = false;
+
+        // First, perform basic feature tests
+
+        if (isHostMethod(document, "createRange")) {
+            testRange = document.createRange();
+            if (areHostMethods(testRange, domRangeMethods) && areHostProperties(testRange, domRangeProperties)) {
+                implementsDomRange = true;
+            }
+        }
+
+        var body = getBody(document);
+        if (!body || body.nodeName.toLowerCase() != "body") {
+            fail("No body element found");
+            return;
+        }
+
+        if (body && isHostMethod(body, "createTextRange")) {
+            testRange = body.createTextRange();
+            if (isTextRange(testRange)) {
+                implementsTextRange = true;
+            }
+        }
+
+        if (!implementsDomRange && !implementsTextRange) {
+            fail("Neither Range nor TextRange are available");
+            return;
+        }
+
+        api.initialized = true;
+        api.features = {
+            implementsDomRange: implementsDomRange,
+            implementsTextRange: implementsTextRange
+        };
+
+        // Initialize modules
+        var module, errorMessage;
+        for (var moduleName in modules) {
+            if ( (module = modules[moduleName]) instanceof Module ) {
+                module.init(module, api);
+            }
+        }
+
+        // Call init listeners
+        for (var i = 0, len = initListeners.length; i < len; ++i) {
+            try {
+                initListeners[i](api);
+            } catch (ex) {
+                errorMessage = "Rangy init listener threw an exception. Continuing. Detail: " + getErrorDesc(ex);
+                log.error(errorMessage, ex);
+                consoleLog(errorMessage);
+            }
+        }
+    }
+
+    // Allow external scripts to initialize this library in case it's loaded after the document has loaded
+    api.init = init;
+
+    // Execute listener immediately if already initialized
+    api.addInitListener = function(listener) {
+        if (api.initialized) {
+            listener(api);
+        } else {
+            initListeners.push(listener);
+        }
+    };
+
+    var shimListeners = [];
+
+    api.addShimListener = function(listener) {
+        shimListeners.push(listener);
+    };
+
+    function shim(win) {
+        win = win || window;
+        init();
+
+        // Notify listeners
+        for (var i = 0, len = shimListeners.length; i < len; ++i) {
+            shimListeners[i](win);
+        }
+    }
+
+    if (isBrowser) {
+        api.shim = api.createMissingNativeApi = shim;
+    }
+
+    function Module(name, dependencies, initializer) {
+        this.name = name;
+        this.dependencies = dependencies;
+        this.initialized = false;
+        this.supported = false;
+        this.initializer = initializer;
+    }
+
+    Module.prototype = {
+        init: function() {
+            var requiredModuleNames = this.dependencies || [];
+            for (var i = 0, len = requiredModuleNames.length, requiredModule, moduleName; i < len; ++i) {
+                moduleName = requiredModuleNames[i];
+
+                requiredModule = modules[moduleName];
+                if (!requiredModule || !(requiredModule instanceof Module)) {
+                    throw new Error("required module '" + moduleName + "' not found");
+                }
+
+                requiredModule.init();
+
+                if (!requiredModule.supported) {
+                    throw new Error("required module '" + moduleName + "' not supported");
+                }
+            }
+            
+            // Now run initializer
+            this.initializer(this);
+        },
+        
+        fail: function(reason) {
+            this.initialized = true;
+            this.supported = false;
+            log.error("Module '" + this.name + "' failed to load: " + reason);
+            throw new Error("Module '" + this.name + "' failed to load: " + reason);
+        },
+
+        warn: function(msg) {
+            api.warn("Module " + this.name + ": " + msg);
+        },
+
+        deprecationNotice: function(deprecated, replacement) {
+            api.warn("DEPRECATED: " + deprecated + " in module " + this.name + "is deprecated. Please use " +
+                replacement + " instead");
+        },
+
+        createError: function(msg) {
+            return new Error("Error in Rangy " + this.name + " module: " + msg);
+        }
+    };
+    
+    function createModule(name, dependencies, initFunc) {
+        var newModule = new Module(name, dependencies, function(module) {
+            if (!module.initialized) {
+                module.initialized = true;
+                try {
+                    initFunc(api, module);
+                    module.supported = true;
+                } catch (ex) {
+                    var errorMessage = "Module '" + name + "' failed to load: " + getErrorDesc(ex);
+                    log.error(errorMessage, ex);
+                    consoleLog(errorMessage);
+                }
+            }
+        });
+        modules[name] = newModule;
+        return newModule;
+    }
+
+    api.createModule = function(name) {
+        // Allow 2 or 3 arguments (second argument is an optional array of dependencies)
+        var initFunc, dependencies;
+        if (arguments.length == 2) {
+            initFunc = arguments[1];
+            dependencies = [];
+        } else {
+            initFunc = arguments[2];
+            dependencies = arguments[1];
+        }
+
+        var module = createModule(name, dependencies, initFunc);
+
+        // Initialize the module immediately if the core is already initialized
+        if (api.initialized && api.supported) {
+            module.init();
+        }
+    };
+
+    api.createCoreModule = function(name, dependencies, initFunc) {
+        createModule(name, dependencies, initFunc);
+    };
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    // Ensure rangy.rangePrototype and rangy.selectionPrototype are available immediately
+
+    function RangePrototype() {}
+    api.RangePrototype = RangePrototype;
+    api.rangePrototype = new RangePrototype();
+
+    function SelectionPrototype() {}
+    api.selectionPrototype = new SelectionPrototype();
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    // Wait for document to load before running tests
+
+    var docReady = false;
+
+    var loadHandler = function(e) {
+        log.info("loadHandler triggered by " + (e ? e.type + " event" : "document already loaded"));
+        if (!docReady) {
+            docReady = true;
+            if (!api.initialized && api.config.autoInitialize) {
+                init();
+            }
+        }
+    };
+
+    if (isBrowser) {
+        // Test whether the document has already been loaded
+        if (/^(?:complete|interactive)$/.test(document.readyState)) {
+            loadHandler();
+        } else {
+            if (isHostMethod(document, "addEventListener")) {
+                document.addEventListener("DOMContentLoaded", loadHandler, false);
+            }
+
+            // Add a fallback in case the DOMContentLoaded event isn't supported
+            addListener(window, "load", loadHandler);
+        }
+    }
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+    
+    /* build:includeCoreModule(dom.js) */
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    /* build:includeCoreModule(domrange.js) */
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    /* build:includeCoreModule(wrappedrange.js) */
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    /* build:includeCoreModule(wrappedselection.js) */
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    return api;
 }, this);
\ No newline at end of file
diff --git a/src/js/core/dom.js b/src/core/dom.js
similarity index 97%
rename from src/js/core/dom.js
rename to src/core/dom.js
index 15c9074a..939c374d 100644
--- a/src/js/core/dom.js
+++ b/src/core/dom.js
@@ -1,480 +1,480 @@
-// DOM utility methods used by Rangy
-/* build:replaceWith(api) */rangy/* build:replaceEnd */.createCoreModule("DomUtil", [], function(api, module) {
-    var log = log4javascript.getLogger("rangy.dom");
-    var UNDEF = "undefined";
-    var util = api.util;
-
-    // Perform feature tests
-    if (!util.areHostMethods(document, ["createDocumentFragment", "createElement", "createTextNode"])) {
-        module.fail("document missing a Node creation method");
-    }
-
-    if (!util.isHostMethod(document, "getElementsByTagName")) {
-        module.fail("document missing getElementsByTagName method");
-    }
-
-    var el = document.createElement("div");
-    if (!util.areHostMethods(el, ["insertBefore", "appendChild", "cloneNode"] ||
-            !util.areHostObjects(el, ["previousSibling", "nextSibling", "childNodes", "parentNode"]))) {
-        module.fail("Incomplete Element implementation");
-    }
-
-    // innerHTML is required for Range's createContextualFragment method
-    if (!util.isHostProperty(el, "innerHTML")) {
-        module.fail("Element is missing innerHTML property");
-    }
-
-    var textNode = document.createTextNode("test");
-    if (!util.areHostMethods(textNode, ["splitText", "deleteData", "insertData", "appendData", "cloneNode"] ||
-            !util.areHostObjects(el, ["previousSibling", "nextSibling", "childNodes", "parentNode"]) ||
-            !util.areHostProperties(textNode, ["data"]))) {
-        module.fail("Incomplete Text Node implementation");
-    }
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    // Removed use of indexOf because of a bizarre bug in Opera that is thrown in one of the Acid3 tests. I haven't been
-    // able to replicate it outside of the test. The bug is that indexOf returns -1 when called on an Array that
-    // contains just the document as a single element and the value searched for is the document.
-    var arrayContains = /*Array.prototype.indexOf ?
-        function(arr, val) {
-            return arr.indexOf(val) > -1;
-        }:*/
-
-        function(arr, val) {
-            var i = arr.length;
-            while (i--) {
-                if (arr[i] === val) {
-                    return true;
-                }
-            }
-            return false;
-        };
-
-    // Opera 11 puts HTML elements in the null namespace, it seems, and IE 7 has undefined namespaceURI
-    function isHtmlNamespace(node) {
-        var ns;
-        return typeof node.namespaceURI == UNDEF || ((ns = node.namespaceURI) === null || ns == "http://www.w3.org/1999/xhtml");
-    }
-
-    function parentElement(node) {
-        var parent = node.parentNode;
-        return (parent.nodeType == 1) ? parent : null;
-    }
-
-    function getNodeIndex(node) {
-        var i = 0;
-        while( (node = node.previousSibling) ) {
-            ++i;
-        }
-        return i;
-    }
-
-    function getNodeLength(node) {
-        switch (node.nodeType) {
-            case 7:
-            case 10:
-                return 0;
-            case 3:
-            case 8:
-                return node.length;
-            default:
-                return node.childNodes.length;
-        }
-    }
-
-    function getCommonAncestor(node1, node2) {
-        var ancestors = [], n;
-        for (n = node1; n; n = n.parentNode) {
-            ancestors.push(n);
-        }
-
-        for (n = node2; n; n = n.parentNode) {
-            if (arrayContains(ancestors, n)) {
-                return n;
-            }
-        }
-
-        return null;
-    }
-
-    function isAncestorOf(ancestor, descendant, selfIsAncestor) {
-        var n = selfIsAncestor ? descendant : descendant.parentNode;
-        while (n) {
-            if (n === ancestor) {
-                return true;
-            } else {
-                n = n.parentNode;
-            }
-        }
-        return false;
-    }
-
-    function isOrIsAncestorOf(ancestor, descendant) {
-        return isAncestorOf(ancestor, descendant, true);
-    }
-
-    function getClosestAncestorIn(node, ancestor, selfIsAncestor) {
-        var p, n = selfIsAncestor ? node : node.parentNode;
-        while (n) {
-            p = n.parentNode;
-            if (p === ancestor) {
-                return n;
-            }
-            n = p;
-        }
-        return null;
-    }
-
-    function isCharacterDataNode(node) {
-        var t = node.nodeType;
-        return t == 3 || t == 4 || t == 8 ; // Text, CDataSection or Comment
-    }
-
-    function isTextOrCommentNode(node) {
-        if (!node) {
-            return false;
-        }
-        var t = node.nodeType;
-        return t == 3 || t == 8 ; // Text or Comment
-    }
-
-    function insertAfter(node, precedingNode) {
-        var nextNode = precedingNode.nextSibling, parent = precedingNode.parentNode;
-        if (nextNode) {
-            parent.insertBefore(node, nextNode);
-        } else {
-            parent.appendChild(node);
-        }
-        return node;
-    }
-
-    // Note that we cannot use splitText() because it is bugridden in IE 9.
-    function splitDataNode(node, index, positionsToPreserve) {
-        log.debug("splitDataNode called at index " + index + " in node " + inspectNode(node));
-        var newNode = node.cloneNode(false);
-        newNode.deleteData(0, index);
-        node.deleteData(index, node.length - index);
-        insertAfter(newNode, node);
-
-        // Preserve positions
-        if (positionsToPreserve) {
-            for (var i = 0, position; position = positionsToPreserve[i++]; ) {
-                // Handle case where position was inside the portion of node after the split point
-                if (position.node == node && position.offset > index) {
-                    position.node = newNode;
-                    position.offset -= index;
-                }
-                // Handle the case where the position is a node offset within node's parent
-                else if (position.node == node.parentNode && position.offset > getNodeIndex(node)) {
-                    ++position.offset;
-                }
-            }
-        }
-        return newNode;
-    }
-
-    function getDocument(node) {
-        if (node.nodeType == 9) {
-            return node;
-        } else if (typeof node.ownerDocument != UNDEF) {
-            return node.ownerDocument;
-        } else if (typeof node.document != UNDEF) {
-            return node.document;
-        } else if (node.parentNode) {
-            return getDocument(node.parentNode);
-        } else {
-            throw module.createError("getDocument: no document found for node");
-        }
-    }
-
-    function getWindow(node) {
-        var doc = getDocument(node);
-        if (typeof doc.defaultView != UNDEF) {
-            return doc.defaultView;
-        } else if (typeof doc.parentWindow != UNDEF) {
-            return doc.parentWindow;
-        } else {
-            throw module.createError("Cannot get a window object for node");
-        }
-    }
-
-    function getIframeDocument(iframeEl) {
-        if (typeof iframeEl.contentDocument != UNDEF) {
-            return iframeEl.contentDocument;
-        } else if (typeof iframeEl.contentWindow != UNDEF) {
-            return iframeEl.contentWindow.document;
-        } else {
-            throw module.createError("getIframeDocument: No Document object found for iframe element");
-        }
-    }
-
-    function getIframeWindow(iframeEl) {
-        if (typeof iframeEl.contentWindow != UNDEF) {
-            return iframeEl.contentWindow;
-        } else if (typeof iframeEl.contentDocument != UNDEF) {
-            return iframeEl.contentDocument.defaultView;
-        } else {
-            throw module.createError("getIframeWindow: No Window object found for iframe element");
-        }
-    }
-
-    // This looks bad. Is it worth it?
-    function isWindow(obj) {
-        return obj && util.isHostMethod(obj, "setTimeout") && util.isHostObject(obj, "document");
-    }
-
-    function getContentDocument(obj, module, methodName) {
-        var doc;
-
-        if (!obj) {
-            doc = document;
-        }
-
-        // Test if a DOM node has been passed and obtain a document object for it if so
-        else if (util.isHostProperty(obj, "nodeType")) {
-            doc = (obj.nodeType == 1 && obj.tagName.toLowerCase() == "iframe") ?
-                getIframeDocument(obj) : getDocument(obj);
-        }
-
-        // Test if the doc parameter appears to be a Window object
-        else if (isWindow(obj)) {
-            doc = obj.document;
-        }
-
-        if (!doc) {
-            throw module.createError(methodName + "(): Parameter must be a Window object or DOM node");
-        }
-
-        return doc;
-    }
-
-    function getRootContainer(node) {
-        var parent;
-        while ( (parent = node.parentNode) ) {
-            node = parent;
-        }
-        return node;
-    }
-
-    function comparePoints(nodeA, offsetA, nodeB, offsetB) {
-        // See http://www.w3.org/TR/DOM-Level-2-Traversal-Range/ranges.html#Level-2-Range-Comparing
-        var nodeC, root, childA, childB, n;
-        if (nodeA == nodeB) {
-            log.debug("case 1");
-            // Case 1: nodes are the same
-            return offsetA === offsetB ? 0 : (offsetA < offsetB) ? -1 : 1;
-        } else if ( (nodeC = getClosestAncestorIn(nodeB, nodeA, true)) ) {
-            log.debug("case 2", inspectNode(nodeC), getNodeIndex(nodeC));
-            // Case 2: node C (container B or an ancestor) is a child node of A
-            return offsetA <= getNodeIndex(nodeC) ? -1 : 1;
-        } else if ( (nodeC = getClosestAncestorIn(nodeA, nodeB, true)) ) {
-            log.debug("case 3");
-            // Case 3: node C (container A or an ancestor) is a child node of B
-            return getNodeIndex(nodeC) < offsetB  ? -1 : 1;
-        } else {
-            root = getCommonAncestor(nodeA, nodeB);
-            if (!root) {
-                throw new Error("comparePoints error: nodes have no common ancestor");
-            }
-
-            // Case 4: containers are siblings or descendants of siblings
-            log.debug("case 4");
-            childA = (nodeA === root) ? root : getClosestAncestorIn(nodeA, root, true);
-            childB = (nodeB === root) ? root : getClosestAncestorIn(nodeB, root, true);
-
-            if (childA === childB) {
-                // This shouldn't be possible
-                log.warn("comparePoints got to case 4 and childA and childB are the same!", nodeA, offsetA, nodeB, offsetB);
-                throw module.createError("comparePoints got to case 4 and childA and childB are the same!");
-            } else {
-                n = root.firstChild;
-                while (n) {
-                    if (n === childA) {
-                        return -1;
-                    } else if (n === childB) {
-                        return 1;
-                    }
-                    n = n.nextSibling;
-                }
-            }
-        }
-    }
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    // Test for IE's crash (IE 6/7) or exception (IE >= 8) when a reference to garbage-collected text node is queried
-    var crashyTextNodes = false;
-
-    function isBrokenNode(node) {
-        var n;
-        try {
-            n = node.parentNode;
-            return false;
-        } catch (e) {
-            return true;
-        }
-    }
-
-    (function() {
-        var el = document.createElement("b");
-        el.innerHTML = "1";
-        var textNode = el.firstChild;
-        el.innerHTML = "<br>";
-        crashyTextNodes = isBrokenNode(textNode);
-
-        api.features.crashyTextNodes = crashyTextNodes;
-    })();
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    function inspectNode(node) {
-        if (!node) {
-            return "[No node]";
-        }
-        if (crashyTextNodes && isBrokenNode(node)) {
-            return "[Broken node]";
-        }
-        if (isCharacterDataNode(node)) {
-            return '"' + node.data + '"';
-        }
-        if (node.nodeType == 1) {
-            var idAttr = node.id ? ' id="' + node.id + '"' : "";
-            return "<" + node.nodeName + idAttr + ">[index:" + getNodeIndex(node) + ",length:" + node.childNodes.length + "][" + (node.innerHTML || "[innerHTML not supported]").slice(0, 25) + "]";
-        }
-        return node.nodeName;
-    }
-
-    function fragmentFromNodeChildren(node) {
-        var fragment = getDocument(node).createDocumentFragment(), child;
-        while ( (child = node.firstChild) ) {
-            fragment.appendChild(child);
-        }
-        return fragment;
-    }
-
-    var getComputedStyleProperty;
-    if (typeof window.getComputedStyle != UNDEF) {
-        getComputedStyleProperty = function(el, propName) {
-            return getWindow(el).getComputedStyle(el, null)[propName];
-        };
-    } else if (typeof document.documentElement.currentStyle != UNDEF) {
-        getComputedStyleProperty = function(el, propName) {
-            return el.currentStyle[propName];
-        };
-    } else {
-        module.fail("No means of obtaining computed style properties found");
-    }
-
-    function NodeIterator(root) {
-        this.root = root;
-        this._next = root;
-    }
-
-    NodeIterator.prototype = {
-        _current: null,
-
-        hasNext: function() {
-            return !!this._next;
-        },
-
-        next: function() {
-            var n = this._current = this._next;
-            var child, next;
-            if (this._current) {
-                child = n.firstChild;
-                if (child) {
-                    this._next = child;
-                } else {
-                    next = null;
-                    while ((n !== this.root) && !(next = n.nextSibling)) {
-                        n = n.parentNode;
-                    }
-                    this._next = next;
-                }
-            }
-            return this._current;
-        },
-
-        detach: function() {
-            this._current = this._next = this.root = null;
-        }
-    };
-
-    function createIterator(root) {
-        return new NodeIterator(root);
-    }
-
-    function DomPosition(node, offset) {
-        this.node = node;
-        this.offset = offset;
-    }
-
-    DomPosition.prototype = {
-        equals: function(pos) {
-            return !!pos && this.node === pos.node && this.offset == pos.offset;
-        },
-
-        inspect: function() {
-            return "[DomPosition(" + inspectNode(this.node) + ":" + this.offset + ")]";
-        },
-
-        toString: function() {
-            return this.inspect();
-        }
-    };
-
-    function DOMException(codeName) {
-        this.code = this[codeName];
-        this.codeName = codeName;
-        this.message = "DOMException: " + this.codeName;
-    }
-
-    DOMException.prototype = {
-        INDEX_SIZE_ERR: 1,
-        HIERARCHY_REQUEST_ERR: 3,
-        WRONG_DOCUMENT_ERR: 4,
-        NO_MODIFICATION_ALLOWED_ERR: 7,
-        NOT_FOUND_ERR: 8,
-        NOT_SUPPORTED_ERR: 9,
-        INVALID_STATE_ERR: 11,
-        INVALID_NODE_TYPE_ERR: 24
-    };
-
-    DOMException.prototype.toString = function() {
-        return this.message;
-    };
-
-    api.dom = {
-        arrayContains: arrayContains,
-        isHtmlNamespace: isHtmlNamespace,
-        parentElement: parentElement,
-        getNodeIndex: getNodeIndex,
-        getNodeLength: getNodeLength,
-        getCommonAncestor: getCommonAncestor,
-        isAncestorOf: isAncestorOf,
-        isOrIsAncestorOf: isOrIsAncestorOf,
-        getClosestAncestorIn: getClosestAncestorIn,
-        isCharacterDataNode: isCharacterDataNode,
-        isTextOrCommentNode: isTextOrCommentNode,
-        insertAfter: insertAfter,
-        splitDataNode: splitDataNode,
-        getDocument: getDocument,
-        getWindow: getWindow,
-        getIframeWindow: getIframeWindow,
-        getIframeDocument: getIframeDocument,
-        getBody: util.getBody,
-        isWindow: isWindow,
-        getContentDocument: getContentDocument,
-        getRootContainer: getRootContainer,
-        comparePoints: comparePoints,
-        isBrokenNode: isBrokenNode,
-        inspectNode: inspectNode,
-        getComputedStyleProperty: getComputedStyleProperty,
-        fragmentFromNodeChildren: fragmentFromNodeChildren,
-        createIterator: createIterator,
-        DomPosition: DomPosition
-    };
-
-    api.DOMException = DOMException;
+// DOM utility methods used by Rangy
+/* build:replaceWith(api) */rangy/* build:replaceEnd */.createCoreModule("DomUtil", [], function(api, module) {
+    var log = log4javascript.getLogger("rangy.dom");
+    var UNDEF = "undefined";
+    var util = api.util;
+
+    // Perform feature tests
+    if (!util.areHostMethods(document, ["createDocumentFragment", "createElement", "createTextNode"])) {
+        module.fail("document missing a Node creation method");
+    }
+
+    if (!util.isHostMethod(document, "getElementsByTagName")) {
+        module.fail("document missing getElementsByTagName method");
+    }
+
+    var el = document.createElement("div");
+    if (!util.areHostMethods(el, ["insertBefore", "appendChild", "cloneNode"] ||
+            !util.areHostObjects(el, ["previousSibling", "nextSibling", "childNodes", "parentNode"]))) {
+        module.fail("Incomplete Element implementation");
+    }
+
+    // innerHTML is required for Range's createContextualFragment method
+    if (!util.isHostProperty(el, "innerHTML")) {
+        module.fail("Element is missing innerHTML property");
+    }
+
+    var textNode = document.createTextNode("test");
+    if (!util.areHostMethods(textNode, ["splitText", "deleteData", "insertData", "appendData", "cloneNode"] ||
+            !util.areHostObjects(el, ["previousSibling", "nextSibling", "childNodes", "parentNode"]) ||
+            !util.areHostProperties(textNode, ["data"]))) {
+        module.fail("Incomplete Text Node implementation");
+    }
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    // Removed use of indexOf because of a bizarre bug in Opera that is thrown in one of the Acid3 tests. I haven't been
+    // able to replicate it outside of the test. The bug is that indexOf returns -1 when called on an Array that
+    // contains just the document as a single element and the value searched for is the document.
+    var arrayContains = /*Array.prototype.indexOf ?
+        function(arr, val) {
+            return arr.indexOf(val) > -1;
+        }:*/
+
+        function(arr, val) {
+            var i = arr.length;
+            while (i--) {
+                if (arr[i] === val) {
+                    return true;
+                }
+            }
+            return false;
+        };
+
+    // Opera 11 puts HTML elements in the null namespace, it seems, and IE 7 has undefined namespaceURI
+    function isHtmlNamespace(node) {
+        var ns;
+        return typeof node.namespaceURI == UNDEF || ((ns = node.namespaceURI) === null || ns == "http://www.w3.org/1999/xhtml");
+    }
+
+    function parentElement(node) {
+        var parent = node.parentNode;
+        return (parent.nodeType == 1) ? parent : null;
+    }
+
+    function getNodeIndex(node) {
+        var i = 0;
+        while( (node = node.previousSibling) ) {
+            ++i;
+        }
+        return i;
+    }
+
+    function getNodeLength(node) {
+        switch (node.nodeType) {
+            case 7:
+            case 10:
+                return 0;
+            case 3:
+            case 8:
+                return node.length;
+            default:
+                return node.childNodes.length;
+        }
+    }
+
+    function getCommonAncestor(node1, node2) {
+        var ancestors = [], n;
+        for (n = node1; n; n = n.parentNode) {
+            ancestors.push(n);
+        }
+
+        for (n = node2; n; n = n.parentNode) {
+            if (arrayContains(ancestors, n)) {
+                return n;
+            }
+        }
+
+        return null;
+    }
+
+    function isAncestorOf(ancestor, descendant, selfIsAncestor) {
+        var n = selfIsAncestor ? descendant : descendant.parentNode;
+        while (n) {
+            if (n === ancestor) {
+                return true;
+            } else {
+                n = n.parentNode;
+            }
+        }
+        return false;
+    }
+
+    function isOrIsAncestorOf(ancestor, descendant) {
+        return isAncestorOf(ancestor, descendant, true);
+    }
+
+    function getClosestAncestorIn(node, ancestor, selfIsAncestor) {
+        var p, n = selfIsAncestor ? node : node.parentNode;
+        while (n) {
+            p = n.parentNode;
+            if (p === ancestor) {
+                return n;
+            }
+            n = p;
+        }
+        return null;
+    }
+
+    function isCharacterDataNode(node) {
+        var t = node.nodeType;
+        return t == 3 || t == 4 || t == 8 ; // Text, CDataSection or Comment
+    }
+
+    function isTextOrCommentNode(node) {
+        if (!node) {
+            return false;
+        }
+        var t = node.nodeType;
+        return t == 3 || t == 8 ; // Text or Comment
+    }
+
+    function insertAfter(node, precedingNode) {
+        var nextNode = precedingNode.nextSibling, parent = precedingNode.parentNode;
+        if (nextNode) {
+            parent.insertBefore(node, nextNode);
+        } else {
+            parent.appendChild(node);
+        }
+        return node;
+    }
+
+    // Note that we cannot use splitText() because it is bugridden in IE 9.
+    function splitDataNode(node, index, positionsToPreserve) {
+        log.debug("splitDataNode called at index " + index + " in node " + inspectNode(node));
+        var newNode = node.cloneNode(false);
+        newNode.deleteData(0, index);
+        node.deleteData(index, node.length - index);
+        insertAfter(newNode, node);
+
+        // Preserve positions
+        if (positionsToPreserve) {
+            for (var i = 0, position; position = positionsToPreserve[i++]; ) {
+                // Handle case where position was inside the portion of node after the split point
+                if (position.node == node && position.offset > index) {
+                    position.node = newNode;
+                    position.offset -= index;
+                }
+                // Handle the case where the position is a node offset within node's parent
+                else if (position.node == node.parentNode && position.offset > getNodeIndex(node)) {
+                    ++position.offset;
+                }
+            }
+        }
+        return newNode;
+    }
+
+    function getDocument(node) {
+        if (node.nodeType == 9) {
+            return node;
+        } else if (typeof node.ownerDocument != UNDEF) {
+            return node.ownerDocument;
+        } else if (typeof node.document != UNDEF) {
+            return node.document;
+        } else if (node.parentNode) {
+            return getDocument(node.parentNode);
+        } else {
+            throw module.createError("getDocument: no document found for node");
+        }
+    }
+
+    function getWindow(node) {
+        var doc = getDocument(node);
+        if (typeof doc.defaultView != UNDEF) {
+            return doc.defaultView;
+        } else if (typeof doc.parentWindow != UNDEF) {
+            return doc.parentWindow;
+        } else {
+            throw module.createError("Cannot get a window object for node");
+        }
+    }
+
+    function getIframeDocument(iframeEl) {
+        if (typeof iframeEl.contentDocument != UNDEF) {
+            return iframeEl.contentDocument;
+        } else if (typeof iframeEl.contentWindow != UNDEF) {
+            return iframeEl.contentWindow.document;
+        } else {
+            throw module.createError("getIframeDocument: No Document object found for iframe element");
+        }
+    }
+
+    function getIframeWindow(iframeEl) {
+        if (typeof iframeEl.contentWindow != UNDEF) {
+            return iframeEl.contentWindow;
+        } else if (typeof iframeEl.contentDocument != UNDEF) {
+            return iframeEl.contentDocument.defaultView;
+        } else {
+            throw module.createError("getIframeWindow: No Window object found for iframe element");
+        }
+    }
+
+    // This looks bad. Is it worth it?
+    function isWindow(obj) {
+        return obj && util.isHostMethod(obj, "setTimeout") && util.isHostObject(obj, "document");
+    }
+
+    function getContentDocument(obj, module, methodName) {
+        var doc;
+
+        if (!obj) {
+            doc = document;
+        }
+
+        // Test if a DOM node has been passed and obtain a document object for it if so
+        else if (util.isHostProperty(obj, "nodeType")) {
+            doc = (obj.nodeType == 1 && obj.tagName.toLowerCase() == "iframe") ?
+                getIframeDocument(obj) : getDocument(obj);
+        }
+
+        // Test if the doc parameter appears to be a Window object
+        else if (isWindow(obj)) {
+            doc = obj.document;
+        }
+
+        if (!doc) {
+            throw module.createError(methodName + "(): Parameter must be a Window object or DOM node");
+        }
+
+        return doc;
+    }
+
+    function getRootContainer(node) {
+        var parent;
+        while ( (parent = node.parentNode) ) {
+            node = parent;
+        }
+        return node;
+    }
+
+    function comparePoints(nodeA, offsetA, nodeB, offsetB) {
+        // See http://www.w3.org/TR/DOM-Level-2-Traversal-Range/ranges.html#Level-2-Range-Comparing
+        var nodeC, root, childA, childB, n;
+        if (nodeA == nodeB) {
+            log.debug("case 1");
+            // Case 1: nodes are the same
+            return offsetA === offsetB ? 0 : (offsetA < offsetB) ? -1 : 1;
+        } else if ( (nodeC = getClosestAncestorIn(nodeB, nodeA, true)) ) {
+            log.debug("case 2", inspectNode(nodeC), getNodeIndex(nodeC));
+            // Case 2: node C (container B or an ancestor) is a child node of A
+            return offsetA <= getNodeIndex(nodeC) ? -1 : 1;
+        } else if ( (nodeC = getClosestAncestorIn(nodeA, nodeB, true)) ) {
+            log.debug("case 3");
+            // Case 3: node C (container A or an ancestor) is a child node of B
+            return getNodeIndex(nodeC) < offsetB  ? -1 : 1;
+        } else {
+            root = getCommonAncestor(nodeA, nodeB);
+            if (!root) {
+                throw new Error("comparePoints error: nodes have no common ancestor");
+            }
+
+            // Case 4: containers are siblings or descendants of siblings
+            log.debug("case 4");
+            childA = (nodeA === root) ? root : getClosestAncestorIn(nodeA, root, true);
+            childB = (nodeB === root) ? root : getClosestAncestorIn(nodeB, root, true);
+
+            if (childA === childB) {
+                // This shouldn't be possible
+                log.warn("comparePoints got to case 4 and childA and childB are the same!", nodeA, offsetA, nodeB, offsetB);
+                throw module.createError("comparePoints got to case 4 and childA and childB are the same!");
+            } else {
+                n = root.firstChild;
+                while (n) {
+                    if (n === childA) {
+                        return -1;
+                    } else if (n === childB) {
+                        return 1;
+                    }
+                    n = n.nextSibling;
+                }
+            }
+        }
+    }
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    // Test for IE's crash (IE 6/7) or exception (IE >= 8) when a reference to garbage-collected text node is queried
+    var crashyTextNodes = false;
+
+    function isBrokenNode(node) {
+        var n;
+        try {
+            n = node.parentNode;
+            return false;
+        } catch (e) {
+            return true;
+        }
+    }
+
+    (function() {
+        var el = document.createElement("b");
+        el.innerHTML = "1";
+        var textNode = el.firstChild;
+        el.innerHTML = "<br>";
+        crashyTextNodes = isBrokenNode(textNode);
+
+        api.features.crashyTextNodes = crashyTextNodes;
+    })();
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    function inspectNode(node) {
+        if (!node) {
+            return "[No node]";
+        }
+        if (crashyTextNodes && isBrokenNode(node)) {
+            return "[Broken node]";
+        }
+        if (isCharacterDataNode(node)) {
+            return '"' + node.data + '"';
+        }
+        if (node.nodeType == 1) {
+            var idAttr = node.id ? ' id="' + node.id + '"' : "";
+            return "<" + node.nodeName + idAttr + ">[index:" + getNodeIndex(node) + ",length:" + node.childNodes.length + "][" + (node.innerHTML || "[innerHTML not supported]").slice(0, 25) + "]";
+        }
+        return node.nodeName;
+    }
+
+    function fragmentFromNodeChildren(node) {
+        var fragment = getDocument(node).createDocumentFragment(), child;
+        while ( (child = node.firstChild) ) {
+            fragment.appendChild(child);
+        }
+        return fragment;
+    }
+
+    var getComputedStyleProperty;
+    if (typeof window.getComputedStyle != UNDEF) {
+        getComputedStyleProperty = function(el, propName) {
+            return getWindow(el).getComputedStyle(el, null)[propName];
+        };
+    } else if (typeof document.documentElement.currentStyle != UNDEF) {
+        getComputedStyleProperty = function(el, propName) {
+            return el.currentStyle[propName];
+        };
+    } else {
+        module.fail("No means of obtaining computed style properties found");
+    }
+
+    function NodeIterator(root) {
+        this.root = root;
+        this._next = root;
+    }
+
+    NodeIterator.prototype = {
+        _current: null,
+
+        hasNext: function() {
+            return !!this._next;
+        },
+
+        next: function() {
+            var n = this._current = this._next;
+            var child, next;
+            if (this._current) {
+                child = n.firstChild;
+                if (child) {
+                    this._next = child;
+                } else {
+                    next = null;
+                    while ((n !== this.root) && !(next = n.nextSibling)) {
+                        n = n.parentNode;
+                    }
+                    this._next = next;
+                }
+            }
+            return this._current;
+        },
+
+        detach: function() {
+            this._current = this._next = this.root = null;
+        }
+    };
+
+    function createIterator(root) {
+        return new NodeIterator(root);
+    }
+
+    function DomPosition(node, offset) {
+        this.node = node;
+        this.offset = offset;
+    }
+
+    DomPosition.prototype = {
+        equals: function(pos) {
+            return !!pos && this.node === pos.node && this.offset == pos.offset;
+        },
+
+        inspect: function() {
+            return "[DomPosition(" + inspectNode(this.node) + ":" + this.offset + ")]";
+        },
+
+        toString: function() {
+            return this.inspect();
+        }
+    };
+
+    function DOMException(codeName) {
+        this.code = this[codeName];
+        this.codeName = codeName;
+        this.message = "DOMException: " + this.codeName;
+    }
+
+    DOMException.prototype = {
+        INDEX_SIZE_ERR: 1,
+        HIERARCHY_REQUEST_ERR: 3,
+        WRONG_DOCUMENT_ERR: 4,
+        NO_MODIFICATION_ALLOWED_ERR: 7,
+        NOT_FOUND_ERR: 8,
+        NOT_SUPPORTED_ERR: 9,
+        INVALID_STATE_ERR: 11,
+        INVALID_NODE_TYPE_ERR: 24
+    };
+
+    DOMException.prototype.toString = function() {
+        return this.message;
+    };
+
+    api.dom = {
+        arrayContains: arrayContains,
+        isHtmlNamespace: isHtmlNamespace,
+        parentElement: parentElement,
+        getNodeIndex: getNodeIndex,
+        getNodeLength: getNodeLength,
+        getCommonAncestor: getCommonAncestor,
+        isAncestorOf: isAncestorOf,
+        isOrIsAncestorOf: isOrIsAncestorOf,
+        getClosestAncestorIn: getClosestAncestorIn,
+        isCharacterDataNode: isCharacterDataNode,
+        isTextOrCommentNode: isTextOrCommentNode,
+        insertAfter: insertAfter,
+        splitDataNode: splitDataNode,
+        getDocument: getDocument,
+        getWindow: getWindow,
+        getIframeWindow: getIframeWindow,
+        getIframeDocument: getIframeDocument,
+        getBody: util.getBody,
+        isWindow: isWindow,
+        getContentDocument: getContentDocument,
+        getRootContainer: getRootContainer,
+        comparePoints: comparePoints,
+        isBrokenNode: isBrokenNode,
+        inspectNode: inspectNode,
+        getComputedStyleProperty: getComputedStyleProperty,
+        fragmentFromNodeChildren: fragmentFromNodeChildren,
+        createIterator: createIterator,
+        DomPosition: DomPosition
+    };
+
+    api.DOMException = DOMException;
 });
\ No newline at end of file
diff --git a/src/js/core/domrange.js b/src/core/domrange.js
similarity index 100%
rename from src/js/core/domrange.js
rename to src/core/domrange.js
diff --git a/src/js/core/wrappedrange.js b/src/core/wrappedrange.js
similarity index 97%
rename from src/js/core/wrappedrange.js
rename to src/core/wrappedrange.js
index 38ee6aad..d4e7c107 100644
--- a/src/js/core/wrappedrange.js
+++ b/src/core/wrappedrange.js
@@ -1,625 +1,625 @@
-// Wrappers for the browser's native DOM Range and/or TextRange implementation 
-/* build:replaceWith(api) */rangy/* build:replaceEnd */.createCoreModule("WrappedRange", ["DomRange"], function(api, module) {
-    var WrappedRange, WrappedTextRange;
-    var dom = api.dom;
-    var util = api.util;
-    var DomPosition = dom.DomPosition;
-    var DomRange = api.DomRange;
-    var getBody = dom.getBody;
-    var getContentDocument = dom.getContentDocument;
-    var isCharacterDataNode = dom.isCharacterDataNode;
-
-    var log = log4javascript.getLogger("rangy.WrappedRange");
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    if (api.features.implementsDomRange) {
-        // This is a wrapper around the browser's native DOM Range. It has two aims:
-        // - Provide workarounds for specific browser bugs
-        // - provide convenient extensions, which are inherited from Rangy's DomRange
-
-        (function() {
-            var rangeProto;
-            var rangeProperties = DomRange.rangeProperties;
-
-            function updateRangeProperties(range) {
-                var i = rangeProperties.length, prop;
-                while (i--) {
-                    prop = rangeProperties[i];
-                    range[prop] = range.nativeRange[prop];
-                }
-                // Fix for broken collapsed property in IE 9.
-                range.collapsed = (range.startContainer === range.endContainer && range.startOffset === range.endOffset);
-            }
-
-            function updateNativeRange(range, startContainer, startOffset, endContainer, endOffset) {
-                var startMoved = (range.startContainer !== startContainer || range.startOffset != startOffset);
-                var endMoved = (range.endContainer !== endContainer || range.endOffset != endOffset);
-                var nativeRangeDifferent = !range.equals(range.nativeRange);
-
-                // Always set both boundaries for the benefit of IE9 (see issue 35)
-                if (startMoved || endMoved || nativeRangeDifferent) {
-                    range.setEnd(endContainer, endOffset);
-                    range.setStart(startContainer, startOffset);
-                }
-            }
-
-            var createBeforeAfterNodeSetter;
-
-            WrappedRange = function(range) {
-                if (!range) {
-                    throw module.createError("WrappedRange: Range must be specified");
-                }
-                this.nativeRange = range;
-                updateRangeProperties(this);
-            };
-
-            DomRange.createPrototypeRange(WrappedRange, updateNativeRange);
-
-            rangeProto = WrappedRange.prototype;
-
-            rangeProto.selectNode = function(node) {
-                this.nativeRange.selectNode(node);
-                updateRangeProperties(this);
-            };
-
-            rangeProto.cloneContents = function() {
-                return this.nativeRange.cloneContents();
-            };
-
-            // Due to a long-standing Firefox bug that I have not been able to find a reliable way to detect,
-            // insertNode() is never delegated to the native range.
-
-            rangeProto.surroundContents = function(node) {
-                this.nativeRange.surroundContents(node);
-                updateRangeProperties(this);
-            };
-
-            rangeProto.collapse = function(isStart) {
-                this.nativeRange.collapse(isStart);
-                updateRangeProperties(this);
-            };
-
-            rangeProto.cloneRange = function() {
-                return new WrappedRange(this.nativeRange.cloneRange());
-            };
-
-            rangeProto.refresh = function() {
-                updateRangeProperties(this);
-            };
-
-            rangeProto.toString = function() {
-                return this.nativeRange.toString();
-            };
-
-            // Create test range and node for feature detection
-
-            var testTextNode = document.createTextNode("test");
-            getBody(document).appendChild(testTextNode);
-            var range = document.createRange();
-
-            /*--------------------------------------------------------------------------------------------------------*/
-
-            // Test for Firefox 2 bug that prevents moving the start of a Range to a point after its current end and
-            // correct for it
-
-            range.setStart(testTextNode, 0);
-            range.setEnd(testTextNode, 0);
-
-            try {
-                range.setStart(testTextNode, 1);
-
-                rangeProto.setStart = function(node, offset) {
-                    this.nativeRange.setStart(node, offset);
-                    updateRangeProperties(this);
-                };
-
-                rangeProto.setEnd = function(node, offset) {
-                    this.nativeRange.setEnd(node, offset);
-                    updateRangeProperties(this);
-                };
-
-                createBeforeAfterNodeSetter = function(name) {
-                    return function(node) {
-                        this.nativeRange[name](node);
-                        updateRangeProperties(this);
-                    };
-                };
-
-            } catch(ex) {
-                log.info("Browser has bug (present in Firefox 2 and below) that prevents moving the start of a Range to a point after its current end. Correcting for it.");
-
-                rangeProto.setStart = function(node, offset) {
-                    try {
-                        this.nativeRange.setStart(node, offset);
-                    } catch (ex) {
-                        this.nativeRange.setEnd(node, offset);
-                        this.nativeRange.setStart(node, offset);
-                    }
-                    updateRangeProperties(this);
-                };
-
-                rangeProto.setEnd = function(node, offset) {
-                    try {
-                        this.nativeRange.setEnd(node, offset);
-                    } catch (ex) {
-                        this.nativeRange.setStart(node, offset);
-                        this.nativeRange.setEnd(node, offset);
-                    }
-                    updateRangeProperties(this);
-                };
-
-                createBeforeAfterNodeSetter = function(name, oppositeName) {
-                    return function(node) {
-                        try {
-                            this.nativeRange[name](node);
-                        } catch (ex) {
-                            this.nativeRange[oppositeName](node);
-                            this.nativeRange[name](node);
-                        }
-                        updateRangeProperties(this);
-                    };
-                };
-            }
-
-            rangeProto.setStartBefore = createBeforeAfterNodeSetter("setStartBefore", "setEndBefore");
-            rangeProto.setStartAfter = createBeforeAfterNodeSetter("setStartAfter", "setEndAfter");
-            rangeProto.setEndBefore = createBeforeAfterNodeSetter("setEndBefore", "setStartBefore");
-            rangeProto.setEndAfter = createBeforeAfterNodeSetter("setEndAfter", "setStartAfter");
-
-            /*--------------------------------------------------------------------------------------------------------*/
-
-            // Always use DOM4-compliant selectNodeContents implementation: it's simpler and less code than testing
-            // whether the native implementation can be trusted
-            rangeProto.selectNodeContents = function(node) {
-                this.setStartAndEnd(node, 0, dom.getNodeLength(node));
-            };
-
-            /*--------------------------------------------------------------------------------------------------------*/
-
-            // Test for and correct WebKit bug that has the behaviour of compareBoundaryPoints round the wrong way for
-            // constants START_TO_END and END_TO_START: https://bugs.webkit.org/show_bug.cgi?id=20738
-
-            range.selectNodeContents(testTextNode);
-            range.setEnd(testTextNode, 3);
-
-            var range2 = document.createRange();
-            range2.selectNodeContents(testTextNode);
-            range2.setEnd(testTextNode, 4);
-            range2.setStart(testTextNode, 2);
-
-            if (range.compareBoundaryPoints(range.START_TO_END, range2) == -1 &&
-                    range.compareBoundaryPoints(range.END_TO_START, range2) == 1) {
-                // This is the wrong way round, so correct for it
-                log.info("START_TO_END and END_TO_START wrong way round. Correcting in wrapper.");
-
-                rangeProto.compareBoundaryPoints = function(type, range) {
-                    range = range.nativeRange || range;
-                    if (type == range.START_TO_END) {
-                        type = range.END_TO_START;
-                    } else if (type == range.END_TO_START) {
-                        type = range.START_TO_END;
-                    }
-                    return this.nativeRange.compareBoundaryPoints(type, range);
-                };
-            } else {
-                rangeProto.compareBoundaryPoints = function(type, range) {
-                    return this.nativeRange.compareBoundaryPoints(type, range.nativeRange || range);
-                };
-            }
-
-            /*--------------------------------------------------------------------------------------------------------*/
-
-            // Test for IE 9 deleteContents() and extractContents() bug and correct it. See issue 107.
-
-            var el = document.createElement("div");
-            el.innerHTML = "123";
-            var textNode = el.firstChild;
-            var body = getBody(document);
-            body.appendChild(el);
-
-            range.setStart(textNode, 1);
-            range.setEnd(textNode, 2);
-            range.deleteContents();
-
-            if (textNode.data == "13") {
-                // Behaviour is correct per DOM4 Range so wrap the browser's implementation of deleteContents() and
-                // extractContents()
-                rangeProto.deleteContents = function() {
-                    this.nativeRange.deleteContents();
-                    updateRangeProperties(this);
-                };
-
-                rangeProto.extractContents = function() {
-                    var frag = this.nativeRange.extractContents();
-                    updateRangeProperties(this);
-                    return frag;
-                };
-            } else {
-                log.info("Incorrect native Range deleteContents() implementation. Using Rangy's own.")
-            }
-
-            body.removeChild(el);
-            body = null;
-
-            /*--------------------------------------------------------------------------------------------------------*/
-
-            // Test for existence of createContextualFragment and delegate to it if it exists
-            if (util.isHostMethod(range, "createContextualFragment")) {
-                rangeProto.createContextualFragment = function(fragmentStr) {
-                    return this.nativeRange.createContextualFragment(fragmentStr);
-                };
-            }
-
-            /*--------------------------------------------------------------------------------------------------------*/
-
-            // Clean up
-            getBody(document).removeChild(testTextNode);
-
-            rangeProto.getName = function() {
-                return "WrappedRange";
-            };
-
-            api.WrappedRange = WrappedRange;
-
-            api.createNativeRange = function(doc) {
-                doc = getContentDocument(doc, module, "createNativeRange");
-                return doc.createRange();
-            };
-        })();
-    }
-    
-    if (api.features.implementsTextRange) {
-        /*
-        This is a workaround for a bug where IE returns the wrong container element from the TextRange's parentElement()
-        method. For example, in the following (where pipes denote the selection boundaries):
-
-        <ul id="ul"><li id="a">| a </li><li id="b"> b |</li></ul>
-
-        var range = document.selection.createRange();
-        alert(range.parentElement().id); // Should alert "ul" but alerts "b"
-
-        This method returns the common ancestor node of the following:
-        - the parentElement() of the textRange
-        - the parentElement() of the textRange after calling collapse(true)
-        - the parentElement() of the textRange after calling collapse(false)
-        */
-        var getTextRangeContainerElement = function(textRange) {
-            var parentEl = textRange.parentElement();
-            log.info("getTextRangeContainerElement parentEl is " + dom.inspectNode(parentEl));
-            var range = textRange.duplicate();
-            range.collapse(true);
-            var startEl = range.parentElement();
-            range = textRange.duplicate();
-            range.collapse(false);
-            var endEl = range.parentElement();
-            var startEndContainer = (startEl == endEl) ? startEl : dom.getCommonAncestor(startEl, endEl);
-
-            return startEndContainer == parentEl ? startEndContainer : dom.getCommonAncestor(parentEl, startEndContainer);
-        };
-
-        var textRangeIsCollapsed = function(textRange) {
-            return textRange.compareEndPoints("StartToEnd", textRange) == 0;
-        };
-
-        // Gets the boundary of a TextRange expressed as a node and an offset within that node. This function started
-        // out as an improved version of code found in Tim Cameron Ryan's IERange (http://code.google.com/p/ierange/)
-        // but has grown, fixing problems with line breaks in preformatted text, adding workaround for IE TextRange
-        // bugs, handling for inputs and images, plus optimizations.
-        var getTextRangeBoundaryPosition = function(textRange, wholeRangeContainerElement, isStart, isCollapsed, startInfo) {
-            var workingRange = textRange.duplicate();
-            workingRange.collapse(isStart);
-            var containerElement = workingRange.parentElement();
-
-            // Sometimes collapsing a TextRange that's at the start of a text node can move it into the previous node, so
-            // check for that
-            if (!dom.isOrIsAncestorOf(wholeRangeContainerElement, containerElement)) {
-                containerElement = wholeRangeContainerElement;
-                log.warn("Collapse has moved TextRange outside its original container, so correcting", dom.inspectNode(containerElement));
-            }
-
-            log.debug("getTextRangeBoundaryPosition start " + isStart + ", containerElement is " + dom.inspectNode(containerElement));
-
-            // Deal with nodes that cannot "contain rich HTML markup". In practice, this means form inputs, images and
-            // similar. See http://msdn.microsoft.com/en-us/library/aa703950%28VS.85%29.aspx
-            if (!containerElement.canHaveHTML) {
-                var pos = new DomPosition(containerElement.parentNode, dom.getNodeIndex(containerElement));
-                return {
-                    boundaryPosition: pos,
-                    nodeInfo: {
-                        nodeIndex: pos.offset,
-                        containerElement: pos.node
-                    }
-                };
-            }
-
-            var workingNode = dom.getDocument(containerElement).createElement("span");
-
-            // Workaround for HTML5 Shiv's insane violation of document.createElement(). See Rangy issue 104 and HTML5
-            // Shiv issue 64: https://github.com/aFarkas/html5shiv/issues/64
-            if (workingNode.parentNode) {
-                workingNode.parentNode.removeChild(workingNode);
-            }
-
-            var comparison, workingComparisonType = isStart ? "StartToStart" : "StartToEnd";
-            var previousNode, nextNode, boundaryPosition, boundaryNode;
-            var start = (startInfo && startInfo.containerElement == containerElement) ? startInfo.nodeIndex : 0;
-            var childNodeCount = containerElement.childNodes.length;
-            var end = childNodeCount;
-
-            // Check end first. Code within the loop assumes that the endth child node of the container is definitely
-            // after the range boundary.
-            var nodeIndex = end;
-
-            while (true) {
-                log.debug("nodeIndex is " + nodeIndex + ", start: " + start + ", end: " + end);
-                if (nodeIndex == childNodeCount) {
-                    containerElement.appendChild(workingNode);
-                } else {
-                    containerElement.insertBefore(workingNode, containerElement.childNodes[nodeIndex]);
-                }
-                workingRange.moveToElementText(workingNode);
-                comparison = workingRange.compareEndPoints(workingComparisonType, textRange);
-                if (comparison == 0 || start == end) {
-                    break;
-                } else if (comparison == -1) {
-                    if (end == start + 1) {
-                        // We know the endth child node is after the range boundary, so we must be done.
-                        break;
-                    } else {
-                        start = nodeIndex;
-                    }
-                } else {
-                    end = (end == start + 1) ? start : nodeIndex;
-                }
-                nodeIndex = Math.floor((start + end) / 2);
-                containerElement.removeChild(workingNode);
-            }
-
-            log.debug("*** GOT node index " + nodeIndex);
-
-            // We've now reached or gone past the boundary of the text range we're interested in
-            // so have identified the node we want
-            boundaryNode = workingNode.nextSibling;
-
-            if (comparison == -1 && boundaryNode && isCharacterDataNode(boundaryNode)) {
-                // This is a character data node (text, comment, cdata). The working range is collapsed at the start of
-                // the node containing the text range's boundary, so we move the end of the working range to the
-                // boundary point and measure the length of its text to get the boundary's offset within the node.
-                workingRange.setEndPoint(isStart ? "EndToStart" : "EndToEnd", textRange);
-
-                var offset;
-
-                if (/[\r\n]/.test(boundaryNode.data)) {
-                    /*
-                    For the particular case of a boundary within a text node containing rendered line breaks (within a
-                    <pre> element, for example), we need a slightly complicated approach to get the boundary's offset in
-                    IE. The facts:
-                    
-                    - Each line break is represented as \r in the text node's data/nodeValue properties
-                    - Each line break is represented as \r\n in the TextRange's 'text' property
-                    - The 'text' property of the TextRange does not contain trailing line breaks
-                    
-                    To get round the problem presented by the final fact above, we can use the fact that TextRange's
-                    moveStart() and moveEnd() methods return the actual number of characters moved, which is not
-                    necessarily the same as the number of characters it was instructed to move. The simplest approach is
-                    to use this to store the characters moved when moving both the start and end of the range to the
-                    start of the document body and subtracting the start offset from the end offset (the
-                    "move-negative-gazillion" method). However, this is extremely slow when the document is large and
-                    the range is near the end of it. Clearly doing the mirror image (i.e. moving the range boundaries to
-                    the end of the document) has the same problem.
-                    
-                    Another approach that works is to use moveStart() to move the start boundary of the range up to the
-                    end boundary one character at a time and incrementing a counter with the value returned by the
-                    moveStart() call. However, the check for whether the start boundary has reached the end boundary is
-                    expensive, so this method is slow (although unlike "move-negative-gazillion" is largely unaffected
-                    by the location of the range within the document).
-                    
-                    The approach used below is a hybrid of the two methods above. It uses the fact that a string
-                    containing the TextRange's 'text' property with each \r\n converted to a single \r character cannot
-                    be longer than the text of the TextRange, so the start of the range is moved that length initially
-                    and then a character at a time to make up for any trailing line breaks not contained in the 'text'
-                    property. This has good performance in most situations compared to the previous two methods.
-                    */
-                    var tempRange = workingRange.duplicate();
-                    var rangeLength = tempRange.text.replace(/\r\n/g, "\r").length;
-
-                    offset = tempRange.moveStart("character", rangeLength);
-                    while ( (comparison = tempRange.compareEndPoints("StartToEnd", tempRange)) == -1) {
-                        offset++;
-                        tempRange.moveStart("character", 1);
-                    }
-                } else {
-                    offset = workingRange.text.length;
-                }
-                boundaryPosition = new DomPosition(boundaryNode, offset);
-            } else {
-                log.debug("Range boundary is at node boundary");
-
-                // If the boundary immediately follows a character data node and this is the end boundary, we should favour
-                // a position within that, and likewise for a start boundary preceding a character data node
-                previousNode = (isCollapsed || !isStart) && workingNode.previousSibling;
-                nextNode = (isCollapsed || isStart) && workingNode.nextSibling;
-                log.info("workingNode: " + dom.inspectNode(workingNode));
-                log.info("previousNode: " + dom.inspectNode(previousNode));
-                log.info("nextNode: " + dom.inspectNode(nextNode));
-                if (nextNode && isCharacterDataNode(nextNode)) {
-                    boundaryPosition = new DomPosition(nextNode, 0);
-                } else if (previousNode && isCharacterDataNode(previousNode)) {
-                    boundaryPosition = new DomPosition(previousNode, previousNode.data.length);
-                } else {
-                    boundaryPosition = new DomPosition(containerElement, dom.getNodeIndex(workingNode));
-                }
-            }
-
-            // Clean up
-            workingNode.parentNode.removeChild(workingNode);
-
-            return {
-                boundaryPosition: boundaryPosition,
-                nodeInfo: {
-                    nodeIndex: nodeIndex,
-                    containerElement: containerElement
-                }
-            };
-        };
-
-        // Returns a TextRange representing the boundary of a TextRange expressed as a node and an offset within that
-        // node. This function started out as an optimized version of code found in Tim Cameron Ryan's IERange
-        // (http://code.google.com/p/ierange/)
-        var createBoundaryTextRange = function(boundaryPosition, isStart) {
-            var boundaryNode, boundaryParent, boundaryOffset = boundaryPosition.offset;
-            var doc = dom.getDocument(boundaryPosition.node);
-            var workingNode, childNodes, workingRange = getBody(doc).createTextRange();
-            var nodeIsDataNode = isCharacterDataNode(boundaryPosition.node);
-
-            if (nodeIsDataNode) {
-                boundaryNode = boundaryPosition.node;
-                boundaryParent = boundaryNode.parentNode;
-            } else {
-                childNodes = boundaryPosition.node.childNodes;
-                boundaryNode = (boundaryOffset < childNodes.length) ? childNodes[boundaryOffset] : null;
-                boundaryParent = boundaryPosition.node;
-            }
-
-            // Position the range immediately before the node containing the boundary
-            workingNode = doc.createElement("span");
-
-            // Making the working element non-empty element persuades IE to consider the TextRange boundary to be within
-            // the element rather than immediately before or after it
-            workingNode.innerHTML = "&#feff;";
-
-            // insertBefore is supposed to work like appendChild if the second parameter is null. However, a bug report
-            // for IERange suggests that it can crash the browser: http://code.google.com/p/ierange/issues/detail?id=12
-            if (boundaryNode) {
-                boundaryParent.insertBefore(workingNode, boundaryNode);
-            } else {
-                boundaryParent.appendChild(workingNode);
-            }
-
-            workingRange.moveToElementText(workingNode);
-            workingRange.collapse(!isStart);
-
-            // Clean up
-            boundaryParent.removeChild(workingNode);
-
-            // Move the working range to the text offset, if required
-            if (nodeIsDataNode) {
-                workingRange[isStart ? "moveStart" : "moveEnd"]("character", boundaryOffset);
-            }
-
-            return workingRange;
-        };
-
-        /*------------------------------------------------------------------------------------------------------------*/
-
-        // This is a wrapper around a TextRange, providing full DOM Range functionality using rangy's DomRange as a
-        // prototype
-
-        WrappedTextRange = function(textRange) {
-            this.textRange = textRange;
-            this.refresh();
-        };
-
-        WrappedTextRange.prototype = new DomRange(document);
-
-        WrappedTextRange.prototype.refresh = function() {
-            var start, end, startBoundary;
-
-            // TextRange's parentElement() method cannot be trusted. getTextRangeContainerElement() works around that.
-            var rangeContainerElement = getTextRangeContainerElement(this.textRange);
-
-            if (textRangeIsCollapsed(this.textRange)) {
-                end = start = getTextRangeBoundaryPosition(this.textRange, rangeContainerElement, true,
-                    true).boundaryPosition;
-            } else {
-                log.debug("Refreshing Range from TextRange. parent element: " + dom.inspectNode(rangeContainerElement) + ", parentElement(): " + dom.inspectNode(this.textRange.parentElement()));
-                startBoundary = getTextRangeBoundaryPosition(this.textRange, rangeContainerElement, true, false);
-                start = startBoundary.boundaryPosition;
-
-                // An optimization used here is that if the start and end boundaries have the same parent element, the
-                // search scope for the end boundary can be limited to exclude the portion of the element that precedes
-                // the start boundary
-                end = getTextRangeBoundaryPosition(this.textRange, rangeContainerElement, false, false,
-                    startBoundary.nodeInfo).boundaryPosition;
-            }
-
-            this.setStart(start.node, start.offset);
-            this.setEnd(end.node, end.offset);
-        };
-
-        WrappedTextRange.prototype.getName = function() {
-            return "WrappedTextRange";
-        };
-
-        DomRange.copyComparisonConstants(WrappedTextRange);
-
-        var rangeToTextRange = function(range) {
-            if (range.collapsed) {
-                return createBoundaryTextRange(new DomPosition(range.startContainer, range.startOffset), true);
-            } else {
-                var startRange = createBoundaryTextRange(new DomPosition(range.startContainer, range.startOffset), true);
-                var endRange = createBoundaryTextRange(new DomPosition(range.endContainer, range.endOffset), false);
-                var textRange = getBody( DomRange.getRangeDocument(range) ).createTextRange();
-                textRange.setEndPoint("StartToStart", startRange);
-                textRange.setEndPoint("EndToEnd", endRange);
-                return textRange;
-            }
-        };
-
-        WrappedTextRange.rangeToTextRange = rangeToTextRange;
-
-        WrappedTextRange.prototype.toTextRange = function() {
-            return rangeToTextRange(this);
-        };
-
-        api.WrappedTextRange = WrappedTextRange;
-
-        // IE 9 and above have both implementations and Rangy makes both available. The next few lines sets which
-        // implementation to use by default.
-        if (!api.features.implementsDomRange || api.config.preferTextRange) {
-            // Add WrappedTextRange as the Range property of the global object to allow expression like Range.END_TO_END to work
-            var globalObj = (function() { return this; })();
-            if (typeof globalObj.Range == "undefined") {
-                globalObj.Range = WrappedTextRange;
-            }
-
-            api.createNativeRange = function(doc) {
-                doc = getContentDocument(doc, module, "createNativeRange");
-                return getBody(doc).createTextRange();
-            };
-
-            api.WrappedRange = WrappedTextRange;
-        }
-    }
-
-    api.createRange = function(doc) {
-        doc = getContentDocument(doc, module, "createRange");
-        return new api.WrappedRange(api.createNativeRange(doc));
-    };
-
-    api.createRangyRange = function(doc) {
-        doc = getContentDocument(doc, module, "createRangyRange");
-        return new DomRange(doc);
-    };
-
-    api.createIframeRange = function(iframeEl) {
-        module.deprecationNotice("createIframeRange()", "createRange(iframeEl)");
-        return api.createRange(iframeEl);
-    };
-
-    api.createIframeRangyRange = function(iframeEl) {
-        module.deprecationNotice("createIframeRangyRange()", "createRangyRange(iframeEl)");
-        return api.createRangyRange(iframeEl);
-    };
-
-    api.addShimListener(function(win) {
-        var doc = win.document;
-        if (typeof doc.createRange == "undefined") {
-            doc.createRange = function() {
-                return api.createRange(doc);
-            };
-        }
-        doc = win = null;
-    });
+// Wrappers for the browser's native DOM Range and/or TextRange implementation 
+/* build:replaceWith(api) */rangy/* build:replaceEnd */.createCoreModule("WrappedRange", ["DomRange"], function(api, module) {
+    var WrappedRange, WrappedTextRange;
+    var dom = api.dom;
+    var util = api.util;
+    var DomPosition = dom.DomPosition;
+    var DomRange = api.DomRange;
+    var getBody = dom.getBody;
+    var getContentDocument = dom.getContentDocument;
+    var isCharacterDataNode = dom.isCharacterDataNode;
+
+    var log = log4javascript.getLogger("rangy.WrappedRange");
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    if (api.features.implementsDomRange) {
+        // This is a wrapper around the browser's native DOM Range. It has two aims:
+        // - Provide workarounds for specific browser bugs
+        // - provide convenient extensions, which are inherited from Rangy's DomRange
+
+        (function() {
+            var rangeProto;
+            var rangeProperties = DomRange.rangeProperties;
+
+            function updateRangeProperties(range) {
+                var i = rangeProperties.length, prop;
+                while (i--) {
+                    prop = rangeProperties[i];
+                    range[prop] = range.nativeRange[prop];
+                }
+                // Fix for broken collapsed property in IE 9.
+                range.collapsed = (range.startContainer === range.endContainer && range.startOffset === range.endOffset);
+            }
+
+            function updateNativeRange(range, startContainer, startOffset, endContainer, endOffset) {
+                var startMoved = (range.startContainer !== startContainer || range.startOffset != startOffset);
+                var endMoved = (range.endContainer !== endContainer || range.endOffset != endOffset);
+                var nativeRangeDifferent = !range.equals(range.nativeRange);
+
+                // Always set both boundaries for the benefit of IE9 (see issue 35)
+                if (startMoved || endMoved || nativeRangeDifferent) {
+                    range.setEnd(endContainer, endOffset);
+                    range.setStart(startContainer, startOffset);
+                }
+            }
+
+            var createBeforeAfterNodeSetter;
+
+            WrappedRange = function(range) {
+                if (!range) {
+                    throw module.createError("WrappedRange: Range must be specified");
+                }
+                this.nativeRange = range;
+                updateRangeProperties(this);
+            };
+
+            DomRange.createPrototypeRange(WrappedRange, updateNativeRange);
+
+            rangeProto = WrappedRange.prototype;
+
+            rangeProto.selectNode = function(node) {
+                this.nativeRange.selectNode(node);
+                updateRangeProperties(this);
+            };
+
+            rangeProto.cloneContents = function() {
+                return this.nativeRange.cloneContents();
+            };
+
+            // Due to a long-standing Firefox bug that I have not been able to find a reliable way to detect,
+            // insertNode() is never delegated to the native range.
+
+            rangeProto.surroundContents = function(node) {
+                this.nativeRange.surroundContents(node);
+                updateRangeProperties(this);
+            };
+
+            rangeProto.collapse = function(isStart) {
+                this.nativeRange.collapse(isStart);
+                updateRangeProperties(this);
+            };
+
+            rangeProto.cloneRange = function() {
+                return new WrappedRange(this.nativeRange.cloneRange());
+            };
+
+            rangeProto.refresh = function() {
+                updateRangeProperties(this);
+            };
+
+            rangeProto.toString = function() {
+                return this.nativeRange.toString();
+            };
+
+            // Create test range and node for feature detection
+
+            var testTextNode = document.createTextNode("test");
+            getBody(document).appendChild(testTextNode);
+            var range = document.createRange();
+
+            /*--------------------------------------------------------------------------------------------------------*/
+
+            // Test for Firefox 2 bug that prevents moving the start of a Range to a point after its current end and
+            // correct for it
+
+            range.setStart(testTextNode, 0);
+            range.setEnd(testTextNode, 0);
+
+            try {
+                range.setStart(testTextNode, 1);
+
+                rangeProto.setStart = function(node, offset) {
+                    this.nativeRange.setStart(node, offset);
+                    updateRangeProperties(this);
+                };
+
+                rangeProto.setEnd = function(node, offset) {
+                    this.nativeRange.setEnd(node, offset);
+                    updateRangeProperties(this);
+                };
+
+                createBeforeAfterNodeSetter = function(name) {
+                    return function(node) {
+                        this.nativeRange[name](node);
+                        updateRangeProperties(this);
+                    };
+                };
+
+            } catch(ex) {
+                log.info("Browser has bug (present in Firefox 2 and below) that prevents moving the start of a Range to a point after its current end. Correcting for it.");
+
+                rangeProto.setStart = function(node, offset) {
+                    try {
+                        this.nativeRange.setStart(node, offset);
+                    } catch (ex) {
+                        this.nativeRange.setEnd(node, offset);
+                        this.nativeRange.setStart(node, offset);
+                    }
+                    updateRangeProperties(this);
+                };
+
+                rangeProto.setEnd = function(node, offset) {
+                    try {
+                        this.nativeRange.setEnd(node, offset);
+                    } catch (ex) {
+                        this.nativeRange.setStart(node, offset);
+                        this.nativeRange.setEnd(node, offset);
+                    }
+                    updateRangeProperties(this);
+                };
+
+                createBeforeAfterNodeSetter = function(name, oppositeName) {
+                    return function(node) {
+                        try {
+                            this.nativeRange[name](node);
+                        } catch (ex) {
+                            this.nativeRange[oppositeName](node);
+                            this.nativeRange[name](node);
+                        }
+                        updateRangeProperties(this);
+                    };
+                };
+            }
+
+            rangeProto.setStartBefore = createBeforeAfterNodeSetter("setStartBefore", "setEndBefore");
+            rangeProto.setStartAfter = createBeforeAfterNodeSetter("setStartAfter", "setEndAfter");
+            rangeProto.setEndBefore = createBeforeAfterNodeSetter("setEndBefore", "setStartBefore");
+            rangeProto.setEndAfter = createBeforeAfterNodeSetter("setEndAfter", "setStartAfter");
+
+            /*--------------------------------------------------------------------------------------------------------*/
+
+            // Always use DOM4-compliant selectNodeContents implementation: it's simpler and less code than testing
+            // whether the native implementation can be trusted
+            rangeProto.selectNodeContents = function(node) {
+                this.setStartAndEnd(node, 0, dom.getNodeLength(node));
+            };
+
+            /*--------------------------------------------------------------------------------------------------------*/
+
+            // Test for and correct WebKit bug that has the behaviour of compareBoundaryPoints round the wrong way for
+            // constants START_TO_END and END_TO_START: https://bugs.webkit.org/show_bug.cgi?id=20738
+
+            range.selectNodeContents(testTextNode);
+            range.setEnd(testTextNode, 3);
+
+            var range2 = document.createRange();
+            range2.selectNodeContents(testTextNode);
+            range2.setEnd(testTextNode, 4);
+            range2.setStart(testTextNode, 2);
+
+            if (range.compareBoundaryPoints(range.START_TO_END, range2) == -1 &&
+                    range.compareBoundaryPoints(range.END_TO_START, range2) == 1) {
+                // This is the wrong way round, so correct for it
+                log.info("START_TO_END and END_TO_START wrong way round. Correcting in wrapper.");
+
+                rangeProto.compareBoundaryPoints = function(type, range) {
+                    range = range.nativeRange || range;
+                    if (type == range.START_TO_END) {
+                        type = range.END_TO_START;
+                    } else if (type == range.END_TO_START) {
+                        type = range.START_TO_END;
+                    }
+                    return this.nativeRange.compareBoundaryPoints(type, range);
+                };
+            } else {
+                rangeProto.compareBoundaryPoints = function(type, range) {
+                    return this.nativeRange.compareBoundaryPoints(type, range.nativeRange || range);
+                };
+            }
+
+            /*--------------------------------------------------------------------------------------------------------*/
+
+            // Test for IE 9 deleteContents() and extractContents() bug and correct it. See issue 107.
+
+            var el = document.createElement("div");
+            el.innerHTML = "123";
+            var textNode = el.firstChild;
+            var body = getBody(document);
+            body.appendChild(el);
+
+            range.setStart(textNode, 1);
+            range.setEnd(textNode, 2);
+            range.deleteContents();
+
+            if (textNode.data == "13") {
+                // Behaviour is correct per DOM4 Range so wrap the browser's implementation of deleteContents() and
+                // extractContents()
+                rangeProto.deleteContents = function() {
+                    this.nativeRange.deleteContents();
+                    updateRangeProperties(this);
+                };
+
+                rangeProto.extractContents = function() {
+                    var frag = this.nativeRange.extractContents();
+                    updateRangeProperties(this);
+                    return frag;
+                };
+            } else {
+                log.info("Incorrect native Range deleteContents() implementation. Using Rangy's own.")
+            }
+
+            body.removeChild(el);
+            body = null;
+
+            /*--------------------------------------------------------------------------------------------------------*/
+
+            // Test for existence of createContextualFragment and delegate to it if it exists
+            if (util.isHostMethod(range, "createContextualFragment")) {
+                rangeProto.createContextualFragment = function(fragmentStr) {
+                    return this.nativeRange.createContextualFragment(fragmentStr);
+                };
+            }
+
+            /*--------------------------------------------------------------------------------------------------------*/
+
+            // Clean up
+            getBody(document).removeChild(testTextNode);
+
+            rangeProto.getName = function() {
+                return "WrappedRange";
+            };
+
+            api.WrappedRange = WrappedRange;
+
+            api.createNativeRange = function(doc) {
+                doc = getContentDocument(doc, module, "createNativeRange");
+                return doc.createRange();
+            };
+        })();
+    }
+    
+    if (api.features.implementsTextRange) {
+        /*
+        This is a workaround for a bug where IE returns the wrong container element from the TextRange's parentElement()
+        method. For example, in the following (where pipes denote the selection boundaries):
+
+        <ul id="ul"><li id="a">| a </li><li id="b"> b |</li></ul>
+
+        var range = document.selection.createRange();
+        alert(range.parentElement().id); // Should alert "ul" but alerts "b"
+
+        This method returns the common ancestor node of the following:
+        - the parentElement() of the textRange
+        - the parentElement() of the textRange after calling collapse(true)
+        - the parentElement() of the textRange after calling collapse(false)
+        */
+        var getTextRangeContainerElement = function(textRange) {
+            var parentEl = textRange.parentElement();
+            log.info("getTextRangeContainerElement parentEl is " + dom.inspectNode(parentEl));
+            var range = textRange.duplicate();
+            range.collapse(true);
+            var startEl = range.parentElement();
+            range = textRange.duplicate();
+            range.collapse(false);
+            var endEl = range.parentElement();
+            var startEndContainer = (startEl == endEl) ? startEl : dom.getCommonAncestor(startEl, endEl);
+
+            return startEndContainer == parentEl ? startEndContainer : dom.getCommonAncestor(parentEl, startEndContainer);
+        };
+
+        var textRangeIsCollapsed = function(textRange) {
+            return textRange.compareEndPoints("StartToEnd", textRange) == 0;
+        };
+
+        // Gets the boundary of a TextRange expressed as a node and an offset within that node. This function started
+        // out as an improved version of code found in Tim Cameron Ryan's IERange (http://code.google.com/p/ierange/)
+        // but has grown, fixing problems with line breaks in preformatted text, adding workaround for IE TextRange
+        // bugs, handling for inputs and images, plus optimizations.
+        var getTextRangeBoundaryPosition = function(textRange, wholeRangeContainerElement, isStart, isCollapsed, startInfo) {
+            var workingRange = textRange.duplicate();
+            workingRange.collapse(isStart);
+            var containerElement = workingRange.parentElement();
+
+            // Sometimes collapsing a TextRange that's at the start of a text node can move it into the previous node, so
+            // check for that
+            if (!dom.isOrIsAncestorOf(wholeRangeContainerElement, containerElement)) {
+                containerElement = wholeRangeContainerElement;
+                log.warn("Collapse has moved TextRange outside its original container, so correcting", dom.inspectNode(containerElement));
+            }
+
+            log.debug("getTextRangeBoundaryPosition start " + isStart + ", containerElement is " + dom.inspectNode(containerElement));
+
+            // Deal with nodes that cannot "contain rich HTML markup". In practice, this means form inputs, images and
+            // similar. See http://msdn.microsoft.com/en-us/library/aa703950%28VS.85%29.aspx
+            if (!containerElement.canHaveHTML) {
+                var pos = new DomPosition(containerElement.parentNode, dom.getNodeIndex(containerElement));
+                return {
+                    boundaryPosition: pos,
+                    nodeInfo: {
+                        nodeIndex: pos.offset,
+                        containerElement: pos.node
+                    }
+                };
+            }
+
+            var workingNode = dom.getDocument(containerElement).createElement("span");
+
+            // Workaround for HTML5 Shiv's insane violation of document.createElement(). See Rangy issue 104 and HTML5
+            // Shiv issue 64: https://github.com/aFarkas/html5shiv/issues/64
+            if (workingNode.parentNode) {
+                workingNode.parentNode.removeChild(workingNode);
+            }
+
+            var comparison, workingComparisonType = isStart ? "StartToStart" : "StartToEnd";
+            var previousNode, nextNode, boundaryPosition, boundaryNode;
+            var start = (startInfo && startInfo.containerElement == containerElement) ? startInfo.nodeIndex : 0;
+            var childNodeCount = containerElement.childNodes.length;
+            var end = childNodeCount;
+
+            // Check end first. Code within the loop assumes that the endth child node of the container is definitely
+            // after the range boundary.
+            var nodeIndex = end;
+
+            while (true) {
+                log.debug("nodeIndex is " + nodeIndex + ", start: " + start + ", end: " + end);
+                if (nodeIndex == childNodeCount) {
+                    containerElement.appendChild(workingNode);
+                } else {
+                    containerElement.insertBefore(workingNode, containerElement.childNodes[nodeIndex]);
+                }
+                workingRange.moveToElementText(workingNode);
+                comparison = workingRange.compareEndPoints(workingComparisonType, textRange);
+                if (comparison == 0 || start == end) {
+                    break;
+                } else if (comparison == -1) {
+                    if (end == start + 1) {
+                        // We know the endth child node is after the range boundary, so we must be done.
+                        break;
+                    } else {
+                        start = nodeIndex;
+                    }
+                } else {
+                    end = (end == start + 1) ? start : nodeIndex;
+                }
+                nodeIndex = Math.floor((start + end) / 2);
+                containerElement.removeChild(workingNode);
+            }
+
+            log.debug("*** GOT node index " + nodeIndex);
+
+            // We've now reached or gone past the boundary of the text range we're interested in
+            // so have identified the node we want
+            boundaryNode = workingNode.nextSibling;
+
+            if (comparison == -1 && boundaryNode && isCharacterDataNode(boundaryNode)) {
+                // This is a character data node (text, comment, cdata). The working range is collapsed at the start of
+                // the node containing the text range's boundary, so we move the end of the working range to the
+                // boundary point and measure the length of its text to get the boundary's offset within the node.
+                workingRange.setEndPoint(isStart ? "EndToStart" : "EndToEnd", textRange);
+
+                var offset;
+
+                if (/[\r\n]/.test(boundaryNode.data)) {
+                    /*
+                    For the particular case of a boundary within a text node containing rendered line breaks (within a
+                    <pre> element, for example), we need a slightly complicated approach to get the boundary's offset in
+                    IE. The facts:
+                    
+                    - Each line break is represented as \r in the text node's data/nodeValue properties
+                    - Each line break is represented as \r\n in the TextRange's 'text' property
+                    - The 'text' property of the TextRange does not contain trailing line breaks
+                    
+                    To get round the problem presented by the final fact above, we can use the fact that TextRange's
+                    moveStart() and moveEnd() methods return the actual number of characters moved, which is not
+                    necessarily the same as the number of characters it was instructed to move. The simplest approach is
+                    to use this to store the characters moved when moving both the start and end of the range to the
+                    start of the document body and subtracting the start offset from the end offset (the
+                    "move-negative-gazillion" method). However, this is extremely slow when the document is large and
+                    the range is near the end of it. Clearly doing the mirror image (i.e. moving the range boundaries to
+                    the end of the document) has the same problem.
+                    
+                    Another approach that works is to use moveStart() to move the start boundary of the range up to the
+                    end boundary one character at a time and incrementing a counter with the value returned by the
+                    moveStart() call. However, the check for whether the start boundary has reached the end boundary is
+                    expensive, so this method is slow (although unlike "move-negative-gazillion" is largely unaffected
+                    by the location of the range within the document).
+                    
+                    The approach used below is a hybrid of the two methods above. It uses the fact that a string
+                    containing the TextRange's 'text' property with each \r\n converted to a single \r character cannot
+                    be longer than the text of the TextRange, so the start of the range is moved that length initially
+                    and then a character at a time to make up for any trailing line breaks not contained in the 'text'
+                    property. This has good performance in most situations compared to the previous two methods.
+                    */
+                    var tempRange = workingRange.duplicate();
+                    var rangeLength = tempRange.text.replace(/\r\n/g, "\r").length;
+
+                    offset = tempRange.moveStart("character", rangeLength);
+                    while ( (comparison = tempRange.compareEndPoints("StartToEnd", tempRange)) == -1) {
+                        offset++;
+                        tempRange.moveStart("character", 1);
+                    }
+                } else {
+                    offset = workingRange.text.length;
+                }
+                boundaryPosition = new DomPosition(boundaryNode, offset);
+            } else {
+                log.debug("Range boundary is at node boundary");
+
+                // If the boundary immediately follows a character data node and this is the end boundary, we should favour
+                // a position within that, and likewise for a start boundary preceding a character data node
+                previousNode = (isCollapsed || !isStart) && workingNode.previousSibling;
+                nextNode = (isCollapsed || isStart) && workingNode.nextSibling;
+                log.info("workingNode: " + dom.inspectNode(workingNode));
+                log.info("previousNode: " + dom.inspectNode(previousNode));
+                log.info("nextNode: " + dom.inspectNode(nextNode));
+                if (nextNode && isCharacterDataNode(nextNode)) {
+                    boundaryPosition = new DomPosition(nextNode, 0);
+                } else if (previousNode && isCharacterDataNode(previousNode)) {
+                    boundaryPosition = new DomPosition(previousNode, previousNode.data.length);
+                } else {
+                    boundaryPosition = new DomPosition(containerElement, dom.getNodeIndex(workingNode));
+                }
+            }
+
+            // Clean up
+            workingNode.parentNode.removeChild(workingNode);
+
+            return {
+                boundaryPosition: boundaryPosition,
+                nodeInfo: {
+                    nodeIndex: nodeIndex,
+                    containerElement: containerElement
+                }
+            };
+        };
+
+        // Returns a TextRange representing the boundary of a TextRange expressed as a node and an offset within that
+        // node. This function started out as an optimized version of code found in Tim Cameron Ryan's IERange
+        // (http://code.google.com/p/ierange/)
+        var createBoundaryTextRange = function(boundaryPosition, isStart) {
+            var boundaryNode, boundaryParent, boundaryOffset = boundaryPosition.offset;
+            var doc = dom.getDocument(boundaryPosition.node);
+            var workingNode, childNodes, workingRange = getBody(doc).createTextRange();
+            var nodeIsDataNode = isCharacterDataNode(boundaryPosition.node);
+
+            if (nodeIsDataNode) {
+                boundaryNode = boundaryPosition.node;
+                boundaryParent = boundaryNode.parentNode;
+            } else {
+                childNodes = boundaryPosition.node.childNodes;
+                boundaryNode = (boundaryOffset < childNodes.length) ? childNodes[boundaryOffset] : null;
+                boundaryParent = boundaryPosition.node;
+            }
+
+            // Position the range immediately before the node containing the boundary
+            workingNode = doc.createElement("span");
+
+            // Making the working element non-empty element persuades IE to consider the TextRange boundary to be within
+            // the element rather than immediately before or after it
+            workingNode.innerHTML = "&#feff;";
+
+            // insertBefore is supposed to work like appendChild if the second parameter is null. However, a bug report
+            // for IERange suggests that it can crash the browser: http://code.google.com/p/ierange/issues/detail?id=12
+            if (boundaryNode) {
+                boundaryParent.insertBefore(workingNode, boundaryNode);
+            } else {
+                boundaryParent.appendChild(workingNode);
+            }
+
+            workingRange.moveToElementText(workingNode);
+            workingRange.collapse(!isStart);
+
+            // Clean up
+            boundaryParent.removeChild(workingNode);
+
+            // Move the working range to the text offset, if required
+            if (nodeIsDataNode) {
+                workingRange[isStart ? "moveStart" : "moveEnd"]("character", boundaryOffset);
+            }
+
+            return workingRange;
+        };
+
+        /*------------------------------------------------------------------------------------------------------------*/
+
+        // This is a wrapper around a TextRange, providing full DOM Range functionality using rangy's DomRange as a
+        // prototype
+
+        WrappedTextRange = function(textRange) {
+            this.textRange = textRange;
+            this.refresh();
+        };
+
+        WrappedTextRange.prototype = new DomRange(document);
+
+        WrappedTextRange.prototype.refresh = function() {
+            var start, end, startBoundary;
+
+            // TextRange's parentElement() method cannot be trusted. getTextRangeContainerElement() works around that.
+            var rangeContainerElement = getTextRangeContainerElement(this.textRange);
+
+            if (textRangeIsCollapsed(this.textRange)) {
+                end = start = getTextRangeBoundaryPosition(this.textRange, rangeContainerElement, true,
+                    true).boundaryPosition;
+            } else {
+                log.debug("Refreshing Range from TextRange. parent element: " + dom.inspectNode(rangeContainerElement) + ", parentElement(): " + dom.inspectNode(this.textRange.parentElement()));
+                startBoundary = getTextRangeBoundaryPosition(this.textRange, rangeContainerElement, true, false);
+                start = startBoundary.boundaryPosition;
+
+                // An optimization used here is that if the start and end boundaries have the same parent element, the
+                // search scope for the end boundary can be limited to exclude the portion of the element that precedes
+                // the start boundary
+                end = getTextRangeBoundaryPosition(this.textRange, rangeContainerElement, false, false,
+                    startBoundary.nodeInfo).boundaryPosition;
+            }
+
+            this.setStart(start.node, start.offset);
+            this.setEnd(end.node, end.offset);
+        };
+
+        WrappedTextRange.prototype.getName = function() {
+            return "WrappedTextRange";
+        };
+
+        DomRange.copyComparisonConstants(WrappedTextRange);
+
+        var rangeToTextRange = function(range) {
+            if (range.collapsed) {
+                return createBoundaryTextRange(new DomPosition(range.startContainer, range.startOffset), true);
+            } else {
+                var startRange = createBoundaryTextRange(new DomPosition(range.startContainer, range.startOffset), true);
+                var endRange = createBoundaryTextRange(new DomPosition(range.endContainer, range.endOffset), false);
+                var textRange = getBody( DomRange.getRangeDocument(range) ).createTextRange();
+                textRange.setEndPoint("StartToStart", startRange);
+                textRange.setEndPoint("EndToEnd", endRange);
+                return textRange;
+            }
+        };
+
+        WrappedTextRange.rangeToTextRange = rangeToTextRange;
+
+        WrappedTextRange.prototype.toTextRange = function() {
+            return rangeToTextRange(this);
+        };
+
+        api.WrappedTextRange = WrappedTextRange;
+
+        // IE 9 and above have both implementations and Rangy makes both available. The next few lines sets which
+        // implementation to use by default.
+        if (!api.features.implementsDomRange || api.config.preferTextRange) {
+            // Add WrappedTextRange as the Range property of the global object to allow expression like Range.END_TO_END to work
+            var globalObj = (function() { return this; })();
+            if (typeof globalObj.Range == "undefined") {
+                globalObj.Range = WrappedTextRange;
+            }
+
+            api.createNativeRange = function(doc) {
+                doc = getContentDocument(doc, module, "createNativeRange");
+                return getBody(doc).createTextRange();
+            };
+
+            api.WrappedRange = WrappedTextRange;
+        }
+    }
+
+    api.createRange = function(doc) {
+        doc = getContentDocument(doc, module, "createRange");
+        return new api.WrappedRange(api.createNativeRange(doc));
+    };
+
+    api.createRangyRange = function(doc) {
+        doc = getContentDocument(doc, module, "createRangyRange");
+        return new DomRange(doc);
+    };
+
+    api.createIframeRange = function(iframeEl) {
+        module.deprecationNotice("createIframeRange()", "createRange(iframeEl)");
+        return api.createRange(iframeEl);
+    };
+
+    api.createIframeRangyRange = function(iframeEl) {
+        module.deprecationNotice("createIframeRangyRange()", "createRangyRange(iframeEl)");
+        return api.createRangyRange(iframeEl);
+    };
+
+    api.addShimListener(function(win) {
+        var doc = win.document;
+        if (typeof doc.createRange == "undefined") {
+            doc.createRange = function() {
+                return api.createRange(doc);
+            };
+        }
+        doc = win = null;
+    });
 });
\ No newline at end of file
diff --git a/src/js/core/wrappedselection.js b/src/core/wrappedselection.js
similarity index 97%
rename from src/js/core/wrappedselection.js
rename to src/core/wrappedselection.js
index fc52f816..ba1d3a83 100644
--- a/src/js/core/wrappedselection.js
+++ b/src/core/wrappedselection.js
@@ -1,1004 +1,1004 @@
-// This module creates a selection object wrapper that conforms as closely as possible to the Selection specification
-// in the HTML Editing spec (http://dvcs.w3.org/hg/editing/raw-file/tip/editing.html#selections)
-/* build:replaceWith(api) */rangy/* build:replaceEnd */.createCoreModule("WrappedSelection", ["DomRange", "WrappedRange"], function(api, module) {
-    api.config.checkSelectionRanges = true;
-
-    var BOOLEAN = "boolean";
-    var NUMBER = "number";
-    var dom = api.dom;
-    var util = api.util;
-    var isHostMethod = util.isHostMethod;
-    var DomRange = api.DomRange;
-    var WrappedRange = api.WrappedRange;
-    var DOMException = api.DOMException;
-    var DomPosition = dom.DomPosition;
-    var getNativeSelection;
-    var selectionIsCollapsed;
-    var features = api.features;
-    var CONTROL = "Control";
-    var getDocument = dom.getDocument;
-    var getBody = dom.getBody;
-    var rangesEqual = DomRange.rangesEqual;
-
-    var log = log4javascript.getLogger("rangy.WrappedSelection");
-
-    // Utility function to support direction parameters in the API that may be a string ("backward" or "forward") or a
-    // Boolean (true for backwards).
-    function isDirectionBackward(dir) {
-        return (typeof dir == "string") ? /^backward(s)?$/i.test(dir) : !!dir;
-    }
-
-    function getWindow(win, methodName) {
-        if (!win) {
-            return window;
-        } else if (dom.isWindow(win)) {
-            return win;
-        } else if (win instanceof WrappedSelection) {
-            return win.win;
-        } else {
-            var doc = dom.getContentDocument(win, module, methodName);
-            return dom.getWindow(doc);
-        }
-    }
-
-    function getWinSelection(winParam) {
-        return getWindow(winParam, "getWinSelection").getSelection();
-    }
-
-    function getDocSelection(winParam) {
-        return getWindow(winParam, "getDocSelection").document.selection;
-    }
-    
-    function winSelectionIsBackward(sel) {
-        var backward = false;
-        if (sel.anchorNode) {
-            backward = (dom.comparePoints(sel.anchorNode, sel.anchorOffset, sel.focusNode, sel.focusOffset) == 1);
-        }
-        return backward;
-    }
-
-    // Test for the Range/TextRange and Selection features required
-    // Test for ability to retrieve selection
-    var implementsWinGetSelection = isHostMethod(window, "getSelection"),
-        implementsDocSelection = util.isHostObject(document, "selection");
-
-    features.implementsWinGetSelection = implementsWinGetSelection;
-    features.implementsDocSelection = implementsDocSelection;
-
-    var useDocumentSelection = implementsDocSelection && (!implementsWinGetSelection || api.config.preferTextRange);
-
-    if (useDocumentSelection) {
-        getNativeSelection = getDocSelection;
-        api.isSelectionValid = function(winParam) {
-            var doc = getWindow(winParam, "isSelectionValid").document, nativeSel = doc.selection;
-
-            // Check whether the selection TextRange is actually contained within the correct document
-            return (nativeSel.type != "None" || getDocument(nativeSel.createRange().parentElement()) == doc);
-        };
-    } else if (implementsWinGetSelection) {
-        getNativeSelection = getWinSelection;
-        api.isSelectionValid = function() {
-            return true;
-        };
-    } else {
-        module.fail("Neither document.selection or window.getSelection() detected.");
-    }
-
-    api.getNativeSelection = getNativeSelection;
-
-    var testSelection = getNativeSelection();
-    var testRange = api.createNativeRange(document);
-    var body = getBody(document);
-
-    // Obtaining a range from a selection
-    var selectionHasAnchorAndFocus = util.areHostProperties(testSelection,
-        ["anchorNode", "focusNode", "anchorOffset", "focusOffset"]);
-
-    features.selectionHasAnchorAndFocus = selectionHasAnchorAndFocus;
-
-    // Test for existence of native selection extend() method
-    var selectionHasExtend = isHostMethod(testSelection, "extend");
-    features.selectionHasExtend = selectionHasExtend;
-    
-    // Test if rangeCount exists
-    var selectionHasRangeCount = (typeof testSelection.rangeCount == NUMBER);
-    features.selectionHasRangeCount = selectionHasRangeCount;
-
-    var selectionSupportsMultipleRanges = false;
-    var collapsedNonEditableSelectionsSupported = true;
-
-    var addRangeBackwardToNative = selectionHasExtend ?
-        function(nativeSelection, range) {
-            var doc = DomRange.getRangeDocument(range);
-            var endRange = api.createRange(doc);
-            endRange.collapseToPoint(range.endContainer, range.endOffset);
-            nativeSelection.addRange(getNativeRange(endRange));
-            nativeSelection.extend(range.startContainer, range.startOffset);
-        } : null;
-
-    if (util.areHostMethods(testSelection, ["addRange", "getRangeAt", "removeAllRanges"]) &&
-            typeof testSelection.rangeCount == NUMBER && features.implementsDomRange) {
-
-        (function() {
-            // Previously an iframe was used but this caused problems in some circumstances in IE, so tests are
-            // performed on the current document's selection. See issue 109.
-
-            // Note also that if a selection previously existed, it is wiped by these tests. This should usually be fine
-            // because initialization usually happens when the document loads, but could be a problem for a script that
-            // loads and initializes Rangy later. If anyone complains, code could be added to save and restore the
-            // selection.
-            var sel = window.getSelection();
-            if (sel) {
-                // Store the current selection
-                var originalSelectionRangeCount = sel.rangeCount;
-                var selectionHasMultipleRanges = (originalSelectionRangeCount > 1);
-                var originalSelectionRanges = [];
-                var originalSelectionBackward = winSelectionIsBackward(sel); 
-                for (var i = 0; i < originalSelectionRangeCount; ++i) {
-                    originalSelectionRanges[i] = sel.getRangeAt(i);
-                }
-                
-                // Create some test elements
-                var body = getBody(document);
-                var testEl = body.appendChild( document.createElement("div") );
-                testEl.contentEditable = "false";
-                var textNode = testEl.appendChild( document.createTextNode("\u00a0\u00a0\u00a0") );
-
-                // Test whether the native selection will allow a collapsed selection within a non-editable element
-                var r1 = document.createRange();
-
-                r1.setStart(textNode, 1);
-                r1.collapse(true);
-                sel.addRange(r1);
-                collapsedNonEditableSelectionsSupported = (sel.rangeCount == 1);
-                sel.removeAllRanges();
-
-                // Test whether the native selection is capable of supporting multiple ranges.
-                if (!selectionHasMultipleRanges) {
-                    // Doing the original feature test here in Chrome 36 (and presumably later versions) prints a
-                    // console error of "Discontiguous selection is not supported." that cannot be suppressed. There's
-                    // nothing we can do about this while retaining the feature test so we have to resort to a browser
-                    // sniff. I'm not happy about it. See
-                    // https://code.google.com/p/chromium/issues/detail?id=399791
-                    var chromeMatch = window.navigator.appVersion.match(/Chrome\/(.*?) /);
-                    if (chromeMatch && parseInt(chromeMatch[1]) >= 36) {
-                        selectionSupportsMultipleRanges = false;
-                    } else {
-                        var r2 = r1.cloneRange();
-                        r1.setStart(textNode, 0);
-                        r2.setEnd(textNode, 3);
-                        r2.setStart(textNode, 2);
-                        sel.addRange(r1);
-                        sel.addRange(r2);
-                        selectionSupportsMultipleRanges = (sel.rangeCount == 2);
-                    }
-                }
-
-                // Clean up
-                body.removeChild(testEl);
-                sel.removeAllRanges();
-
-                for (i = 0; i < originalSelectionRangeCount; ++i) {
-                    if (i == 0 && originalSelectionBackward) {
-                        if (addRangeBackwardToNative) {
-                            addRangeBackwardToNative(sel, originalSelectionRanges[i]);
-                        } else {
-                            api.warn("Rangy initialization: original selection was backwards but selection has been restored forwards because the browser does not support Selection.extend");
-                            sel.addRange(originalSelectionRanges[i]);
-                        }
-                    } else {
-                        sel.addRange(originalSelectionRanges[i]);
-                    }
-                }
-            }
-        })();
-    }
-
-    features.selectionSupportsMultipleRanges = selectionSupportsMultipleRanges;
-    features.collapsedNonEditableSelectionsSupported = collapsedNonEditableSelectionsSupported;
-
-    // ControlRanges
-    var implementsControlRange = false, testControlRange;
-
-    if (body && isHostMethod(body, "createControlRange")) {
-        testControlRange = body.createControlRange();
-        if (util.areHostProperties(testControlRange, ["item", "add"])) {
-            implementsControlRange = true;
-        }
-    }
-    features.implementsControlRange = implementsControlRange;
-
-    // Selection collapsedness
-    if (selectionHasAnchorAndFocus) {
-        selectionIsCollapsed = function(sel) {
-            return sel.anchorNode === sel.focusNode && sel.anchorOffset === sel.focusOffset;
-        };
-    } else {
-        selectionIsCollapsed = function(sel) {
-            return sel.rangeCount ? sel.getRangeAt(sel.rangeCount - 1).collapsed : false;
-        };
-    }
-
-    function updateAnchorAndFocusFromRange(sel, range, backward) {
-        var anchorPrefix = backward ? "end" : "start", focusPrefix = backward ? "start" : "end";
-        sel.anchorNode = range[anchorPrefix + "Container"];
-        sel.anchorOffset = range[anchorPrefix + "Offset"];
-        sel.focusNode = range[focusPrefix + "Container"];
-        sel.focusOffset = range[focusPrefix + "Offset"];
-    }
-
-    function updateAnchorAndFocusFromNativeSelection(sel) {
-        var nativeSel = sel.nativeSelection;
-        sel.anchorNode = nativeSel.anchorNode;
-        sel.anchorOffset = nativeSel.anchorOffset;
-        sel.focusNode = nativeSel.focusNode;
-        sel.focusOffset = nativeSel.focusOffset;
-    }
-
-    function updateEmptySelection(sel) {
-        sel.anchorNode = sel.focusNode = null;
-        sel.anchorOffset = sel.focusOffset = 0;
-        sel.rangeCount = 0;
-        sel.isCollapsed = true;
-        sel._ranges.length = 0;
-    }
-
-    function getNativeRange(range) {
-        var nativeRange;
-        if (range instanceof DomRange) {
-            nativeRange = api.createNativeRange(range.getDocument());
-            nativeRange.setEnd(range.endContainer, range.endOffset);
-            nativeRange.setStart(range.startContainer, range.startOffset);
-        } else if (range instanceof WrappedRange) {
-            nativeRange = range.nativeRange;
-        } else if (features.implementsDomRange && (range instanceof dom.getWindow(range.startContainer).Range)) {
-            nativeRange = range;
-        }
-        return nativeRange;
-    }
-
-    function rangeContainsSingleElement(rangeNodes) {
-        if (!rangeNodes.length || rangeNodes[0].nodeType != 1) {
-            return false;
-        }
-        for (var i = 1, len = rangeNodes.length; i < len; ++i) {
-            if (!dom.isAncestorOf(rangeNodes[0], rangeNodes[i])) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    function getSingleElementFromRange(range) {
-        var nodes = range.getNodes();
-        if (!rangeContainsSingleElement(nodes)) {
-            throw module.createError("getSingleElementFromRange: range " + range.inspect() + " did not consist of a single element");
-        }
-        return nodes[0];
-    }
-
-    // Simple, quick test which only needs to distinguish between a TextRange and a ControlRange
-    function isTextRange(range) {
-        return !!range && typeof range.text != "undefined";
-    }
-
-    function updateFromTextRange(sel, range) {
-        // Create a Range from the selected TextRange
-        var wrappedRange = new WrappedRange(range);
-        sel._ranges = [wrappedRange];
-
-        updateAnchorAndFocusFromRange(sel, wrappedRange, false);
-        sel.rangeCount = 1;
-        sel.isCollapsed = wrappedRange.collapsed;
-    }
-
-    function updateControlSelection(sel) {
-        // Update the wrapped selection based on what's now in the native selection
-        sel._ranges.length = 0;
-        if (sel.docSelection.type == "None") {
-            updateEmptySelection(sel);
-        } else {
-            var controlRange = sel.docSelection.createRange();
-            if (isTextRange(controlRange)) {
-                // This case (where the selection type is "Control" and calling createRange() on the selection returns
-                // a TextRange) can happen in IE 9. It happens, for example, when all elements in the selected
-                // ControlRange have been removed from the ControlRange and removed from the document.
-                updateFromTextRange(sel, controlRange);
-            } else {
-                sel.rangeCount = controlRange.length;
-                var range, doc = getDocument(controlRange.item(0));
-                for (var i = 0; i < sel.rangeCount; ++i) {
-                    range = api.createRange(doc);
-                    range.selectNode(controlRange.item(i));
-                    sel._ranges.push(range);
-                }
-                sel.isCollapsed = sel.rangeCount == 1 && sel._ranges[0].collapsed;
-                updateAnchorAndFocusFromRange(sel, sel._ranges[sel.rangeCount - 1], false);
-            }
-        }
-    }
-
-    function addRangeToControlSelection(sel, range) {
-        var controlRange = sel.docSelection.createRange();
-        var rangeElement = getSingleElementFromRange(range);
-
-        // Create a new ControlRange containing all the elements in the selected ControlRange plus the element
-        // contained by the supplied range
-        var doc = getDocument(controlRange.item(0));
-        var newControlRange = getBody(doc).createControlRange();
-        for (var i = 0, len = controlRange.length; i < len; ++i) {
-            newControlRange.add(controlRange.item(i));
-        }
-        try {
-            newControlRange.add(rangeElement);
-        } catch (ex) {
-            throw module.createError("addRange(): Element within the specified Range could not be added to control selection (does it have layout?)");
-        }
-        newControlRange.select();
-
-        // Update the wrapped selection based on what's now in the native selection
-        updateControlSelection(sel);
-    }
-
-    var getSelectionRangeAt;
-
-    if (isHostMethod(testSelection, "getRangeAt")) {
-        // try/catch is present because getRangeAt() must have thrown an error in some browser and some situation.
-        // Unfortunately, I didn't write a comment about the specifics and am now scared to take it out. Let that be a
-        // lesson to us all, especially me.
-        getSelectionRangeAt = function(sel, index) {
-            try {
-                return sel.getRangeAt(index);
-            } catch (ex) {
-                return null;
-            }
-        };
-    } else if (selectionHasAnchorAndFocus) {
-        getSelectionRangeAt = function(sel) {
-            var doc = getDocument(sel.anchorNode);
-            var range = api.createRange(doc);
-            range.setStartAndEnd(sel.anchorNode, sel.anchorOffset, sel.focusNode, sel.focusOffset);
-
-            // Handle the case when the selection was selected backwards (from the end to the start in the
-            // document)
-            if (range.collapsed !== this.isCollapsed) {
-                range.setStartAndEnd(sel.focusNode, sel.focusOffset, sel.anchorNode, sel.anchorOffset);
-            }
-
-            return range;
-        };
-    }
-
-    function WrappedSelection(selection, docSelection, win) {
-        this.nativeSelection = selection;
-        this.docSelection = docSelection;
-        this._ranges = [];
-        this.win = win;
-        this.refresh();
-    }
-
-    WrappedSelection.prototype = api.selectionPrototype;
-
-    function deleteProperties(sel) {
-        sel.win = sel.anchorNode = sel.focusNode = sel._ranges = null;
-        sel.rangeCount = sel.anchorOffset = sel.focusOffset = 0;
-        sel.detached = true;
-    }
-
-    var cachedRangySelections = [];
-
-    function actOnCachedSelection(win, action) {
-        var i = cachedRangySelections.length, cached, sel;
-        while (i--) {
-            cached = cachedRangySelections[i];
-            sel = cached.selection;
-            if (action == "deleteAll") {
-                deleteProperties(sel);
-            } else if (cached.win == win) {
-                if (action == "delete") {
-                    cachedRangySelections.splice(i, 1);
-                    return true;
-                } else {
-                    return sel;
-                }
-            }
-        }
-        if (action == "deleteAll") {
-            cachedRangySelections.length = 0;
-        }
-        return null;
-    }
-
-    var getSelection = function(win) {
-        // Check if the parameter is a Rangy Selection object
-        if (win && win instanceof WrappedSelection) {
-            win.refresh();
-            return win;
-        }
-
-        win = getWindow(win, "getNativeSelection");
-
-        var sel = actOnCachedSelection(win);
-        var nativeSel = getNativeSelection(win), docSel = implementsDocSelection ? getDocSelection(win) : null;
-        if (sel) {
-            sel.nativeSelection = nativeSel;
-            sel.docSelection = docSel;
-            sel.refresh();
-        } else {
-            sel = new WrappedSelection(nativeSel, docSel, win);
-            cachedRangySelections.push( { win: win, selection: sel } );
-        }
-        return sel;
-    };
-
-    api.getSelection = getSelection;
-
-    api.getIframeSelection = function(iframeEl) {
-        module.deprecationNotice("getIframeSelection()", "getSelection(iframeEl)");
-        return api.getSelection(dom.getIframeWindow(iframeEl));
-    };
-
-    var selProto = WrappedSelection.prototype;
-
-    function createControlSelection(sel, ranges) {
-        // Ensure that the selection becomes of type "Control"
-        var doc = getDocument(ranges[0].startContainer);
-        var controlRange = getBody(doc).createControlRange();
-        for (var i = 0, el, len = ranges.length; i < len; ++i) {
-            el = getSingleElementFromRange(ranges[i]);
-            try {
-                controlRange.add(el);
-            } catch (ex) {
-                throw module.createError("setRanges(): Element within one of the specified Ranges could not be added to control selection (does it have layout?)");
-            }
-        }
-        controlRange.select();
-
-        // Update the wrapped selection based on what's now in the native selection
-        updateControlSelection(sel);
-    }
-
-    // Selecting a range
-    if (!useDocumentSelection && selectionHasAnchorAndFocus && util.areHostMethods(testSelection, ["removeAllRanges", "addRange"])) {
-        selProto.removeAllRanges = function() {
-            this.nativeSelection.removeAllRanges();
-            updateEmptySelection(this);
-        };
-
-        var addRangeBackward = function(sel, range) {
-            addRangeBackwardToNative(sel.nativeSelection, range);
-            sel.refresh();
-        };
-
-        if (selectionHasRangeCount) {
-            selProto.addRange = function(range, direction) {
-                if (implementsControlRange && implementsDocSelection && this.docSelection.type == CONTROL) {
-                    addRangeToControlSelection(this, range);
-                } else {
-                    if (isDirectionBackward(direction) && selectionHasExtend) {
-                        addRangeBackward(this, range);
-                    } else {
-                        var previousRangeCount;
-                        if (selectionSupportsMultipleRanges) {
-                            previousRangeCount = this.rangeCount;
-                        } else {
-                            this.removeAllRanges();
-                            previousRangeCount = 0;
-                        }
-                        // Clone the native range so that changing the selected range does not affect the selection.
-                        // This is contrary to the spec but is the only way to achieve consistency between browsers. See
-                        // issue 80.
-                        this.nativeSelection.addRange(getNativeRange(range).cloneRange());
-
-                        // Check whether adding the range was successful
-                        this.rangeCount = this.nativeSelection.rangeCount;
-
-                        if (this.rangeCount == previousRangeCount + 1) {
-                            // The range was added successfully
-
-                            // Check whether the range that we added to the selection is reflected in the last range extracted from
-                            // the selection
-                            if (api.config.checkSelectionRanges) {
-                                var nativeRange = getSelectionRangeAt(this.nativeSelection, this.rangeCount - 1);
-                                if (nativeRange && !rangesEqual(nativeRange, range)) {
-                                    // Happens in WebKit with, for example, a selection placed at the start of a text node
-                                    range = new WrappedRange(nativeRange);
-                                }
-                            }
-                            this._ranges[this.rangeCount - 1] = range;
-                            updateAnchorAndFocusFromRange(this, range, selectionIsBackward(this.nativeSelection));
-                            this.isCollapsed = selectionIsCollapsed(this);
-                        } else {
-                            // The range was not added successfully. The simplest thing is to refresh
-                            this.refresh();
-                        }
-                    }
-                }
-            };
-        } else {
-            selProto.addRange = function(range, direction) {
-                if (isDirectionBackward(direction) && selectionHasExtend) {
-                    addRangeBackward(this, range);
-                } else {
-                    this.nativeSelection.addRange(getNativeRange(range));
-                    this.refresh();
-                }
-            };
-        }
-
-        selProto.setRanges = function(ranges) {
-            if (implementsControlRange && implementsDocSelection && ranges.length > 1) {
-                createControlSelection(this, ranges);
-            } else {
-                this.removeAllRanges();
-                for (var i = 0, len = ranges.length; i < len; ++i) {
-                    this.addRange(ranges[i]);
-                }
-            }
-        };
-    } else if (isHostMethod(testSelection, "empty") && isHostMethod(testRange, "select") &&
-               implementsControlRange && useDocumentSelection) {
-
-        selProto.removeAllRanges = function() {
-            // Added try/catch as fix for issue #21
-            try {
-                this.docSelection.empty();
-
-                // Check for empty() not working (issue #24)
-                if (this.docSelection.type != "None") {
-                    // Work around failure to empty a control selection by instead selecting a TextRange and then
-                    // calling empty()
-                    var doc;
-                    if (this.anchorNode) {
-                        doc = getDocument(this.anchorNode);
-                    } else if (this.docSelection.type == CONTROL) {
-                        var controlRange = this.docSelection.createRange();
-                        if (controlRange.length) {
-                            doc = getDocument( controlRange.item(0) );
-                        }
-                    }
-                    if (doc) {
-                        var textRange = getBody(doc).createTextRange();
-                        textRange.select();
-                        this.docSelection.empty();
-                    }
-                }
-            } catch(ex) {}
-            updateEmptySelection(this);
-        };
-
-        selProto.addRange = function(range) {
-            if (this.docSelection.type == CONTROL) {
-                addRangeToControlSelection(this, range);
-            } else {
-                api.WrappedTextRange.rangeToTextRange(range).select();
-                this._ranges[0] = range;
-                this.rangeCount = 1;
-                this.isCollapsed = this._ranges[0].collapsed;
-                updateAnchorAndFocusFromRange(this, range, false);
-            }
-        };
-
-        selProto.setRanges = function(ranges) {
-            this.removeAllRanges();
-            var rangeCount = ranges.length;
-            if (rangeCount > 1) {
-                createControlSelection(this, ranges);
-            } else if (rangeCount) {
-                this.addRange(ranges[0]);
-            }
-        };
-    } else {
-        module.fail("No means of selecting a Range or TextRange was found");
-        return false;
-    }
-
-    selProto.getRangeAt = function(index) {
-        if (index < 0 || index >= this.rangeCount) {
-            throw new DOMException("INDEX_SIZE_ERR");
-        } else {
-            // Clone the range to preserve selection-range independence. See issue 80.
-            return this._ranges[index].cloneRange();
-        }
-    };
-
-    var refreshSelection;
-
-    if (useDocumentSelection) {
-        refreshSelection = function(sel) {
-            var range;
-            if (api.isSelectionValid(sel.win)) {
-                range = sel.docSelection.createRange();
-            } else {
-                range = getBody(sel.win.document).createTextRange();
-                range.collapse(true);
-            }
-            log.warn("selection refresh called, selection type: " + sel.docSelection.type);
-
-            if (sel.docSelection.type == CONTROL) {
-                updateControlSelection(sel);
-            } else if (isTextRange(range)) {
-                updateFromTextRange(sel, range);
-            } else {
-                updateEmptySelection(sel);
-            }
-        };
-    } else if (isHostMethod(testSelection, "getRangeAt") && typeof testSelection.rangeCount == NUMBER) {
-        refreshSelection = function(sel) {
-            if (implementsControlRange && implementsDocSelection && sel.docSelection.type == CONTROL) {
-                updateControlSelection(sel);
-            } else {
-                sel._ranges.length = sel.rangeCount = sel.nativeSelection.rangeCount;
-                if (sel.rangeCount) {
-                    for (var i = 0, len = sel.rangeCount; i < len; ++i) {
-                        sel._ranges[i] = new api.WrappedRange(sel.nativeSelection.getRangeAt(i));
-                    }
-                    updateAnchorAndFocusFromRange(sel, sel._ranges[sel.rangeCount - 1], selectionIsBackward(sel.nativeSelection));
-                    sel.isCollapsed = selectionIsCollapsed(sel);
-                } else {
-                    updateEmptySelection(sel);
-                }
-            }
-        };
-    } else if (selectionHasAnchorAndFocus && typeof testSelection.isCollapsed == BOOLEAN && typeof testRange.collapsed == BOOLEAN && features.implementsDomRange) {
-        refreshSelection = function(sel) {
-            var range, nativeSel = sel.nativeSelection;
-            if (nativeSel.anchorNode) {
-                range = getSelectionRangeAt(nativeSel, 0);
-                sel._ranges = [range];
-                sel.rangeCount = 1;
-                updateAnchorAndFocusFromNativeSelection(sel);
-                sel.isCollapsed = selectionIsCollapsed(sel);
-            } else {
-                updateEmptySelection(sel);
-            }
-        };
-    } else {
-        module.fail("No means of obtaining a Range or TextRange from the user's selection was found");
-        return false;
-    }
-
-    selProto.refresh = function(checkForChanges) {
-        var oldRanges = checkForChanges ? this._ranges.slice(0) : null;
-        var oldAnchorNode = this.anchorNode, oldAnchorOffset = this.anchorOffset;
-
-        refreshSelection(this);
-        if (checkForChanges) {
-            // Check the range count first
-            var i = oldRanges.length;
-            if (i != this._ranges.length) {
-                log.debug("Selection.refresh: Range count has changed: was " + i + ", is now " + this._ranges.length);
-                return true;
-            }
-
-            // Now check the direction. Checking the anchor position is the same is enough since we're checking all the
-            // ranges after this
-            if (this.anchorNode != oldAnchorNode || this.anchorOffset != oldAnchorOffset) {
-                log.debug("Selection.refresh: anchor different, so selection has changed");
-                return true;
-            }
-
-            // Finally, compare each range in turn
-            while (i--) {
-                if (!rangesEqual(oldRanges[i], this._ranges[i])) {
-                    log.debug("Selection.refresh: Range at index " + i + " has changed: was " + oldRanges[i].inspect() + ", is now " + this._ranges[i].inspect());
-                    return true;
-                }
-            }
-            return false;
-        }
-    };
-
-    // Removal of a single range
-    var removeRangeManually = function(sel, range) {
-        var ranges = sel.getAllRanges();
-        sel.removeAllRanges();
-        for (var i = 0, len = ranges.length; i < len; ++i) {
-            if (!rangesEqual(range, ranges[i])) {
-                sel.addRange(ranges[i]);
-            }
-        }
-        if (!sel.rangeCount) {
-            updateEmptySelection(sel);
-        }
-    };
-
-    if (implementsControlRange && implementsDocSelection) {
-        selProto.removeRange = function(range) {
-            if (this.docSelection.type == CONTROL) {
-                var controlRange = this.docSelection.createRange();
-                var rangeElement = getSingleElementFromRange(range);
-
-                // Create a new ControlRange containing all the elements in the selected ControlRange minus the
-                // element contained by the supplied range
-                var doc = getDocument(controlRange.item(0));
-                var newControlRange = getBody(doc).createControlRange();
-                var el, removed = false;
-                for (var i = 0, len = controlRange.length; i < len; ++i) {
-                    el = controlRange.item(i);
-                    if (el !== rangeElement || removed) {
-                        newControlRange.add(controlRange.item(i));
-                    } else {
-                        removed = true;
-                    }
-                }
-                newControlRange.select();
-
-                // Update the wrapped selection based on what's now in the native selection
-                updateControlSelection(this);
-            } else {
-                removeRangeManually(this, range);
-            }
-        };
-    } else {
-        selProto.removeRange = function(range) {
-            removeRangeManually(this, range);
-        };
-    }
-
-    // Detecting if a selection is backward
-    var selectionIsBackward;
-    if (!useDocumentSelection && selectionHasAnchorAndFocus && features.implementsDomRange) {
-        selectionIsBackward = winSelectionIsBackward;
-
-        selProto.isBackward = function() {
-            return selectionIsBackward(this);
-        };
-    } else {
-        selectionIsBackward = selProto.isBackward = function() {
-            return false;
-        };
-    }
-
-    // Create an alias for backwards compatibility. From 1.3, everything is "backward" rather than "backwards"
-    selProto.isBackwards = selProto.isBackward;
-
-    // Selection stringifier
-    // This is conformant to the old HTML5 selections draft spec but differs from WebKit and Mozilla's implementation.
-    // The current spec does not yet define this method.
-    selProto.toString = function() {
-        log.debug("selection toString called");
-        var rangeTexts = [];
-        for (var i = 0, len = this.rangeCount; i < len; ++i) {
-            rangeTexts[i] = "" + this._ranges[i];
-        }
-        return rangeTexts.join("");
-    };
-
-    function assertNodeInSameDocument(sel, node) {
-        if (sel.win.document != getDocument(node)) {
-            throw new DOMException("WRONG_DOCUMENT_ERR");
-        }
-    }
-
-    // No current browser conforms fully to the spec for this method, so Rangy's own method is always used
-    selProto.collapse = function(node, offset) {
-        assertNodeInSameDocument(this, node);
-        var range = api.createRange(node);
-        range.collapseToPoint(node, offset);
-        this.setSingleRange(range);
-        this.isCollapsed = true;
-    };
-
-    selProto.collapseToStart = function() {
-        if (this.rangeCount) {
-            var range = this._ranges[0];
-            this.collapse(range.startContainer, range.startOffset);
-        } else {
-            throw new DOMException("INVALID_STATE_ERR");
-        }
-    };
-
-    selProto.collapseToEnd = function() {
-        if (this.rangeCount) {
-            var range = this._ranges[this.rangeCount - 1];
-            this.collapse(range.endContainer, range.endOffset);
-        } else {
-            throw new DOMException("INVALID_STATE_ERR");
-        }
-    };
-
-    // The spec is very specific on how selectAllChildren should be implemented so the native implementation is
-    // never used by Rangy.
-    selProto.selectAllChildren = function(node) {
-        assertNodeInSameDocument(this, node);
-        var range = api.createRange(node);
-        range.selectNodeContents(node);
-        this.setSingleRange(range);
-    };
-
-    selProto.deleteFromDocument = function() {
-        // Sepcial behaviour required for IE's control selections
-        if (implementsControlRange && implementsDocSelection && this.docSelection.type == CONTROL) {
-            var controlRange = this.docSelection.createRange();
-            var element;
-            while (controlRange.length) {
-                element = controlRange.item(0);
-                controlRange.remove(element);
-                element.parentNode.removeChild(element);
-            }
-            this.refresh();
-        } else if (this.rangeCount) {
-            var ranges = this.getAllRanges();
-            if (ranges.length) {
-                this.removeAllRanges();
-                for (var i = 0, len = ranges.length; i < len; ++i) {
-                    ranges[i].deleteContents();
-                }
-                // The spec says nothing about what the selection should contain after calling deleteContents on each
-                // range. Firefox moves the selection to where the final selected range was, so we emulate that
-                this.addRange(ranges[len - 1]);
-            }
-        }
-    };
-
-    // The following are non-standard extensions
-    selProto.eachRange = function(func, returnValue) {
-        for (var i = 0, len = this._ranges.length; i < len; ++i) {
-            if ( func( this.getRangeAt(i) ) ) {
-                return returnValue;
-            }
-        }
-    };
-
-    selProto.getAllRanges = function() {
-        var ranges = [];
-        this.eachRange(function(range) {
-            ranges.push(range);
-        });
-        return ranges;
-    };
-
-    selProto.setSingleRange = function(range, direction) {
-        this.removeAllRanges();
-        this.addRange(range, direction);
-    };
-
-    selProto.callMethodOnEachRange = function(methodName, params) {
-        var results = [];
-        this.eachRange( function(range) {
-            results.push( range[methodName].apply(range, params) );
-        } );
-        return results;
-    };
-    
-    function createStartOrEndSetter(isStart) {
-        return function(node, offset) {
-            var range;
-            if (this.rangeCount) {
-                range = this.getRangeAt(0);
-                range["set" + (isStart ? "Start" : "End")](node, offset);
-            } else {
-                range = api.createRange(this.win.document);
-                range.setStartAndEnd(node, offset);
-            }
-            this.setSingleRange(range, this.isBackward());
-        };
-    }
-
-    selProto.setStart = createStartOrEndSetter(true);
-    selProto.setEnd = createStartOrEndSetter(false);
-    
-    // Add select() method to Range prototype. Any existing selection will be removed.
-    api.rangePrototype.select = function(direction) {
-        getSelection( this.getDocument() ).setSingleRange(this, direction);
-    };
-
-    selProto.changeEachRange = function(func) {
-        var ranges = [];
-        var backward = this.isBackward();
-
-        this.eachRange(function(range) {
-            func(range);
-            ranges.push(range);
-        });
-
-        this.removeAllRanges();
-        if (backward && ranges.length == 1) {
-            this.addRange(ranges[0], "backward");
-        } else {
-            this.setRanges(ranges);
-        }
-    };
-
-    selProto.containsNode = function(node, allowPartial) {
-        return this.eachRange( function(range) {
-            return range.containsNode(node, allowPartial);
-        }, true ) || false;
-    };
-
-    selProto.getBookmark = function(containerNode) {
-        return {
-            backward: this.isBackward(),
-            rangeBookmarks: this.callMethodOnEachRange("getBookmark", [containerNode])
-        };
-    };
-
-    selProto.moveToBookmark = function(bookmark) {
-        var selRanges = [];
-        for (var i = 0, rangeBookmark, range; rangeBookmark = bookmark.rangeBookmarks[i++]; ) {
-            range = api.createRange(this.win);
-            range.moveToBookmark(rangeBookmark);
-            selRanges.push(range);
-        }
-        if (bookmark.backward) {
-            this.setSingleRange(selRanges[0], "backward");
-        } else {
-            this.setRanges(selRanges);
-        }
-    };
-
-    selProto.toHtml = function() {
-        var rangeHtmls = [];
-        this.eachRange(function(range) {
-            rangeHtmls.push( DomRange.toHtml(range) );
-        });
-        return rangeHtmls.join("");
-    };
-
-    if (features.implementsTextRange) {
-        selProto.getNativeTextRange = function() {
-            var sel, textRange;
-            if ( (sel = this.docSelection) ) {
-                var range = sel.createRange();
-                if (isTextRange(range)) {
-                    return range;
-                } else {
-                    throw module.createError("getNativeTextRange: selection is a control selection"); 
-                }
-            } else if (this.rangeCount > 0) {
-                return api.WrappedTextRange.rangeToTextRange( this.getRangeAt(0) );
-            } else {
-                throw module.createError("getNativeTextRange: selection contains no range");
-            }
-        };
-    }
-
-    function inspect(sel) {
-        var rangeInspects = [];
-        var anchor = new DomPosition(sel.anchorNode, sel.anchorOffset);
-        var focus = new DomPosition(sel.focusNode, sel.focusOffset);
-        var name = (typeof sel.getName == "function") ? sel.getName() : "Selection";
-
-        if (typeof sel.rangeCount != "undefined") {
-            for (var i = 0, len = sel.rangeCount; i < len; ++i) {
-                rangeInspects[i] = DomRange.inspect(sel.getRangeAt(i));
-            }
-        }
-        return "[" + name + "(Ranges: " + rangeInspects.join(", ") +
-                ")(anchor: " + anchor.inspect() + ", focus: " + focus.inspect() + "]";
-    }
-
-    selProto.getName = function() {
-        return "WrappedSelection";
-    };
-
-    selProto.inspect = function() {
-        return inspect(this);
-    };
-
-    selProto.detach = function() {
-        actOnCachedSelection(this.win, "delete");
-        deleteProperties(this);
-    };
-
-    WrappedSelection.detachAll = function() {
-        actOnCachedSelection(null, "deleteAll");
-    };
-
-    WrappedSelection.inspect = inspect;
-    WrappedSelection.isDirectionBackward = isDirectionBackward;
-
-    api.Selection = WrappedSelection;
-
-    api.selectionPrototype = selProto;
-
-    api.addShimListener(function(win) {
-        if (typeof win.getSelection == "undefined") {
-            win.getSelection = function() {
-                return getSelection(win);
-            };
-        }
-        win = null;
-    });
-});
+// This module creates a selection object wrapper that conforms as closely as possible to the Selection specification
+// in the HTML Editing spec (http://dvcs.w3.org/hg/editing/raw-file/tip/editing.html#selections)
+/* build:replaceWith(api) */rangy/* build:replaceEnd */.createCoreModule("WrappedSelection", ["DomRange", "WrappedRange"], function(api, module) {
+    api.config.checkSelectionRanges = true;
+
+    var BOOLEAN = "boolean";
+    var NUMBER = "number";
+    var dom = api.dom;
+    var util = api.util;
+    var isHostMethod = util.isHostMethod;
+    var DomRange = api.DomRange;
+    var WrappedRange = api.WrappedRange;
+    var DOMException = api.DOMException;
+    var DomPosition = dom.DomPosition;
+    var getNativeSelection;
+    var selectionIsCollapsed;
+    var features = api.features;
+    var CONTROL = "Control";
+    var getDocument = dom.getDocument;
+    var getBody = dom.getBody;
+    var rangesEqual = DomRange.rangesEqual;
+
+    var log = log4javascript.getLogger("rangy.WrappedSelection");
+
+    // Utility function to support direction parameters in the API that may be a string ("backward" or "forward") or a
+    // Boolean (true for backwards).
+    function isDirectionBackward(dir) {
+        return (typeof dir == "string") ? /^backward(s)?$/i.test(dir) : !!dir;
+    }
+
+    function getWindow(win, methodName) {
+        if (!win) {
+            return window;
+        } else if (dom.isWindow(win)) {
+            return win;
+        } else if (win instanceof WrappedSelection) {
+            return win.win;
+        } else {
+            var doc = dom.getContentDocument(win, module, methodName);
+            return dom.getWindow(doc);
+        }
+    }
+
+    function getWinSelection(winParam) {
+        return getWindow(winParam, "getWinSelection").getSelection();
+    }
+
+    function getDocSelection(winParam) {
+        return getWindow(winParam, "getDocSelection").document.selection;
+    }
+    
+    function winSelectionIsBackward(sel) {
+        var backward = false;
+        if (sel.anchorNode) {
+            backward = (dom.comparePoints(sel.anchorNode, sel.anchorOffset, sel.focusNode, sel.focusOffset) == 1);
+        }
+        return backward;
+    }
+
+    // Test for the Range/TextRange and Selection features required
+    // Test for ability to retrieve selection
+    var implementsWinGetSelection = isHostMethod(window, "getSelection"),
+        implementsDocSelection = util.isHostObject(document, "selection");
+
+    features.implementsWinGetSelection = implementsWinGetSelection;
+    features.implementsDocSelection = implementsDocSelection;
+
+    var useDocumentSelection = implementsDocSelection && (!implementsWinGetSelection || api.config.preferTextRange);
+
+    if (useDocumentSelection) {
+        getNativeSelection = getDocSelection;
+        api.isSelectionValid = function(winParam) {
+            var doc = getWindow(winParam, "isSelectionValid").document, nativeSel = doc.selection;
+
+            // Check whether the selection TextRange is actually contained within the correct document
+            return (nativeSel.type != "None" || getDocument(nativeSel.createRange().parentElement()) == doc);
+        };
+    } else if (implementsWinGetSelection) {
+        getNativeSelection = getWinSelection;
+        api.isSelectionValid = function() {
+            return true;
+        };
+    } else {
+        module.fail("Neither document.selection or window.getSelection() detected.");
+    }
+
+    api.getNativeSelection = getNativeSelection;
+
+    var testSelection = getNativeSelection();
+    var testRange = api.createNativeRange(document);
+    var body = getBody(document);
+
+    // Obtaining a range from a selection
+    var selectionHasAnchorAndFocus = util.areHostProperties(testSelection,
+        ["anchorNode", "focusNode", "anchorOffset", "focusOffset"]);
+
+    features.selectionHasAnchorAndFocus = selectionHasAnchorAndFocus;
+
+    // Test for existence of native selection extend() method
+    var selectionHasExtend = isHostMethod(testSelection, "extend");
+    features.selectionHasExtend = selectionHasExtend;
+    
+    // Test if rangeCount exists
+    var selectionHasRangeCount = (typeof testSelection.rangeCount == NUMBER);
+    features.selectionHasRangeCount = selectionHasRangeCount;
+
+    var selectionSupportsMultipleRanges = false;
+    var collapsedNonEditableSelectionsSupported = true;
+
+    var addRangeBackwardToNative = selectionHasExtend ?
+        function(nativeSelection, range) {
+            var doc = DomRange.getRangeDocument(range);
+            var endRange = api.createRange(doc);
+            endRange.collapseToPoint(range.endContainer, range.endOffset);
+            nativeSelection.addRange(getNativeRange(endRange));
+            nativeSelection.extend(range.startContainer, range.startOffset);
+        } : null;
+
+    if (util.areHostMethods(testSelection, ["addRange", "getRangeAt", "removeAllRanges"]) &&
+            typeof testSelection.rangeCount == NUMBER && features.implementsDomRange) {
+
+        (function() {
+            // Previously an iframe was used but this caused problems in some circumstances in IE, so tests are
+            // performed on the current document's selection. See issue 109.
+
+            // Note also that if a selection previously existed, it is wiped by these tests. This should usually be fine
+            // because initialization usually happens when the document loads, but could be a problem for a script that
+            // loads and initializes Rangy later. If anyone complains, code could be added to save and restore the
+            // selection.
+            var sel = window.getSelection();
+            if (sel) {
+                // Store the current selection
+                var originalSelectionRangeCount = sel.rangeCount;
+                var selectionHasMultipleRanges = (originalSelectionRangeCount > 1);
+                var originalSelectionRanges = [];
+                var originalSelectionBackward = winSelectionIsBackward(sel); 
+                for (var i = 0; i < originalSelectionRangeCount; ++i) {
+                    originalSelectionRanges[i] = sel.getRangeAt(i);
+                }
+                
+                // Create some test elements
+                var body = getBody(document);
+                var testEl = body.appendChild( document.createElement("div") );
+                testEl.contentEditable = "false";
+                var textNode = testEl.appendChild( document.createTextNode("\u00a0\u00a0\u00a0") );
+
+                // Test whether the native selection will allow a collapsed selection within a non-editable element
+                var r1 = document.createRange();
+
+                r1.setStart(textNode, 1);
+                r1.collapse(true);
+                sel.addRange(r1);
+                collapsedNonEditableSelectionsSupported = (sel.rangeCount == 1);
+                sel.removeAllRanges();
+
+                // Test whether the native selection is capable of supporting multiple ranges.
+                if (!selectionHasMultipleRanges) {
+                    // Doing the original feature test here in Chrome 36 (and presumably later versions) prints a
+                    // console error of "Discontiguous selection is not supported." that cannot be suppressed. There's
+                    // nothing we can do about this while retaining the feature test so we have to resort to a browser
+                    // sniff. I'm not happy about it. See
+                    // https://code.google.com/p/chromium/issues/detail?id=399791
+                    var chromeMatch = window.navigator.appVersion.match(/Chrome\/(.*?) /);
+                    if (chromeMatch && parseInt(chromeMatch[1]) >= 36) {
+                        selectionSupportsMultipleRanges = false;
+                    } else {
+                        var r2 = r1.cloneRange();
+                        r1.setStart(textNode, 0);
+                        r2.setEnd(textNode, 3);
+                        r2.setStart(textNode, 2);
+                        sel.addRange(r1);
+                        sel.addRange(r2);
+                        selectionSupportsMultipleRanges = (sel.rangeCount == 2);
+                    }
+                }
+
+                // Clean up
+                body.removeChild(testEl);
+                sel.removeAllRanges();
+
+                for (i = 0; i < originalSelectionRangeCount; ++i) {
+                    if (i == 0 && originalSelectionBackward) {
+                        if (addRangeBackwardToNative) {
+                            addRangeBackwardToNative(sel, originalSelectionRanges[i]);
+                        } else {
+                            api.warn("Rangy initialization: original selection was backwards but selection has been restored forwards because the browser does not support Selection.extend");
+                            sel.addRange(originalSelectionRanges[i]);
+                        }
+                    } else {
+                        sel.addRange(originalSelectionRanges[i]);
+                    }
+                }
+            }
+        })();
+    }
+
+    features.selectionSupportsMultipleRanges = selectionSupportsMultipleRanges;
+    features.collapsedNonEditableSelectionsSupported = collapsedNonEditableSelectionsSupported;
+
+    // ControlRanges
+    var implementsControlRange = false, testControlRange;
+
+    if (body && isHostMethod(body, "createControlRange")) {
+        testControlRange = body.createControlRange();
+        if (util.areHostProperties(testControlRange, ["item", "add"])) {
+            implementsControlRange = true;
+        }
+    }
+    features.implementsControlRange = implementsControlRange;
+
+    // Selection collapsedness
+    if (selectionHasAnchorAndFocus) {
+        selectionIsCollapsed = function(sel) {
+            return sel.anchorNode === sel.focusNode && sel.anchorOffset === sel.focusOffset;
+        };
+    } else {
+        selectionIsCollapsed = function(sel) {
+            return sel.rangeCount ? sel.getRangeAt(sel.rangeCount - 1).collapsed : false;
+        };
+    }
+
+    function updateAnchorAndFocusFromRange(sel, range, backward) {
+        var anchorPrefix = backward ? "end" : "start", focusPrefix = backward ? "start" : "end";
+        sel.anchorNode = range[anchorPrefix + "Container"];
+        sel.anchorOffset = range[anchorPrefix + "Offset"];
+        sel.focusNode = range[focusPrefix + "Container"];
+        sel.focusOffset = range[focusPrefix + "Offset"];
+    }
+
+    function updateAnchorAndFocusFromNativeSelection(sel) {
+        var nativeSel = sel.nativeSelection;
+        sel.anchorNode = nativeSel.anchorNode;
+        sel.anchorOffset = nativeSel.anchorOffset;
+        sel.focusNode = nativeSel.focusNode;
+        sel.focusOffset = nativeSel.focusOffset;
+    }
+
+    function updateEmptySelection(sel) {
+        sel.anchorNode = sel.focusNode = null;
+        sel.anchorOffset = sel.focusOffset = 0;
+        sel.rangeCount = 0;
+        sel.isCollapsed = true;
+        sel._ranges.length = 0;
+    }
+
+    function getNativeRange(range) {
+        var nativeRange;
+        if (range instanceof DomRange) {
+            nativeRange = api.createNativeRange(range.getDocument());
+            nativeRange.setEnd(range.endContainer, range.endOffset);
+            nativeRange.setStart(range.startContainer, range.startOffset);
+        } else if (range instanceof WrappedRange) {
+            nativeRange = range.nativeRange;
+        } else if (features.implementsDomRange && (range instanceof dom.getWindow(range.startContainer).Range)) {
+            nativeRange = range;
+        }
+        return nativeRange;
+    }
+
+    function rangeContainsSingleElement(rangeNodes) {
+        if (!rangeNodes.length || rangeNodes[0].nodeType != 1) {
+            return false;
+        }
+        for (var i = 1, len = rangeNodes.length; i < len; ++i) {
+            if (!dom.isAncestorOf(rangeNodes[0], rangeNodes[i])) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    function getSingleElementFromRange(range) {
+        var nodes = range.getNodes();
+        if (!rangeContainsSingleElement(nodes)) {
+            throw module.createError("getSingleElementFromRange: range " + range.inspect() + " did not consist of a single element");
+        }
+        return nodes[0];
+    }
+
+    // Simple, quick test which only needs to distinguish between a TextRange and a ControlRange
+    function isTextRange(range) {
+        return !!range && typeof range.text != "undefined";
+    }
+
+    function updateFromTextRange(sel, range) {
+        // Create a Range from the selected TextRange
+        var wrappedRange = new WrappedRange(range);
+        sel._ranges = [wrappedRange];
+
+        updateAnchorAndFocusFromRange(sel, wrappedRange, false);
+        sel.rangeCount = 1;
+        sel.isCollapsed = wrappedRange.collapsed;
+    }
+
+    function updateControlSelection(sel) {
+        // Update the wrapped selection based on what's now in the native selection
+        sel._ranges.length = 0;
+        if (sel.docSelection.type == "None") {
+            updateEmptySelection(sel);
+        } else {
+            var controlRange = sel.docSelection.createRange();
+            if (isTextRange(controlRange)) {
+                // This case (where the selection type is "Control" and calling createRange() on the selection returns
+                // a TextRange) can happen in IE 9. It happens, for example, when all elements in the selected
+                // ControlRange have been removed from the ControlRange and removed from the document.
+                updateFromTextRange(sel, controlRange);
+            } else {
+                sel.rangeCount = controlRange.length;
+                var range, doc = getDocument(controlRange.item(0));
+                for (var i = 0; i < sel.rangeCount; ++i) {
+                    range = api.createRange(doc);
+                    range.selectNode(controlRange.item(i));
+                    sel._ranges.push(range);
+                }
+                sel.isCollapsed = sel.rangeCount == 1 && sel._ranges[0].collapsed;
+                updateAnchorAndFocusFromRange(sel, sel._ranges[sel.rangeCount - 1], false);
+            }
+        }
+    }
+
+    function addRangeToControlSelection(sel, range) {
+        var controlRange = sel.docSelection.createRange();
+        var rangeElement = getSingleElementFromRange(range);
+
+        // Create a new ControlRange containing all the elements in the selected ControlRange plus the element
+        // contained by the supplied range
+        var doc = getDocument(controlRange.item(0));
+        var newControlRange = getBody(doc).createControlRange();
+        for (var i = 0, len = controlRange.length; i < len; ++i) {
+            newControlRange.add(controlRange.item(i));
+        }
+        try {
+            newControlRange.add(rangeElement);
+        } catch (ex) {
+            throw module.createError("addRange(): Element within the specified Range could not be added to control selection (does it have layout?)");
+        }
+        newControlRange.select();
+
+        // Update the wrapped selection based on what's now in the native selection
+        updateControlSelection(sel);
+    }
+
+    var getSelectionRangeAt;
+
+    if (isHostMethod(testSelection, "getRangeAt")) {
+        // try/catch is present because getRangeAt() must have thrown an error in some browser and some situation.
+        // Unfortunately, I didn't write a comment about the specifics and am now scared to take it out. Let that be a
+        // lesson to us all, especially me.
+        getSelectionRangeAt = function(sel, index) {
+            try {
+                return sel.getRangeAt(index);
+            } catch (ex) {
+                return null;
+            }
+        };
+    } else if (selectionHasAnchorAndFocus) {
+        getSelectionRangeAt = function(sel) {
+            var doc = getDocument(sel.anchorNode);
+            var range = api.createRange(doc);
+            range.setStartAndEnd(sel.anchorNode, sel.anchorOffset, sel.focusNode, sel.focusOffset);
+
+            // Handle the case when the selection was selected backwards (from the end to the start in the
+            // document)
+            if (range.collapsed !== this.isCollapsed) {
+                range.setStartAndEnd(sel.focusNode, sel.focusOffset, sel.anchorNode, sel.anchorOffset);
+            }
+
+            return range;
+        };
+    }
+
+    function WrappedSelection(selection, docSelection, win) {
+        this.nativeSelection = selection;
+        this.docSelection = docSelection;
+        this._ranges = [];
+        this.win = win;
+        this.refresh();
+    }
+
+    WrappedSelection.prototype = api.selectionPrototype;
+
+    function deleteProperties(sel) {
+        sel.win = sel.anchorNode = sel.focusNode = sel._ranges = null;
+        sel.rangeCount = sel.anchorOffset = sel.focusOffset = 0;
+        sel.detached = true;
+    }
+
+    var cachedRangySelections = [];
+
+    function actOnCachedSelection(win, action) {
+        var i = cachedRangySelections.length, cached, sel;
+        while (i--) {
+            cached = cachedRangySelections[i];
+            sel = cached.selection;
+            if (action == "deleteAll") {
+                deleteProperties(sel);
+            } else if (cached.win == win) {
+                if (action == "delete") {
+                    cachedRangySelections.splice(i, 1);
+                    return true;
+                } else {
+                    return sel;
+                }
+            }
+        }
+        if (action == "deleteAll") {
+            cachedRangySelections.length = 0;
+        }
+        return null;
+    }
+
+    var getSelection = function(win) {
+        // Check if the parameter is a Rangy Selection object
+        if (win && win instanceof WrappedSelection) {
+            win.refresh();
+            return win;
+        }
+
+        win = getWindow(win, "getNativeSelection");
+
+        var sel = actOnCachedSelection(win);
+        var nativeSel = getNativeSelection(win), docSel = implementsDocSelection ? getDocSelection(win) : null;
+        if (sel) {
+            sel.nativeSelection = nativeSel;
+            sel.docSelection = docSel;
+            sel.refresh();
+        } else {
+            sel = new WrappedSelection(nativeSel, docSel, win);
+            cachedRangySelections.push( { win: win, selection: sel } );
+        }
+        return sel;
+    };
+
+    api.getSelection = getSelection;
+
+    api.getIframeSelection = function(iframeEl) {
+        module.deprecationNotice("getIframeSelection()", "getSelection(iframeEl)");
+        return api.getSelection(dom.getIframeWindow(iframeEl));
+    };
+
+    var selProto = WrappedSelection.prototype;
+
+    function createControlSelection(sel, ranges) {
+        // Ensure that the selection becomes of type "Control"
+        var doc = getDocument(ranges[0].startContainer);
+        var controlRange = getBody(doc).createControlRange();
+        for (var i = 0, el, len = ranges.length; i < len; ++i) {
+            el = getSingleElementFromRange(ranges[i]);
+            try {
+                controlRange.add(el);
+            } catch (ex) {
+                throw module.createError("setRanges(): Element within one of the specified Ranges could not be added to control selection (does it have layout?)");
+            }
+        }
+        controlRange.select();
+
+        // Update the wrapped selection based on what's now in the native selection
+        updateControlSelection(sel);
+    }
+
+    // Selecting a range
+    if (!useDocumentSelection && selectionHasAnchorAndFocus && util.areHostMethods(testSelection, ["removeAllRanges", "addRange"])) {
+        selProto.removeAllRanges = function() {
+            this.nativeSelection.removeAllRanges();
+            updateEmptySelection(this);
+        };
+
+        var addRangeBackward = function(sel, range) {
+            addRangeBackwardToNative(sel.nativeSelection, range);
+            sel.refresh();
+        };
+
+        if (selectionHasRangeCount) {
+            selProto.addRange = function(range, direction) {
+                if (implementsControlRange && implementsDocSelection && this.docSelection.type == CONTROL) {
+                    addRangeToControlSelection(this, range);
+                } else {
+                    if (isDirectionBackward(direction) && selectionHasExtend) {
+                        addRangeBackward(this, range);
+                    } else {
+                        var previousRangeCount;
+                        if (selectionSupportsMultipleRanges) {
+                            previousRangeCount = this.rangeCount;
+                        } else {
+                            this.removeAllRanges();
+                            previousRangeCount = 0;
+                        }
+                        // Clone the native range so that changing the selected range does not affect the selection.
+                        // This is contrary to the spec but is the only way to achieve consistency between browsers. See
+                        // issue 80.
+                        this.nativeSelection.addRange(getNativeRange(range).cloneRange());
+
+                        // Check whether adding the range was successful
+                        this.rangeCount = this.nativeSelection.rangeCount;
+
+                        if (this.rangeCount == previousRangeCount + 1) {
+                            // The range was added successfully
+
+                            // Check whether the range that we added to the selection is reflected in the last range extracted from
+                            // the selection
+                            if (api.config.checkSelectionRanges) {
+                                var nativeRange = getSelectionRangeAt(this.nativeSelection, this.rangeCount - 1);
+                                if (nativeRange && !rangesEqual(nativeRange, range)) {
+                                    // Happens in WebKit with, for example, a selection placed at the start of a text node
+                                    range = new WrappedRange(nativeRange);
+                                }
+                            }
+                            this._ranges[this.rangeCount - 1] = range;
+                            updateAnchorAndFocusFromRange(this, range, selectionIsBackward(this.nativeSelection));
+                            this.isCollapsed = selectionIsCollapsed(this);
+                        } else {
+                            // The range was not added successfully. The simplest thing is to refresh
+                            this.refresh();
+                        }
+                    }
+                }
+            };
+        } else {
+            selProto.addRange = function(range, direction) {
+                if (isDirectionBackward(direction) && selectionHasExtend) {
+                    addRangeBackward(this, range);
+                } else {
+                    this.nativeSelection.addRange(getNativeRange(range));
+                    this.refresh();
+                }
+            };
+        }
+
+        selProto.setRanges = function(ranges) {
+            if (implementsControlRange && implementsDocSelection && ranges.length > 1) {
+                createControlSelection(this, ranges);
+            } else {
+                this.removeAllRanges();
+                for (var i = 0, len = ranges.length; i < len; ++i) {
+                    this.addRange(ranges[i]);
+                }
+            }
+        };
+    } else if (isHostMethod(testSelection, "empty") && isHostMethod(testRange, "select") &&
+               implementsControlRange && useDocumentSelection) {
+
+        selProto.removeAllRanges = function() {
+            // Added try/catch as fix for issue #21
+            try {
+                this.docSelection.empty();
+
+                // Check for empty() not working (issue #24)
+                if (this.docSelection.type != "None") {
+                    // Work around failure to empty a control selection by instead selecting a TextRange and then
+                    // calling empty()
+                    var doc;
+                    if (this.anchorNode) {
+                        doc = getDocument(this.anchorNode);
+                    } else if (this.docSelection.type == CONTROL) {
+                        var controlRange = this.docSelection.createRange();
+                        if (controlRange.length) {
+                            doc = getDocument( controlRange.item(0) );
+                        }
+                    }
+                    if (doc) {
+                        var textRange = getBody(doc).createTextRange();
+                        textRange.select();
+                        this.docSelection.empty();
+                    }
+                }
+            } catch(ex) {}
+            updateEmptySelection(this);
+        };
+
+        selProto.addRange = function(range) {
+            if (this.docSelection.type == CONTROL) {
+                addRangeToControlSelection(this, range);
+            } else {
+                api.WrappedTextRange.rangeToTextRange(range).select();
+                this._ranges[0] = range;
+                this.rangeCount = 1;
+                this.isCollapsed = this._ranges[0].collapsed;
+                updateAnchorAndFocusFromRange(this, range, false);
+            }
+        };
+
+        selProto.setRanges = function(ranges) {
+            this.removeAllRanges();
+            var rangeCount = ranges.length;
+            if (rangeCount > 1) {
+                createControlSelection(this, ranges);
+            } else if (rangeCount) {
+                this.addRange(ranges[0]);
+            }
+        };
+    } else {
+        module.fail("No means of selecting a Range or TextRange was found");
+        return false;
+    }
+
+    selProto.getRangeAt = function(index) {
+        if (index < 0 || index >= this.rangeCount) {
+            throw new DOMException("INDEX_SIZE_ERR");
+        } else {
+            // Clone the range to preserve selection-range independence. See issue 80.
+            return this._ranges[index].cloneRange();
+        }
+    };
+
+    var refreshSelection;
+
+    if (useDocumentSelection) {
+        refreshSelection = function(sel) {
+            var range;
+            if (api.isSelectionValid(sel.win)) {
+                range = sel.docSelection.createRange();
+            } else {
+                range = getBody(sel.win.document).createTextRange();
+                range.collapse(true);
+            }
+            log.warn("selection refresh called, selection type: " + sel.docSelection.type);
+
+            if (sel.docSelection.type == CONTROL) {
+                updateControlSelection(sel);
+            } else if (isTextRange(range)) {
+                updateFromTextRange(sel, range);
+            } else {
+                updateEmptySelection(sel);
+            }
+        };
+    } else if (isHostMethod(testSelection, "getRangeAt") && typeof testSelection.rangeCount == NUMBER) {
+        refreshSelection = function(sel) {
+            if (implementsControlRange && implementsDocSelection && sel.docSelection.type == CONTROL) {
+                updateControlSelection(sel);
+            } else {
+                sel._ranges.length = sel.rangeCount = sel.nativeSelection.rangeCount;
+                if (sel.rangeCount) {
+                    for (var i = 0, len = sel.rangeCount; i < len; ++i) {
+                        sel._ranges[i] = new api.WrappedRange(sel.nativeSelection.getRangeAt(i));
+                    }
+                    updateAnchorAndFocusFromRange(sel, sel._ranges[sel.rangeCount - 1], selectionIsBackward(sel.nativeSelection));
+                    sel.isCollapsed = selectionIsCollapsed(sel);
+                } else {
+                    updateEmptySelection(sel);
+                }
+            }
+        };
+    } else if (selectionHasAnchorAndFocus && typeof testSelection.isCollapsed == BOOLEAN && typeof testRange.collapsed == BOOLEAN && features.implementsDomRange) {
+        refreshSelection = function(sel) {
+            var range, nativeSel = sel.nativeSelection;
+            if (nativeSel.anchorNode) {
+                range = getSelectionRangeAt(nativeSel, 0);
+                sel._ranges = [range];
+                sel.rangeCount = 1;
+                updateAnchorAndFocusFromNativeSelection(sel);
+                sel.isCollapsed = selectionIsCollapsed(sel);
+            } else {
+                updateEmptySelection(sel);
+            }
+        };
+    } else {
+        module.fail("No means of obtaining a Range or TextRange from the user's selection was found");
+        return false;
+    }
+
+    selProto.refresh = function(checkForChanges) {
+        var oldRanges = checkForChanges ? this._ranges.slice(0) : null;
+        var oldAnchorNode = this.anchorNode, oldAnchorOffset = this.anchorOffset;
+
+        refreshSelection(this);
+        if (checkForChanges) {
+            // Check the range count first
+            var i = oldRanges.length;
+            if (i != this._ranges.length) {
+                log.debug("Selection.refresh: Range count has changed: was " + i + ", is now " + this._ranges.length);
+                return true;
+            }
+
+            // Now check the direction. Checking the anchor position is the same is enough since we're checking all the
+            // ranges after this
+            if (this.anchorNode != oldAnchorNode || this.anchorOffset != oldAnchorOffset) {
+                log.debug("Selection.refresh: anchor different, so selection has changed");
+                return true;
+            }
+
+            // Finally, compare each range in turn
+            while (i--) {
+                if (!rangesEqual(oldRanges[i], this._ranges[i])) {
+                    log.debug("Selection.refresh: Range at index " + i + " has changed: was " + oldRanges[i].inspect() + ", is now " + this._ranges[i].inspect());
+                    return true;
+                }
+            }
+            return false;
+        }
+    };
+
+    // Removal of a single range
+    var removeRangeManually = function(sel, range) {
+        var ranges = sel.getAllRanges();
+        sel.removeAllRanges();
+        for (var i = 0, len = ranges.length; i < len; ++i) {
+            if (!rangesEqual(range, ranges[i])) {
+                sel.addRange(ranges[i]);
+            }
+        }
+        if (!sel.rangeCount) {
+            updateEmptySelection(sel);
+        }
+    };
+
+    if (implementsControlRange && implementsDocSelection) {
+        selProto.removeRange = function(range) {
+            if (this.docSelection.type == CONTROL) {
+                var controlRange = this.docSelection.createRange();
+                var rangeElement = getSingleElementFromRange(range);
+
+                // Create a new ControlRange containing all the elements in the selected ControlRange minus the
+                // element contained by the supplied range
+                var doc = getDocument(controlRange.item(0));
+                var newControlRange = getBody(doc).createControlRange();
+                var el, removed = false;
+                for (var i = 0, len = controlRange.length; i < len; ++i) {
+                    el = controlRange.item(i);
+                    if (el !== rangeElement || removed) {
+                        newControlRange.add(controlRange.item(i));
+                    } else {
+                        removed = true;
+                    }
+                }
+                newControlRange.select();
+
+                // Update the wrapped selection based on what's now in the native selection
+                updateControlSelection(this);
+            } else {
+                removeRangeManually(this, range);
+            }
+        };
+    } else {
+        selProto.removeRange = function(range) {
+            removeRangeManually(this, range);
+        };
+    }
+
+    // Detecting if a selection is backward
+    var selectionIsBackward;
+    if (!useDocumentSelection && selectionHasAnchorAndFocus && features.implementsDomRange) {
+        selectionIsBackward = winSelectionIsBackward;
+
+        selProto.isBackward = function() {
+            return selectionIsBackward(this);
+        };
+    } else {
+        selectionIsBackward = selProto.isBackward = function() {
+            return false;
+        };
+    }
+
+    // Create an alias for backwards compatibility. From 1.3, everything is "backward" rather than "backwards"
+    selProto.isBackwards = selProto.isBackward;
+
+    // Selection stringifier
+    // This is conformant to the old HTML5 selections draft spec but differs from WebKit and Mozilla's implementation.
+    // The current spec does not yet define this method.
+    selProto.toString = function() {
+        log.debug("selection toString called");
+        var rangeTexts = [];
+        for (var i = 0, len = this.rangeCount; i < len; ++i) {
+            rangeTexts[i] = "" + this._ranges[i];
+        }
+        return rangeTexts.join("");
+    };
+
+    function assertNodeInSameDocument(sel, node) {
+        if (sel.win.document != getDocument(node)) {
+            throw new DOMException("WRONG_DOCUMENT_ERR");
+        }
+    }
+
+    // No current browser conforms fully to the spec for this method, so Rangy's own method is always used
+    selProto.collapse = function(node, offset) {
+        assertNodeInSameDocument(this, node);
+        var range = api.createRange(node);
+        range.collapseToPoint(node, offset);
+        this.setSingleRange(range);
+        this.isCollapsed = true;
+    };
+
+    selProto.collapseToStart = function() {
+        if (this.rangeCount) {
+            var range = this._ranges[0];
+            this.collapse(range.startContainer, range.startOffset);
+        } else {
+            throw new DOMException("INVALID_STATE_ERR");
+        }
+    };
+
+    selProto.collapseToEnd = function() {
+        if (this.rangeCount) {
+            var range = this._ranges[this.rangeCount - 1];
+            this.collapse(range.endContainer, range.endOffset);
+        } else {
+            throw new DOMException("INVALID_STATE_ERR");
+        }
+    };
+
+    // The spec is very specific on how selectAllChildren should be implemented so the native implementation is
+    // never used by Rangy.
+    selProto.selectAllChildren = function(node) {
+        assertNodeInSameDocument(this, node);
+        var range = api.createRange(node);
+        range.selectNodeContents(node);
+        this.setSingleRange(range);
+    };
+
+    selProto.deleteFromDocument = function() {
+        // Sepcial behaviour required for IE's control selections
+        if (implementsControlRange && implementsDocSelection && this.docSelection.type == CONTROL) {
+            var controlRange = this.docSelection.createRange();
+            var element;
+            while (controlRange.length) {
+                element = controlRange.item(0);
+                controlRange.remove(element);
+                element.parentNode.removeChild(element);
+            }
+            this.refresh();
+        } else if (this.rangeCount) {
+            var ranges = this.getAllRanges();
+            if (ranges.length) {
+                this.removeAllRanges();
+                for (var i = 0, len = ranges.length; i < len; ++i) {
+                    ranges[i].deleteContents();
+                }
+                // The spec says nothing about what the selection should contain after calling deleteContents on each
+                // range. Firefox moves the selection to where the final selected range was, so we emulate that
+                this.addRange(ranges[len - 1]);
+            }
+        }
+    };
+
+    // The following are non-standard extensions
+    selProto.eachRange = function(func, returnValue) {
+        for (var i = 0, len = this._ranges.length; i < len; ++i) {
+            if ( func( this.getRangeAt(i) ) ) {
+                return returnValue;
+            }
+        }
+    };
+
+    selProto.getAllRanges = function() {
+        var ranges = [];
+        this.eachRange(function(range) {
+            ranges.push(range);
+        });
+        return ranges;
+    };
+
+    selProto.setSingleRange = function(range, direction) {
+        this.removeAllRanges();
+        this.addRange(range, direction);
+    };
+
+    selProto.callMethodOnEachRange = function(methodName, params) {
+        var results = [];
+        this.eachRange( function(range) {
+            results.push( range[methodName].apply(range, params) );
+        } );
+        return results;
+    };
+    
+    function createStartOrEndSetter(isStart) {
+        return function(node, offset) {
+            var range;
+            if (this.rangeCount) {
+                range = this.getRangeAt(0);
+                range["set" + (isStart ? "Start" : "End")](node, offset);
+            } else {
+                range = api.createRange(this.win.document);
+                range.setStartAndEnd(node, offset);
+            }
+            this.setSingleRange(range, this.isBackward());
+        };
+    }
+
+    selProto.setStart = createStartOrEndSetter(true);
+    selProto.setEnd = createStartOrEndSetter(false);
+    
+    // Add select() method to Range prototype. Any existing selection will be removed.
+    api.rangePrototype.select = function(direction) {
+        getSelection( this.getDocument() ).setSingleRange(this, direction);
+    };
+
+    selProto.changeEachRange = function(func) {
+        var ranges = [];
+        var backward = this.isBackward();
+
+        this.eachRange(function(range) {
+            func(range);
+            ranges.push(range);
+        });
+
+        this.removeAllRanges();
+        if (backward && ranges.length == 1) {
+            this.addRange(ranges[0], "backward");
+        } else {
+            this.setRanges(ranges);
+        }
+    };
+
+    selProto.containsNode = function(node, allowPartial) {
+        return this.eachRange( function(range) {
+            return range.containsNode(node, allowPartial);
+        }, true ) || false;
+    };
+
+    selProto.getBookmark = function(containerNode) {
+        return {
+            backward: this.isBackward(),
+            rangeBookmarks: this.callMethodOnEachRange("getBookmark", [containerNode])
+        };
+    };
+
+    selProto.moveToBookmark = function(bookmark) {
+        var selRanges = [];
+        for (var i = 0, rangeBookmark, range; rangeBookmark = bookmark.rangeBookmarks[i++]; ) {
+            range = api.createRange(this.win);
+            range.moveToBookmark(rangeBookmark);
+            selRanges.push(range);
+        }
+        if (bookmark.backward) {
+            this.setSingleRange(selRanges[0], "backward");
+        } else {
+            this.setRanges(selRanges);
+        }
+    };
+
+    selProto.toHtml = function() {
+        var rangeHtmls = [];
+        this.eachRange(function(range) {
+            rangeHtmls.push( DomRange.toHtml(range) );
+        });
+        return rangeHtmls.join("");
+    };
+
+    if (features.implementsTextRange) {
+        selProto.getNativeTextRange = function() {
+            var sel, textRange;
+            if ( (sel = this.docSelection) ) {
+                var range = sel.createRange();
+                if (isTextRange(range)) {
+                    return range;
+                } else {
+                    throw module.createError("getNativeTextRange: selection is a control selection"); 
+                }
+            } else if (this.rangeCount > 0) {
+                return api.WrappedTextRange.rangeToTextRange( this.getRangeAt(0) );
+            } else {
+                throw module.createError("getNativeTextRange: selection contains no range");
+            }
+        };
+    }
+
+    function inspect(sel) {
+        var rangeInspects = [];
+        var anchor = new DomPosition(sel.anchorNode, sel.anchorOffset);
+        var focus = new DomPosition(sel.focusNode, sel.focusOffset);
+        var name = (typeof sel.getName == "function") ? sel.getName() : "Selection";
+
+        if (typeof sel.rangeCount != "undefined") {
+            for (var i = 0, len = sel.rangeCount; i < len; ++i) {
+                rangeInspects[i] = DomRange.inspect(sel.getRangeAt(i));
+            }
+        }
+        return "[" + name + "(Ranges: " + rangeInspects.join(", ") +
+                ")(anchor: " + anchor.inspect() + ", focus: " + focus.inspect() + "]";
+    }
+
+    selProto.getName = function() {
+        return "WrappedSelection";
+    };
+
+    selProto.inspect = function() {
+        return inspect(this);
+    };
+
+    selProto.detach = function() {
+        actOnCachedSelection(this.win, "delete");
+        deleteProperties(this);
+    };
+
+    WrappedSelection.detachAll = function() {
+        actOnCachedSelection(null, "deleteAll");
+    };
+
+    WrappedSelection.inspect = inspect;
+    WrappedSelection.isDirectionBackward = isDirectionBackward;
+
+    api.Selection = WrappedSelection;
+
+    api.selectionPrototype = selProto;
+
+    api.addShimListener(function(win) {
+        if (typeof win.getSelection == "undefined") {
+            win.getSelection = function() {
+                return getSelection(win);
+            };
+        }
+        win = null;
+    });
+});
diff --git a/src/js/modules/commands/aryeh_implementation.js b/src/modules/commands/aryeh_implementation.js
similarity index 100%
rename from src/js/modules/commands/aryeh_implementation.js
rename to src/modules/commands/aryeh_implementation.js
diff --git a/src/js/modules/commands/rangy-applyclass.js b/src/modules/commands/rangy-applyclass.js
similarity index 97%
rename from src/js/modules/commands/rangy-applyclass.js
rename to src/modules/commands/rangy-applyclass.js
index 8cbcfeab..4b51d5e0 100644
--- a/src/js/modules/commands/rangy-applyclass.js
+++ b/src/modules/commands/rangy-applyclass.js
@@ -1,181 +1,181 @@
-/**
- * Selection save and restore module for Rangy.
- * ApplyClass command
- *
- * Part of Rangy, a cross-browser JavaScript range and selection library
- * http://code.google.com/p/rangy/
- *
- * Depends on Rangy core.
- *
- * Copyright %%build:year%%, Tim Down
- * Licensed under the MIT license.
- * Version: %%build:version%%
- * Build date: %%build:date%%
- */
-rangy.createModule("ApplyClassCommand", function(api, module) {
-    api.requireModules( ["Commands"] );
-
-    var dom = api.dom, commandUtil = api.Command.util;
-    var log = log4javascript.getLogger("rangy.ApplyClassCommand");
-
-    var defaultTagNames = ["span"];
-
-    function hasClass(el, cssClass) {
-        return el.className && new RegExp("(?:^|\\s)" + cssClass + "(?:\\s|$)").test(el.className);
-    }
-
-    function addClass(el, cssClass) {
-        if (el.className) {
-            if (!hasClass(el, cssClass)) {
-                el.className += " " + cssClass;
-            }
-        } else {
-            el.className = cssClass;
-        }
-    }
-
-    var removeClass = (function() {
-        function replacer(matched, whitespaceBefore, whitespaceAfter) {
-            return (whitespaceBefore && whitespaceAfter) ? " " : "";
-        }
-
-        return function(el, cssClass) {
-            if (el.className) {
-                el.className = el.className.replace(new RegExp("(?:^|\\s)" + cssClass + "(?:\\s|$)"), replacer);
-            }
-        };
-    })();
-
-    function sortClassName(className) {
-        return className.split(/\s+/).sort().join(" ");
-    }
-
-    function getSortedClassName(el) {
-        return sortClassName(el.className);
-    }
-
-    function haveSameClasses(el1, el2) {
-        return getSortedClassName(el1) == getSortedClassName(el2);
-    }
-
-    function ApplyClassCommand() {
-    }
-
-    api.Command.create(ApplyClassCommand, {
-        defaultOptions: {
-            tagName: "span",
-            validTagNames: ["span"]
-        },
-
-        isValidElementForClass: function(el, validTagNames) {
-            return new RegExp("^(" + validTagNames.join("|") + ")$", "i").test(el.tagName);
-        },
-
-        isModifiableElement: function(el, context) {
-            if (!this.isValidElementForClass(el, context.options.validTagNames)) {
-                return false;
-            }
-
-            // Extract attributes once and quit if more than one is found or the attribute is not "class"
-            var hasAnyAttrs = false;
-            for (var i = 0, len = el.attributes.length; i < len; ++i) {
-                if (el.attributes[i].specified) {
-                    // If it's got more than one attribute, everything after this fails.
-                    if (hasAnyAttrs || el.attributes[i].name != "class") {
-                        return false;
-                    }
-                    hasAnyAttrs = true;
-                }
-            }
-        },
-
-        isSimpleModifiableElement: function(el, context) {
-            if (!this.isValidElementForClass(el, context.options.validTagNames)) {
-                return false;
-            }
-
-            // Extract attributes once and quit if more than one is found or the attribute is not "class"
-            var hasAnyAttrs = false;
-            for (var i = 0, len = el.attributes.length; i < len; ++i) {
-                if (el.attributes[i].specified) {
-                    // If it's got more than one attribute, everything after this fails.
-                    if (hasAnyAttrs || el.attributes[i].name != "class") {
-                        return false;
-                    }
-                    hasAnyAttrs = true;
-                }
-            }
-
-            return true;
-        },
-
-        createCssElement: function(doc, context) {
-            return doc.createElement(context.options.tagName);
-        },
-
-        styleCssElement: function(el, value) {
-            el.className = value;
-        },
-
-        getAncestorOrSelfWithClass: function(node, validTagNames, cssClass) {
-            while (node) {
-                if (node.nodeType == 1 && this.isValidElementForClass(node, validTagNames) && hasClass(node, cssClass)) {
-                    return node;
-                }
-                node = node.parentNode;
-            }
-            return null;
-        },
-
-        getSpecifiedValue: function(element, context) {
-            return hasClass(element, context.value) ? context.value : null;
-        },
-
-        getEffectiveValue: function(element, context) {
-            return this.getAncestorOrSelfWithClass(element, context.options.validTagNames, context.value) ?
-                    context.value : null;
-        },
-
-        createNonCssElement: function(node, value) {
-            return (value == "bold" || value == "700") ? dom.getDocument(node).createElement("b") : null;
-        },
-
-        getRangeValue: function(range, context) {
-            var textNodes = commandUtil.getEffectiveTextNodes(range, context), i = textNodes.length, value;
-            log.info("getRangeValue on " + range.inspect() + ", text nodes: " + textNodes);
-            while (i--) {
-                log.warn("effective value on " + textNodes[i].data +  ": " + commandUtil.getEffectiveValue(textNodes[i], context));
-                if (commandUtil.getEffectiveValue(textNodes[i], context) === null) {
-                    return false;
-                }
-            }
-            log.info("getRangeValue returning true");
-            return textNodes.length > 0;
-        },
-
-        getSelectionValue: function(sel, context) {
-            var selRanges = sel.getAllRanges();
-            for (var i = 0, len = selRanges.length; i < len; ++i) {
-                if (!this.getRangeValue(selRanges[i], context)) {
-                    return false;
-                }
-            }
-            return len > 0;
-        },
-
-        getNewSelectionValue: function(sel, context) {
-            return this.getSelectionValue(sel, context) ? "" : context.value;
-        },
-
-        applyValueToRange: function(range, context) {
-            var decomposed = range.decompose(context.rangesToPreserve);
-
-            for (var i = 0, len = decomposed.length; i < len; ++i) {
-                commandUtil.setNodeValue(decomposed[i], context);
-            }
-        }
-    });
-
-    api.registerCommand("applyclass", new ApplyClassCommand());
-
-});
+/**
+ * Selection save and restore module for Rangy.
+ * ApplyClass command
+ *
+ * Part of Rangy, a cross-browser JavaScript range and selection library
+ * http://code.google.com/p/rangy/
+ *
+ * Depends on Rangy core.
+ *
+ * Copyright %%build:year%%, Tim Down
+ * Licensed under the MIT license.
+ * Version: %%build:version%%
+ * Build date: %%build:date%%
+ */
+rangy.createModule("ApplyClassCommand", function(api, module) {
+    api.requireModules( ["Commands"] );
+
+    var dom = api.dom, commandUtil = api.Command.util;
+    var log = log4javascript.getLogger("rangy.ApplyClassCommand");
+
+    var defaultTagNames = ["span"];
+
+    function hasClass(el, cssClass) {
+        return el.className && new RegExp("(?:^|\\s)" + cssClass + "(?:\\s|$)").test(el.className);
+    }
+
+    function addClass(el, cssClass) {
+        if (el.className) {
+            if (!hasClass(el, cssClass)) {
+                el.className += " " + cssClass;
+            }
+        } else {
+            el.className = cssClass;
+        }
+    }
+
+    var removeClass = (function() {
+        function replacer(matched, whitespaceBefore, whitespaceAfter) {
+            return (whitespaceBefore && whitespaceAfter) ? " " : "";
+        }
+
+        return function(el, cssClass) {
+            if (el.className) {
+                el.className = el.className.replace(new RegExp("(?:^|\\s)" + cssClass + "(?:\\s|$)"), replacer);
+            }
+        };
+    })();
+
+    function sortClassName(className) {
+        return className.split(/\s+/).sort().join(" ");
+    }
+
+    function getSortedClassName(el) {
+        return sortClassName(el.className);
+    }
+
+    function haveSameClasses(el1, el2) {
+        return getSortedClassName(el1) == getSortedClassName(el2);
+    }
+
+    function ApplyClassCommand() {
+    }
+
+    api.Command.create(ApplyClassCommand, {
+        defaultOptions: {
+            tagName: "span",
+            validTagNames: ["span"]
+        },
+
+        isValidElementForClass: function(el, validTagNames) {
+            return new RegExp("^(" + validTagNames.join("|") + ")$", "i").test(el.tagName);
+        },
+
+        isModifiableElement: function(el, context) {
+            if (!this.isValidElementForClass(el, context.options.validTagNames)) {
+                return false;
+            }
+
+            // Extract attributes once and quit if more than one is found or the attribute is not "class"
+            var hasAnyAttrs = false;
+            for (var i = 0, len = el.attributes.length; i < len; ++i) {
+                if (el.attributes[i].specified) {
+                    // If it's got more than one attribute, everything after this fails.
+                    if (hasAnyAttrs || el.attributes[i].name != "class") {
+                        return false;
+                    }
+                    hasAnyAttrs = true;
+                }
+            }
+        },
+
+        isSimpleModifiableElement: function(el, context) {
+            if (!this.isValidElementForClass(el, context.options.validTagNames)) {
+                return false;
+            }
+
+            // Extract attributes once and quit if more than one is found or the attribute is not "class"
+            var hasAnyAttrs = false;
+            for (var i = 0, len = el.attributes.length; i < len; ++i) {
+                if (el.attributes[i].specified) {
+                    // If it's got more than one attribute, everything after this fails.
+                    if (hasAnyAttrs || el.attributes[i].name != "class") {
+                        return false;
+                    }
+                    hasAnyAttrs = true;
+                }
+            }
+
+            return true;
+        },
+
+        createCssElement: function(doc, context) {
+            return doc.createElement(context.options.tagName);
+        },
+
+        styleCssElement: function(el, value) {
+            el.className = value;
+        },
+
+        getAncestorOrSelfWithClass: function(node, validTagNames, cssClass) {
+            while (node) {
+                if (node.nodeType == 1 && this.isValidElementForClass(node, validTagNames) && hasClass(node, cssClass)) {
+                    return node;
+                }
+                node = node.parentNode;
+            }
+            return null;
+        },
+
+        getSpecifiedValue: function(element, context) {
+            return hasClass(element, context.value) ? context.value : null;
+        },
+
+        getEffectiveValue: function(element, context) {
+            return this.getAncestorOrSelfWithClass(element, context.options.validTagNames, context.value) ?
+                    context.value : null;
+        },
+
+        createNonCssElement: function(node, value) {
+            return (value == "bold" || value == "700") ? dom.getDocument(node).createElement("b") : null;
+        },
+
+        getRangeValue: function(range, context) {
+            var textNodes = commandUtil.getEffectiveTextNodes(range, context), i = textNodes.length, value;
+            log.info("getRangeValue on " + range.inspect() + ", text nodes: " + textNodes);
+            while (i--) {
+                log.warn("effective value on " + textNodes[i].data +  ": " + commandUtil.getEffectiveValue(textNodes[i], context));
+                if (commandUtil.getEffectiveValue(textNodes[i], context) === null) {
+                    return false;
+                }
+            }
+            log.info("getRangeValue returning true");
+            return textNodes.length > 0;
+        },
+
+        getSelectionValue: function(sel, context) {
+            var selRanges = sel.getAllRanges();
+            for (var i = 0, len = selRanges.length; i < len; ++i) {
+                if (!this.getRangeValue(selRanges[i], context)) {
+                    return false;
+                }
+            }
+            return len > 0;
+        },
+
+        getNewSelectionValue: function(sel, context) {
+            return this.getSelectionValue(sel, context) ? "" : context.value;
+        },
+
+        applyValueToRange: function(range, context) {
+            var decomposed = range.decompose(context.rangesToPreserve);
+
+            for (var i = 0, len = decomposed.length; i < len; ++i) {
+                commandUtil.setNodeValue(decomposed[i], context);
+            }
+        }
+    });
+
+    api.registerCommand("applyclass", new ApplyClassCommand());
+
+});
diff --git a/src/js/modules/commands/rangy-bold.js b/src/modules/commands/rangy-bold.js
similarity index 97%
rename from src/js/modules/commands/rangy-bold.js
rename to src/modules/commands/rangy-bold.js
index c52106b1..5efd26c8 100644
--- a/src/js/modules/commands/rangy-bold.js
+++ b/src/modules/commands/rangy-bold.js
@@ -1,110 +1,110 @@
-/**
- * Selection save and restore module for Rangy.
- * Bold command
- *
- * Part of Rangy, a cross-browser JavaScript range and selection library
- * http://code.google.com/p/rangy/
- *
- * Depends on Rangy core.
- *
- * Copyright %%build:year%%, Tim Down
- * Licensed under the MIT license.
- * Version: %%build:version%%
- * Build date: %%build:date%%
- */
-rangy.createModule("BoldCommand", function(api, module) {
-    api.requireModules( ["Commands"] );
-
-    var dom = api.dom, commandUtil = api.Command.util;
-    var log = log4javascript.getLogger("rangy.BoldCommand");
-
-    function BoldCommand() {
-
-    }
-
-    api.Command.create(BoldCommand, {
-        relevantCssProperty: "fontWeight",
-
-        defaultOptions: {
-            tagName: "b",
-            ignoreWhiteSpace: true
-        },
-
-        getSpecifiedValue: function(element) {
-            return element.style.fontWeight || (/^(strong|b)$/i.test(element.tagName) ? "bold" : null);
-        },
-
-        valuesEqual: function(val1, val2) {
-            val1 = ("" + val1).toLowerCase();
-            val2 = ("" + val2).toLowerCase();
-            return val1 == val2
-                || (val1 == "bold" && val2 == "700")
-                || (val2 == "bold" && val1 == "700")
-                || (val1 == "normal" && val2 == "400")
-                || (val2 == "normal" && val1 == "400");
-        },
-
-        createNonCssElement: function(node, value, context) {
-            if (value == "bold" || value == "700") {
-                return dom.getDocument(node).createElement(context.options.tagName);
-            }
-
-            return null;
-        },
-
-        isBoldCssValue: function(value) {
-            return /^(bold|700|800|900)$/.test(value);
-        },
-
-        getRangeValue: function(range, context) {
-            var textNodes = commandUtil.getEffectiveTextNodes(range, context), i = textNodes.length, value;
-            log.info("getRangeValue on " + range.inspect() + ", text nodes: " + textNodes);
-
-            if (textNodes.length == 0) {
-                return this.isBoldCssValue(commandUtil.getEffectiveValue(range.commonAncestorContainer, context))
-            } else {
-                while (i--) {
-                    value = commandUtil.getEffectiveValue(textNodes[i], context);
-                    log.info("getRangeValue value " + value);
-                    if (!this.isBoldCssValue(value)) {
-                        log.info("getRangeValue returning false");
-                        return false;
-                    }
-                }
-                return true;
-            }
-        },
-
-        getSelectionValue: function(sel, context) {
-            var selRanges = sel.getAllRanges();
-            for (var i = 0, len = selRanges.length; i < len; ++i) {
-                if (!this.getRangeValue(selRanges[i], context)) {
-                    return false;
-                }
-            }
-            return len > 0;
-        },
-
-        getNewRangeValue: function(range, context) {
-            return this.getRangeValue(range, context) ? "normal" : "bold";
-        },
-
-        getNewSelectionValue: function(sel, context) {
-            return this.getSelectionValue(sel, context) ? "normal" : "bold";
-        },
-
-        applyValueToRange: function(range, context) {
-            var decomposed = commandUtil.decomposeRange(range, context.rangesToPreserve);
-
-            log.info("applyValueToRange " + range.inspect())
-
-            for (var i = 0, len = decomposed.length; i < len; ++i) {
-                log.info("Setting node value on: " + dom.inspectNode(decomposed[i]))
-                commandUtil.setNodeValue(decomposed[i], context);
-            }
-        }
-    });
-
-    api.registerCommand("bold", new BoldCommand());
-
-});
+/**
+ * Selection save and restore module for Rangy.
+ * Bold command
+ *
+ * Part of Rangy, a cross-browser JavaScript range and selection library
+ * http://code.google.com/p/rangy/
+ *
+ * Depends on Rangy core.
+ *
+ * Copyright %%build:year%%, Tim Down
+ * Licensed under the MIT license.
+ * Version: %%build:version%%
+ * Build date: %%build:date%%
+ */
+rangy.createModule("BoldCommand", function(api, module) {
+    api.requireModules( ["Commands"] );
+
+    var dom = api.dom, commandUtil = api.Command.util;
+    var log = log4javascript.getLogger("rangy.BoldCommand");
+
+    function BoldCommand() {
+
+    }
+
+    api.Command.create(BoldCommand, {
+        relevantCssProperty: "fontWeight",
+
+        defaultOptions: {
+            tagName: "b",
+            ignoreWhiteSpace: true
+        },
+
+        getSpecifiedValue: function(element) {
+            return element.style.fontWeight || (/^(strong|b)$/i.test(element.tagName) ? "bold" : null);
+        },
+
+        valuesEqual: function(val1, val2) {
+            val1 = ("" + val1).toLowerCase();
+            val2 = ("" + val2).toLowerCase();
+            return val1 == val2
+                || (val1 == "bold" && val2 == "700")
+                || (val2 == "bold" && val1 == "700")
+                || (val1 == "normal" && val2 == "400")
+                || (val2 == "normal" && val1 == "400");
+        },
+
+        createNonCssElement: function(node, value, context) {
+            if (value == "bold" || value == "700") {
+                return dom.getDocument(node).createElement(context.options.tagName);
+            }
+
+            return null;
+        },
+
+        isBoldCssValue: function(value) {
+            return /^(bold|700|800|900)$/.test(value);
+        },
+
+        getRangeValue: function(range, context) {
+            var textNodes = commandUtil.getEffectiveTextNodes(range, context), i = textNodes.length, value;
+            log.info("getRangeValue on " + range.inspect() + ", text nodes: " + textNodes);
+
+            if (textNodes.length == 0) {
+                return this.isBoldCssValue(commandUtil.getEffectiveValue(range.commonAncestorContainer, context))
+            } else {
+                while (i--) {
+                    value = commandUtil.getEffectiveValue(textNodes[i], context);
+                    log.info("getRangeValue value " + value);
+                    if (!this.isBoldCssValue(value)) {
+                        log.info("getRangeValue returning false");
+                        return false;
+                    }
+                }
+                return true;
+            }
+        },
+
+        getSelectionValue: function(sel, context) {
+            var selRanges = sel.getAllRanges();
+            for (var i = 0, len = selRanges.length; i < len; ++i) {
+                if (!this.getRangeValue(selRanges[i], context)) {
+                    return false;
+                }
+            }
+            return len > 0;
+        },
+
+        getNewRangeValue: function(range, context) {
+            return this.getRangeValue(range, context) ? "normal" : "bold";
+        },
+
+        getNewSelectionValue: function(sel, context) {
+            return this.getSelectionValue(sel, context) ? "normal" : "bold";
+        },
+
+        applyValueToRange: function(range, context) {
+            var decomposed = commandUtil.decomposeRange(range, context.rangesToPreserve);
+
+            log.info("applyValueToRange " + range.inspect())
+
+            for (var i = 0, len = decomposed.length; i < len; ++i) {
+                log.info("Setting node value on: " + dom.inspectNode(decomposed[i]))
+                commandUtil.setNodeValue(decomposed[i], context);
+            }
+        }
+    });
+
+    api.registerCommand("bold", new BoldCommand());
+
+});
diff --git a/src/js/modules/commands/rangy-bold_new.js b/src/modules/commands/rangy-bold_new.js
similarity index 97%
rename from src/js/modules/commands/rangy-bold_new.js
rename to src/modules/commands/rangy-bold_new.js
index 34303851..5b3a2349 100644
--- a/src/js/modules/commands/rangy-bold_new.js
+++ b/src/modules/commands/rangy-bold_new.js
@@ -1,109 +1,109 @@
-/**
- * Selection save and restore module for Rangy.
- * Bold command
- *
- * Part of Rangy, a cross-browser JavaScript range and selection library
- * http://code.google.com/p/rangy/
- *
- * Depends on Rangy core.
- *
- * Copyright %%build:year%%, Tim Down
- * Licensed under the MIT license.
- * Version: %%build:version%%
- * Build date: %%build:date%%
- */
-rangy.createModule("BoldCommand", function(api, module) {
-    api.requireModules( ["Commands"] );
-
-    var dom = api.dom, commandUtil = api.Command.util;
-    var log = log4javascript.getLogger("rangy.BoldCommand");
-
-    function BoldCommand() {
-
-    }
-
-    api.SimpleInlineCommand.create(BoldCommand, {
-        relevantCssProperty: "fontWeight",
-
-        defaultOptions: {
-            tagName: "b"
-        },
-
-        getSpecifiedValue: function(element) {
-            return element.style.fontWeight || (/^(strong|b)$/i.test(element.tagName) ? "bold" : null);
-        },
-
-        valuesEqual: function(val1, val2) {
-            val1 = ("" + val1).toLowerCase();
-            val2 = ("" + val2).toLowerCase();
-            return val1 == val2
-                || (val1 == "bold" && val2 == "700")
-                || (val2 == "bold" && val1 == "700")
-                || (val1 == "normal" && val2 == "400")
-                || (val2 == "normal" && val1 == "400");
-        },
-
-        createNonCssElement: function(node, value, context) {
-            if (value == "bold" || value == "700") {
-                return dom.getDocument(node).createElement(context.options.tagName);
-            }
-
-            return null;
-        },
-
-        isBoldCssValue: function(value) {
-            return /^(bold|700|800|900)$/.test(value);
-        },
-
-        getRangeValue: function(range, context) {
-            var textNodes = commandUtil.getEffectiveTextNodes(range, context), i = textNodes.length, value;
-            log.info("getRangeValue on " + range.inspect() + ", text nodes: " + textNodes);
-
-            if (textNodes.length == 0) {
-                return this.isBoldCssValue(commandUtil.getEffectiveValue(range.commonAncestorContainer, context))
-            } else {
-                while (i--) {
-                    value = commandUtil.getEffectiveValue(textNodes[i], context);
-                    log.info("getRangeValue value " + value);
-                    if (!this.isBoldCssValue(value)) {
-                        log.info("getRangeValue returning false");
-                        return false;
-                    }
-                }
-                return true;
-            }
-        },
-
-        getSelectionValue: function(sel, context) {
-            var selRanges = sel.getAllRanges();
-            for (var i = 0, len = selRanges.length; i < len; ++i) {
-                if (!this.getRangeValue(selRanges[i], context)) {
-                    return false;
-                }
-            }
-            return len > 0;
-        },
-
-        getNewRangeValue: function(range, context) {
-            return this.getRangeValue(range, context) ? "normal" : "bold";
-        },
-
-        getNewSelectionValue: function(sel, context) {
-            return this.getSelectionValue(sel, context) ? "normal" : "bold";
-        },
-
-        applyValueToRange: function(range, context) {
-            var decomposed = commandUtil.decomposeRange(range, context.rangesToPreserve);
-
-            log.info("applyValueToRange " + range.inspect())
-
-            for (var i = 0, len = decomposed.length; i < len; ++i) {
-                log.info("Setting node value on: " + dom.inspectNode(decomposed[i]))
-                commandUtil.setNodeValue(decomposed[i], context);
-            }
-        }
-    });
-
-    api.registerCommand("bold", new BoldCommand());
-
-});
+/**
+ * Selection save and restore module for Rangy.
+ * Bold command
+ *
+ * Part of Rangy, a cross-browser JavaScript range and selection library
+ * http://code.google.com/p/rangy/
+ *
+ * Depends on Rangy core.
+ *
+ * Copyright %%build:year%%, Tim Down
+ * Licensed under the MIT license.
+ * Version: %%build:version%%
+ * Build date: %%build:date%%
+ */
+rangy.createModule("BoldCommand", function(api, module) {
+    api.requireModules( ["Commands"] );
+
+    var dom = api.dom, commandUtil = api.Command.util;
+    var log = log4javascript.getLogger("rangy.BoldCommand");
+
+    function BoldCommand() {
+
+    }
+
+    api.SimpleInlineCommand.create(BoldCommand, {
+        relevantCssProperty: "fontWeight",
+
+        defaultOptions: {
+            tagName: "b"
+        },
+
+        getSpecifiedValue: function(element) {
+            return element.style.fontWeight || (/^(strong|b)$/i.test(element.tagName) ? "bold" : null);
+        },
+
+        valuesEqual: function(val1, val2) {
+            val1 = ("" + val1).toLowerCase();
+            val2 = ("" + val2).toLowerCase();
+            return val1 == val2
+                || (val1 == "bold" && val2 == "700")
+                || (val2 == "bold" && val1 == "700")
+                || (val1 == "normal" && val2 == "400")
+                || (val2 == "normal" && val1 == "400");
+        },
+
+        createNonCssElement: function(node, value, context) {
+            if (value == "bold" || value == "700") {
+                return dom.getDocument(node).createElement(context.options.tagName);
+            }
+
+            return null;
+        },
+
+        isBoldCssValue: function(value) {
+            return /^(bold|700|800|900)$/.test(value);
+        },
+
+        getRangeValue: function(range, context) {
+            var textNodes = commandUtil.getEffectiveTextNodes(range, context), i = textNodes.length, value;
+            log.info("getRangeValue on " + range.inspect() + ", text nodes: " + textNodes);
+
+            if (textNodes.length == 0) {
+                return this.isBoldCssValue(commandUtil.getEffectiveValue(range.commonAncestorContainer, context))
+            } else {
+                while (i--) {
+                    value = commandUtil.getEffectiveValue(textNodes[i], context);
+                    log.info("getRangeValue value " + value);
+                    if (!this.isBoldCssValue(value)) {
+                        log.info("getRangeValue returning false");
+                        return false;
+                    }
+                }
+                return true;
+            }
+        },
+
+        getSelectionValue: function(sel, context) {
+            var selRanges = sel.getAllRanges();
+            for (var i = 0, len = selRanges.length; i < len; ++i) {
+                if (!this.getRangeValue(selRanges[i], context)) {
+                    return false;
+                }
+            }
+            return len > 0;
+        },
+
+        getNewRangeValue: function(range, context) {
+            return this.getRangeValue(range, context) ? "normal" : "bold";
+        },
+
+        getNewSelectionValue: function(sel, context) {
+            return this.getSelectionValue(sel, context) ? "normal" : "bold";
+        },
+
+        applyValueToRange: function(range, context) {
+            var decomposed = commandUtil.decomposeRange(range, context.rangesToPreserve);
+
+            log.info("applyValueToRange " + range.inspect())
+
+            for (var i = 0, len = decomposed.length; i < len; ++i) {
+                log.info("Setting node value on: " + dom.inspectNode(decomposed[i]))
+                commandUtil.setNodeValue(decomposed[i], context);
+            }
+        }
+    });
+
+    api.registerCommand("bold", new BoldCommand());
+
+});
diff --git a/src/js/modules/commands/rangy-italic.js b/src/modules/commands/rangy-italic.js
similarity index 97%
rename from src/js/modules/commands/rangy-italic.js
rename to src/modules/commands/rangy-italic.js
index d94689cc..6a50d529 100644
--- a/src/js/modules/commands/rangy-italic.js
+++ b/src/modules/commands/rangy-italic.js
@@ -1,87 +1,87 @@
-/**
- * Selection save and restore module for Rangy.
- * Italic command
- *
- * Part of Rangy, a cross-browser JavaScript range and selection library
- * http://code.google.com/p/rangy/
- *
- * Depends on Rangy core.
- *
- * Copyright %%build:year%%, Tim Down
- * Licensed under the MIT license.
- * Version: %%build:version%%
- * Build date: %%build:date%%
- */
-rangy.createModule("ItalicCommand", function(api, module) {
-    api.requireModules( ["Commands"] );
-
-    var dom = api.dom, commandUtil = api.Command.util;
-    var log = log4javascript.getLogger("rangy.ItalicCommand");
-
-    function ItalicCommand() {
-
-    }
-
-    api.Command.create(ItalicCommand, {
-        relevantCssProperty: "fontStyle",
-
-        defaultOptions: {
-            ignoreWhiteSpace: true
-        },
-
-        getSpecifiedValue: function(element) {
-            return element.style.fontStyle || (/^(em|i)$/i.test(element.tagName) ? "italic" : null);
-        },
-
-        createNonCssElement: function(node, value) {
-            return (value == "italic") ? dom.getDocument(node).createElement("i") : null;
-        },
-
-        getRangeValue: function(range, context) {
-            var textNodes = commandUtil.getEffectiveTextNodes(range, context), i = textNodes.length, value;
-            log.info("getRangeValue on " + range.inspect() + ", text nodes: " + textNodes);
-            if (textNodes.length == 0) {
-                return commandUtil.getEffectiveValue(range.commonAncestorContainer, context) == "italic";
-            } else {
-                while (i--) {
-                    value = commandUtil.getEffectiveValue(textNodes[i], context);
-                    log.info("getRangeValue value " + value);
-                    if (value != "italic") {
-                        log.info("getRangeValue returning false");
-                        return false;
-                    }
-                }
-                return true;
-            }
-        },
-
-        getSelectionValue: function(sel, context) {
-            var selRanges = sel.getAllRanges();
-            for (var i = 0, len = selRanges.length; i < len; ++i) {
-                if (!this.getRangeValue(selRanges[i], context)) {
-                    return false;
-                }
-            }
-            return len > 0;
-        },
-
-        getNewRangeValue: function(range, context) {
-            return this.getRangeValue(range, context) ? "normal" : "italic";
-        },
-
-        getNewSelectionValue: function(sel, context) {
-            return this.getSelectionValue(sel, context) ? "normal" : "italic";
-        },
-
-        applyValueToRange: function(range, context) {
-            var decomposed = commandUtil.decomposeRange(range, context.rangesToPreserve);
-
-            for (var i = 0, len = decomposed.length; i < len; ++i) {
-                commandUtil.setNodeValue(decomposed[i], context);
-            }
-        }
-    });
-
-    api.registerCommand("italic", new ItalicCommand());
-
-});
+/**
+ * Selection save and restore module for Rangy.
+ * Italic command
+ *
+ * Part of Rangy, a cross-browser JavaScript range and selection library
+ * http://code.google.com/p/rangy/
+ *
+ * Depends on Rangy core.
+ *
+ * Copyright %%build:year%%, Tim Down
+ * Licensed under the MIT license.
+ * Version: %%build:version%%
+ * Build date: %%build:date%%
+ */
+rangy.createModule("ItalicCommand", function(api, module) {
+    api.requireModules( ["Commands"] );
+
+    var dom = api.dom, commandUtil = api.Command.util;
+    var log = log4javascript.getLogger("rangy.ItalicCommand");
+
+    function ItalicCommand() {
+
+    }
+
+    api.Command.create(ItalicCommand, {
+        relevantCssProperty: "fontStyle",
+
+        defaultOptions: {
+            ignoreWhiteSpace: true
+        },
+
+        getSpecifiedValue: function(element) {
+            return element.style.fontStyle || (/^(em|i)$/i.test(element.tagName) ? "italic" : null);
+        },
+
+        createNonCssElement: function(node, value) {
+            return (value == "italic") ? dom.getDocument(node).createElement("i") : null;
+        },
+
+        getRangeValue: function(range, context) {
+            var textNodes = commandUtil.getEffectiveTextNodes(range, context), i = textNodes.length, value;
+            log.info("getRangeValue on " + range.inspect() + ", text nodes: " + textNodes);
+            if (textNodes.length == 0) {
+                return commandUtil.getEffectiveValue(range.commonAncestorContainer, context) == "italic";
+            } else {
+                while (i--) {
+                    value = commandUtil.getEffectiveValue(textNodes[i], context);
+                    log.info("getRangeValue value " + value);
+                    if (value != "italic") {
+                        log.info("getRangeValue returning false");
+                        return false;
+                    }
+                }
+                return true;
+            }
+        },
+
+        getSelectionValue: function(sel, context) {
+            var selRanges = sel.getAllRanges();
+            for (var i = 0, len = selRanges.length; i < len; ++i) {
+                if (!this.getRangeValue(selRanges[i], context)) {
+                    return false;
+                }
+            }
+            return len > 0;
+        },
+
+        getNewRangeValue: function(range, context) {
+            return this.getRangeValue(range, context) ? "normal" : "italic";
+        },
+
+        getNewSelectionValue: function(sel, context) {
+            return this.getSelectionValue(sel, context) ? "normal" : "italic";
+        },
+
+        applyValueToRange: function(range, context) {
+            var decomposed = commandUtil.decomposeRange(range, context.rangesToPreserve);
+
+            for (var i = 0, len = decomposed.length; i < len; ++i) {
+                commandUtil.setNodeValue(decomposed[i], context);
+            }
+        }
+    });
+
+    api.registerCommand("italic", new ItalicCommand());
+
+});
diff --git a/src/js/modules/rangy-classapplier.js b/src/modules/rangy-classapplier.js
similarity index 100%
rename from src/js/modules/rangy-classapplier.js
rename to src/modules/rangy-classapplier.js
diff --git a/src/js/modules/rangy-commands.js b/src/modules/rangy-commands.js
similarity index 97%
rename from src/js/modules/rangy-commands.js
rename to src/modules/rangy-commands.js
index de890621..c06f3892 100644
--- a/src/js/modules/rangy-commands.js
+++ b/src/modules/rangy-commands.js
@@ -1,1499 +1,1499 @@
-/**
- * Commands module for Rangy.
- * Provides replacements for many document.execCommand() commands, applicable to Ranges and Selections.
- *
- * Part of Rangy, a cross-browser JavaScript range and selection library
- * http://code.google.com/p/rangy/
- *
- * Depends on Rangy core.
- *
- * Algorithm is based on Aryeh Gregor's HTML Editing Commands specification
- * http://aryeh.name/gitweb.cgi?p=editcommands;a=blob_plain;f=editcommands.html;hb=HEAD
- *
- * Parts of this code are based on Aryeh Gregor's implementation of his algorithm
- * http://aryeh.name/spec/editcommands/autoimplementation.html
- *
- * Copyright %%build:year%%, Tim Down
- * Licensed under the MIT license.
- * Version: %%build:version%%
- * Build date: %%build:date%%
- */
-rangy.createModule("Commands", ["WrappedSelection"], function(api, module) {
-    /*
-    http://aryeh.name/spec/editcommands/autoimplementation.html
-    https://bitbucket.org/ms2ger/dom-range/src/tip/test/
-    http://aryeh.name/gitweb.cgi?p=editcommands;a=blob_plain;f=editcommands.html;hb=HEAD
-     */
-
-    var dom = api.dom;
-    var log = log4javascript.getLogger("rangy.commands");
-    var BOOLEAN = "boolean", UNDEF = "undefined";
-    var getRootContainer = dom.getRootContainer;
-
-    var globalOptions = {
-        applyToEditableOnly: false
-    };
-
-    var getComputedStyleProperty;
-
-    if (typeof window.getComputedStyle != UNDEF) {
-        getComputedStyleProperty = function(el, propName) {
-            return dom.getWindow(el).getComputedStyle(el, null)[propName];
-        };
-    } else if (typeof document.documentElement.currentStyle != UNDEF) {
-        getComputedStyleProperty = function(el, propName) {
-            return el.currentStyle[propName];
-        };
-    } else {
-        module.fail("No means of obtaining computed style properties found");
-    }
-
-    function isBefore(nodeA, nodeB) {
-        var parentA = nodeA.parentNode, parentB = nodeB.parentNode;
-        if (parentA && parentB) {
-            return dom.comparePoints(nodeA.parentNode, dom.getNodeIndex(nodeA), nodeB.parentNode, dom.getNodeIndex(nodeB)) == -1;
-        } else {
-            return !parentA;
-        }
-    }
-
-    var toArray = util.toArray;
-
-    /**
-     * Returns the furthest ancestor of a Node as defined by DOM Range.
-     */
-    function getFurthestAncestor(node) {
-        var root = node;
-        while (root.parentNode != null) {
-            root = root.parentNode;
-        }
-        return root;
-    }
-
-    function isEditableElement(node) {
-        return node && node.nodeType == 1 && node.isContentEditable;
-    }
-
-    // The spec says "An editing host is a node that is either an Element with a contenteditable
-    // attribute set to the true state, or a Document whose designMode is enabled."
-    // Because Safari returns "true" for the contentEditable property of an element that actually inherits its
-    // editability from its parent, we use a different definition:
-
-    // "An editing host is a node that is either an Element whose isContentEditable property returns true but whose
-    // parent node is not an element or whose isContentEditable property returns false, or a Document whose designMode
-    // is enabled."
-    function isEditingHost(node) {
-        return node &&
-            ((node.nodeType == 9 && node.designMode == "on") ||
-            (isEditableElement(node) && !isEditableElement(node.parentNode)));
-    }
-
-    // The spec says "Something is editable if it is a node which is not an editing host, does
-    // not have a contenteditable attribute set to the false state, and whose
-    // parent is an editing host or editable."
-
-    // We're not making any distinction, unless the applyToEditableOnly global option is set to true. Rangy commands can
-    // run on non-editable content. The revised definition:
-
-    // "A node is editable if it is not an editing host and is or is the child of an Element whose isContentEditable
-    // property returns true."
-    function isEditable(node, options) {
-        // This is slightly a lie, because we're excluding non-HTML elements with
-        // contentEditable attributes.
-        return !options || !options.applyToEditableOnly
-            || ( (isEditableElement(node) || isEditableElement(node.parentNode)) && !isEditingHost(node) );
-    }
-
-    /**
-     * "contained" as defined by DOM Range: "A Node node is contained in a range
-     * range if node's furthest ancestor is the same as range's root, and (node, 0)
-     * is after range's start, and (node, length of node) is before range's end."
-     */
-    function isContained(node, range) {
-        var pos1 = dom.comparePoints(node, 0, range.startContainer, range.startOffset);
-        var pos2 = dom.comparePoints(node, dom.getNodeLength(node), range.endContainer, range.endOffset);
-
-        return getRootContainer(node) == getRootContainer(range.startContainer)
-            && pos1 == 1
-            && pos2 == -1;
-    }
-
-    /**
-     * "A Node is effectively contained in a Range if either it is contained in the
-     * Range; or it is the Range's start node, it is a Text node, and its length is
-     * different from the Range's start offset; or it is the Range's end node, it
-     * is a Text node, and the Range's end offset is not 0; or it has at least one
-     * child, and all its children are effectively contained in the Range."
-     */
-    function isEffectivelyContained(node, range) {
-        if (isContained(node, range)) {
-            return true;
-        }
-        var isCharData = dom.isCharacterDataNode(node);
-        if (node == range.startContainer && isCharData && dom.getNodeLength(node) != range.startOffset) {
-            return true;
-        }
-        if (node == range.endContainer && isCharData && range.endOffset != 0) {
-            return true;
-        }
-        var children = node.childNodes, childCount = children.length;
-        if (childCount != 0) {
-            for (var i = 0; i < childCount; ++i) {
-                if (!isEffectivelyContained(children[i], range)) {
-                    return false;
-                }
-            }
-            return true;
-        }
-        return false;
-    }
-
-    // Opera 11 puts HTML elements in the null namespace, it seems, and IE 7 has undefined namespaceURI
-    function isHtmlNode(node) {
-        var ns;
-        return typeof (ns = node.namespaceURI) == UNDEF || (ns === null || ns == "http://www.w3.org/1999/xhtml");
-    }
-
-
-    var unwrappableTagNamesRegex = /^(h[1-6]|p|hr|pre|blockquote|ol|ul|li|dl|dt|dd|div|table|caption|colgroup|col|tbody|thead|tfoot|tr|th|td|address)$/i;
-    var inlineDisplayRegex = /^inline(-block|-table)?$/i;
-
-    /**
-     * "An inline node is either a Text node, or an Element whose 'display'
-     * property computes to 'inline', 'inline-block', or 'inline-table'."
-     */
-    function isInlineNode(node) {
-        return dom.isCharacterDataNode(node) ||
-                (node.nodeType == 1 && inlineDisplayRegex.test(getComputedStyleProperty(node, "display")));
-    }
-
-    function isNullOrInlineNode(node) {
-        return !node || isInlineNode(node);
-    }
-
-    function isNonBrInlineNode(node) {
-        return isInlineNode(node) && node.nodeName.toLowerCase() != "br";
-    }
-
-    function isHtmlElement(node, tagNames) {
-        if (!node || node.nodeType != 1 || !isHtmlNode(node)) {
-            return false;
-        }
-        switch (typeof tagNames) {
-            case "string":
-                return node.tagName.toLowerCase() == tagNames.toLowerCase();
-            case "object":
-                return new RegExp("^(" + tagNames.join(",") + ")$", "i").test(node.tagName);
-            default:
-                return true;
-        }
-    }
-
-    /**
-     * "An unwrappable node is an HTML element which may not be used where only
-     * phrasing content is expected (not counting unknown or obsolete elements,
-     * which cannot be used at all); or any Element whose display property computes
-     * to something other than 'inline', 'inline-block', or 'inline-table'; or any
-     * node whose parent is not editable."
-     */
-    function isUnwrappable(node, options) {
-        if (!isHtmlElement(node)) {
-            return false;
-        }
-
-        if (!isInlineNode(node)) {
-            return true;
-        }
-
-        if (!isEditable(node, options)) {
-            return true;
-        }
-
-/*
-        if (node.nodeType == 3 && options.ignoreWhiteSpace && !/[^\r\n\t ]/.test(node.data)
-                && (isUnwrappable(node.previousSibling, options) || isUnwrappable(node.nextSibling, options))) {
-            return true;
-        }
-*/
-
-        return unwrappableTagNamesRegex.test(node.tagName);
-    }
-
-
-/*
-    function isWhitespaceNode(node) {
-        return node.nodeType == 3 && !/[^\r\n\t ]/.test(node.data);
-    }
-*/
-
-    function isIgnoredNode(node, options) {
-        // Ignore comment nodes
-        if (node.nodeType == 8) {
-            return true;
-        } else if (node.nodeType == 3) {
-            // Ignore text nodes that are within <script> and <style> elements
-            if (node.parentNode && /^(script|style)$/i.test(node.parentNode.tagName)) {
-                //log.fatal("IGNORED NODE " + dom.inspectNode(node));
-                return true;
-            }
-
-            // Ignore whitespace nodes that are next to an unwrappable element
-            if (options.ignoreWhiteSpace && !/[^\r\n\t ]/.test(node.data)
-                    && (isUnwrappable(node.previousSibling, options) || isUnwrappable(node.nextSibling, options))) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    function blockExtend(range) {
-        // "Let start node, start offset, end node, and end offset be the start
-        // and end nodes and offsets of the range."
-        var startNode = range.startContainer,
-            startOffset = range.startOffset,
-            endNode = range.endContainer,
-            endOffset = range.endOffset,
-            startChildNode,
-            endChildNode;
-
-        // "Repeat the following steps:"
-        while (true) {
-            // "If start node is a Text or Comment node or start offset is 0,
-            // set start offset to the index of start node and then set start
-            // node to its parent."
-            if (dom.isCharacterDataNode(startNode) || startOffset == 0) {
-                startOffset = dom.getNodeIndex(startNode);
-                startNode = startNode.parentNode;
-
-            // "Otherwise, if start offset is equal to the length of start
-            // node, set start offset to one plus the index of start node and
-            // then set start node to its parent."
-            } else if (startOffset == dom.getNodeLength(startNode)) {
-                startOffset = 1 + dom.getNodeIndex(startNode);
-                startNode = startNode.parentNode;
-
-            // "Otherwise, if the child of start node with index start offset and
-            // its previousSibling are both inline nodes and neither is a br,
-            // subtract one from start offset."
-            } else if ( (startChildNode = startNode.childNodes[startOffset])
-                    && isNonBrInlineNode(startChildNode)
-                    && isNonBrInlineNode(startChildNode.previousSibling)) {
-
-                startOffset--;
-
-            // "Otherwise, break from this loop."
-            } else {
-                break;
-            }
-        }
-
-        // "Repeat the following steps:"
-        while (true) {
-            // "If end offset is 0, set end offset to the index of end node and
-            // then set end node to its parent."
-            if (endOffset == 0) {
-                endOffset = dom.getNodeIndex(endNode);
-                endNode = endNode.parentNode;
-
-            // "Otherwise, if end node is a Text or Comment node or end offset
-            // is equal to the length of end node, set end offset to one plus
-            // the index of end node and then set end node to its parent."
-            } else if (dom.isCharacterDataNode(endNode) || endOffset == dom.getNodeLength(endNode)) {
-                endOffset = 1 + dom.getNodeIndex(endNode);
-                endNode = endNode.parentNode;
-
-            // "Otherwise, if the child of end node with index end offset and its
-            // nextSibling are both inline nodes and neither is a br, add one
-            // to end offset."
-            } else if ( (endChildNode = endNode.childNodes[endOffset])
-                    && isNonBrInlineNode(endChildNode)
-                    && isNonBrInlineNode(endChildNode.previousSibling)) {
-
-                endOffset++;
-
-            // "Otherwise, break from this loop."
-            } else {
-                break;
-            }
-        }
-
-        // "Let new range be a new range whose start and end nodes and offsets
-        // are start node, start offset, end node, and end offset."
-        var newRange = range.cloneRange();
-        newRange.setStart(startNode, startOffset);
-        newRange.setEnd(endNode, endOffset);
-
-        // "Return new range."
-        return newRange;
-    }
-
-    function elementOnlyHasAttributes(el, attrs) {
-        log.debug("elementOnlyHasAttributes. attr length: " + el.attributes.length);
-        for (var i = 0, len = el.attributes.length, attrName; i < len; ++i) {
-            attrName = el.attributes[i].name;
-            //log.info("name: " + attrName + ", specified: " + el.attributes[i].specified);
-            if (el.attributes[i].specified && (!attrs || !dom.arrayContains(attrs, attrName))) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    // "A modifiable element is a b, em, i, s, span, strong, sub, sup, or u element
-    // with no attributes except possibly style; or a font element with no
-    // attributes except possibly style, color, face, and/or size; or an a element
-    // with no attributes except possibly style and/or href."
-    var modifiableElements = "b|em|i|s|span|strike|strong|sub|sup|u";
-    var modifiableElementRegex = new RegExp("^(" + modifiableElements + ")$");
-
-    function isModifiableElement(node, context) {
-        //log.info("isModifiableElement nodeType " + node.nodeType + ", isHtmlNode " + isHtmlNode(node));
-        if (!isHtmlElement(node)) {
-            return false;
-        }
-        if (context && context.command.isModifiableElement) {
-            return context.command.isModifiableElement(el, context);
-        }
-        var tagName = node.tagName.toLowerCase(), allowedAttributes;
-
-        if (modifiableElementRegex.test(tagName)) {
-            allowedAttributes = ["style", "class"];
-        } else if (tagName == "a") {
-            allowedAttributes = ["style", "class", "href"];
-        } else if (tagName == "font") {
-            allowedAttributes = ["style", "class", "color", "face", "size"];
-        } else {
-            return false;
-        }
-        return elementOnlyHasAttributes(node, allowedAttributes);
-    }
-
-    var simpleModifiableElements = modifiableElements + "|a|font";
-    var simpleModifiableElementRegex = new RegExp("^(" + simpleModifiableElements + ")$");
-
-    function isSimpleModifiableElement(el, context) {
-        // "A simple modifiable element is an HTML element for which at least one
-        // of the following holds:"
-        if (!isHtmlElement(el)) {
-            return false;
-        }
-
-        if (context && context.command.isSimpleModifiableElement) {
-            return context.command.isSimpleModifiableElement(el, context);
-        }
-
-        // Only these elements can possibly be a simple modifiable element.
-        var tagName = el.tagName.toLowerCase();
-        if (!simpleModifiableElementRegex.test(tagName)) {
-            return false;
-        }
-
-        // Extract attributes once and quit if more than one is found
-        var attrName, attrValue, hasAnyAttrs = false;
-        for (var i = 0, len = el.attributes.length; i < len; ++i) {
-            //log.info("attr specified: " + el.attributes[i].specified + ", name " + el.attributes[i].name);
-            if (el.attributes[i].specified) {
-                // If it's got more than one attribute, everything after this fails.
-                if (hasAnyAttrs) {
-                    return false;
-                } else {
-                    attrName = el.attributes[i].name;
-                    attrValue = el.getAttribute(attrName);
-                    hasAnyAttrs = true;
-                }
-            }
-        }
-
-        // "It is an a, b, em, font, i, s, span, strike, strong, sub, sup, or u
-        // element with no attributes."
-        if (!hasAnyAttrs) {
-            return true;
-        }
-
-        // "It is an a, b, em, font, i, s, span, strike, strong, sub, sup, or u
-        // element with exactly one attribute, which is style, which sets no CSS
-        // properties (including invalid or unrecognized properties)."
-        if (attrName == "style" && el.style.cssText.length == 0) {
-            return true;
-        }
-
-        // "It is an a element with exactly one attribute, which is href."
-        if (tagName == "a" && attrName == "href") {
-            return true;
-        }
-
-        // "It is a font element with exactly one attribute, which is either color,
-        // face, or size."
-        if (tagName == "font" && /^(color|face|size)$/.test(attrName)) {
-            return true;
-        }
-
-        // Check style attribute and bail out if it has more than one property
-        if ( attrName != "style" || (typeof el.style.length == "number" && el.style.length > 1) ||
-                !/^[a-z\-]+:[^;]+;?\s?$/i.test(el.style.cssText)) {
-            return false;
-        }
-
-        // "It is a b or strong element with exactly one attribute, which is style,
-        // and the style attribute sets exactly one CSS property (including invalid
-        // or unrecognized properties), which is "font-weight"."
-
-        if ((tagName == "b" || tagName == "strong") && el.style.fontWeight != "") {
-            return true;
-        }
-
-        // "It is an i or em element with exactly one attribute, which is style,
-        // and the style attribute sets exactly one CSS property (including invalid
-        // or unrecognized properties), which is "font-style"."
-        if ((tagName == "i" || tagName == "em") && el.style.fontStyle != "") {
-            return true;
-        }
-
-        // "It is a sub or sub element with exactly one attribute, which is style,
-        // and the style attribute sets exactly one CSS property (including invalid
-        // or unrecognized properties), which is "vertical-align"."
-        if ((tagName == "sub" || tagName == "sup") && el.style.verticalAlign != "") {
-            return true;
-        }
-
-        // "It is an a, font, or span element with exactly one attribute, which is
-        // style, and the style attribute sets exactly one CSS property (including
-        // invalid or unrecognized properties), and that property is not
-        // "text-decoration"."
-        if ((tagName == "a" || tagName == "font" || tagName == "span") && el.style.textDecoration == "") {
-            return true;
-        }
-
-        // "It is an a, font, s, span, strike, or u element with exactly one
-        // attribute, which is style, and the style attribute sets exactly one CSS
-        // property (including invalid or unrecognized properties), which is
-        // "text-decoration", which is set to "line-through" or "underline" or
-        // "overline" or "none"."
-        if (/^(a|font|s|span|strike|u)$/.test(tagName) && /^(line-through|underline|overline|none)$/.test(el.style.textDecoration)) {
-            return true;
-        }
-
-        return false;
-    }
-
-    function addRangeMove(rangeMoves, range, oldParent, oldIndex, newParent, newIndex) {
-        var sc = range.startContainer, so = range.startOffset,
-            ec = range.endContainer, eo = range.endOffset;
-
-        var newSc = sc, newSo = so, newEc = ec, newEo = eo;
-
-        // "If a boundary point's node is the same as or a descendant of node,
-        // leave it unchanged, so it moves to the new location."
-        //
-        // No modifications necessary.
-
-        // "If a boundary point's node is new parent and its offset is greater than
-        // new index, add one to its offset."
-        if (sc == newParent && so > newIndex) {
-            newSo++;
-        }
-        if (ec == newParent && eo > newIndex) {
-            newEo++;
-        }
-
-        // "If a boundary point's node is old parent and its offset is old index or
-        // old index + 1, set its node to new parent and add new index  old index
-        // to its offset."
-        if (sc == oldParent && (so == oldIndex  || so == oldIndex + 1)) {
-            newSc = newParent;
-            newSo += newIndex - oldIndex;
-        }
-        if (ec == oldParent && (eo == oldIndex || eo == oldIndex + 1)) {
-            newEc = newParent;
-            newEo += newIndex - oldIndex;
-        }
-
-        // "If a boundary point's node is old parent and its offset is greater than
-        // old index + 1, subtract one from its offset."
-        if (sc == oldParent && so > oldIndex + 1) {
-            newSo--;
-        }
-        if (ec == oldParent && eo > oldIndex + 1) {
-            newEo--;
-        }
-
-        if (newSc == sc && newSo == so && newEc == ec && newEo == eo) {
-            rangeMoves.push([range, newSc, newSo, newEc, newEo]);
-        }
-    }
-
-    function movePreservingRanges(node, newParent, newIndex, rangesToPreserve) {
-        // For convenience, allow newIndex to be -1 to mean "insert at the end".
-        if (newIndex == -1) {
-            newIndex = newParent.childNodes.length;
-        }
-
-        // "When the user agent is to move a Node to a new location, preserving
-        // ranges, it must remove the Node from its original parent (if any), then insert it
-        // in the new location. In doing so, however, it must ignore the regular
-        // range mutation rules, and instead follow these rules:"
-
-        // "Let node be the moved Node, old parent and old index be the old parent
-        // and index, and new parent and new index be the new parent and index."
-        var oldParent = node.parentNode;
-        var oldIndex = dom.getNodeIndex(node);
-
-        var rangeMoves = [];
-
-        for (var i = 0, len = rangesToPreserve.length; i < len; ++i) {
-            addRangeMove(rangeMoves, rangesToPreserve[i], oldParent, oldIndex, newParent, newIndex);
-        }
-
-        // Now actually move the node.
-        if (newParent.childNodes.length == newIndex) {
-            newParent.appendChild(node);
-        } else {
-            newParent.insertBefore(node, newParent.childNodes[newIndex]);
-        }
-
-        // Set the new range boundaries
-        log.debug("Node move: ", dom.inspectNode(node), "to", dom.inspectNode(newParent), newIndex);
-        for (var j = 0, rangeMove; rangeMove = rangeMoves[j++]; ) {
-            log.debug("Moving " + rangeMove[0].inspect(), dom.inspectNode(rangeMove[1]), rangeMove[2], dom.inspectNode(rangeMove[3]), rangeMove[4]);
-            rangeMove[0].setStart(rangeMove[1], rangeMove[2]);
-            rangeMove[0].setEnd(rangeMove[3], rangeMove[4]);
-        }
-    }
-
-    function decomposeSubtree(rangeIterator, nodes) {
-        nodes = nodes || [];
-        for (var node, subRangeIterator; node = rangeIterator.next(); ) {
-            if (rangeIterator.isPartiallySelectedSubtree()) {
-                // The node is partially selected by the Range, so we can use a new RangeIterator on the portion of the
-                // node selected by the Range.
-                subRangeIterator = rangeIterator.getSubtreeIterator();
-                decomposeSubtree(subRangeIterator, nodes);
-                subRangeIterator.detach();
-            } else {
-                nodes.push(node);
-            }
-        }
-        return nodes;
-    }
-
-    function decomposeRange(range, rangesToPreserve) {
-        // "If range's start and end are the same, return an empty list."
-        if (range.startContainer == range.endContainer && range.startOffset == range.endOffset) {
-            return [];
-        }
-
-        range.splitBoundaries(rangesToPreserve);
-
-        // "Let cloned range be the result of calling cloneRange() on range."
-        var clonedRange = range.cloneRange();
-
-        // "While the start offset of cloned range is 0, and the parent of cloned
-        // range's start node is not null, set the start of cloned range to (parent
-        // of start node, index of start node)."
-        while (clonedRange.startOffset == 0 && clonedRange.startContainer.parentNode) {
-            clonedRange.setStart(clonedRange.startContainer.parentNode, dom.getNodeIndex(clonedRange.startContainer));
-        }
-
-        // "While the end offset of cloned range equals the length of its end node,
-        // and the parent of clone range's end node is not null, set the end of
-        // cloned range to (parent of end node, 1 + index of end node)."
-        while (clonedRange.endOffset == dom.getNodeLength(clonedRange.endContainer) && clonedRange.endContainer.parentNode) {
-            clonedRange.setEnd(clonedRange.endContainer.parentNode, 1 + dom.getNodeIndex(clonedRange.endContainer));
-        }
-
-        // "Return a list consisting of every Node contained in cloned range in
-        // tree order, omitting any whose parent is also contained in cloned
-        // range."
-
-        var iterator = new rangy.DomRange.RangeIterator(clonedRange, false);
-        var nodes = decomposeSubtree(iterator);
-        iterator.detach();
-        return nodes;
-    }
-
-    function moveChildrenPreservingRanges(node, newParent, newIndex, removeNode, rangesToPreserve) {
-        var child, children = [];
-        while ( (child = node.firstChild) ) {
-            movePreservingRanges(child, newParent, newIndex++, rangesToPreserve);
-            children.push(child);
-        }
-        if (removeNode) {
-            node.parentNode.removeChild(node);
-        }
-        return children;
-    }
-
-    function replaceWithOwnChildren(element, rangesToPreserve) {
-        return moveChildrenPreservingRanges(element, element.parentNode, dom.getNodeIndex(element), true, rangesToPreserve);
-    }
-
-    function copyAttributes(fromElement, toElement) {
-        var attrs = fromElement.attributes;
-
-        for (var i = 0, len = attrs.length; i < len; ++i) {
-            if (attrs[i].specified) {
-                // For IE, which doesn't allow copying of the entire style object using get/setAttribute
-                if (attrs[i].name == "style") {
-                    toElement.style.cssText = toElement.style.cssText;
-                } else {
-                    toElement.setAttribute(attrs[i].name, attrs[i].value);
-                }
-            }
-        }
-    }
-
-    function clearValue(element, context) {
-        var command = context.command, rangesToPreserve = context.rangesToPreserve;
-
-        // "If element's specified value for command is null, return the empty
-        // list."
-        if (command.getSpecifiedValue(element, context) === null) {
-            return [];
-        }
-
-        // "If element is a simple modifiable element:"
-        if (isSimpleModifiableElement(element, context)) {
-            var p = element.parentNode;
-            return replaceWithOwnChildren(element, rangesToPreserve);
-        }
-
-        // Command-specific special cases
-        if (command.clearValue) {
-            command.clearValue(element, context);
-        }
-
-        // "If the relevant CSS property for command is not null, unset the CSS
-        // property property of element."
-        if (command.relevantCssProperty !== null) {
-            element.style[command.relevantCssProperty] = "";
-            if (element.style.cssText == "") {
-                element.removeAttribute("style");
-            }
-        }
-
-        // "If element's specified value for command is null, return the empty
-        // list."
-        if (command.getSpecifiedValue(element, context) === null) {
-            return [];
-        }
-
-        // "Let new element be a new HTML element with name "span", with the
-        // same attributes and ownerDocument as element."
-        var newElement = dom.getDocument(element).createElement("span");
-        copyAttributes(element, newElement);
-
-        // "Insert new element into the parent of element immediately before it."
-        element.parentNode.insertBefore(newElement, element);
-
-        // "While element has children, append its first child as the last child of
-        // new element, preserving ranges."
-        // "Remove element from its parent."
-        moveChildrenPreservingRanges(element, newElement, 0, true, rangesToPreserve);
-
-        // "Return the one-Node list consisting of new element."
-        return [newElement];
-    }
-
-    // This entire function is a massive hack to work around browser
-    // incompatibility.  It wouldn't work in real life, but it's good enough for a
-    // test implementation.  It's not clear how all this should actually be specced
-    // in practice, since CSS defines no notion of equality, does it?
-    function valuesEqual(command, val1, val2) {
-        if (val1 === null || val2 === null) {
-            return val1 === val2;
-        }
-
-        return command.valuesEqual(val1, val2);
-    }
-
-    /**
-     * "effective value" per edit command spec
-     */
-    function getEffectiveValue(node, context) {
-        var isElement = (node.nodeType == 1);
-
-        // "If neither node nor its parent is an Element, return null."
-        if (!isElement && (!node.parentNode || node.parentNode.nodeType != 1)) {
-            return null;
-        }
-
-        // "If node is not an Element, return the effective value of its parent for
-        // command."
-        if (!isElement) {
-            return getEffectiveValue(node.parentNode, context);
-        }
-
-        return context.command.getEffectiveValue(node, context);
-    }
-
-    function removeExtraneousLineBreaksBefore(node) {
-        // "If node is not an Element, or it is an inline node, do nothing and
-        // abort these steps."
-        if (!node || node.nodeType != 1 || isInlineNode(node)) {
-            return;
-        }
-
-        // "If the previousSibling of node is a br, and the previousSibling of the
-        // previousSibling of node is an inline node that is not a br, remove the
-        // previousSibling of node from its parent."
-        var previousSibling = node.previousSibling, previousSiblingPreviousSibling;
-        if (isHtmlElement(previousSibling, "br")
-                && isInlineNode( (previousSiblingPreviousSibling = node.previousSibling.previousSibling) )
-                && !isHtmlElement(previousSiblingPreviousSibling, "br")) {
-            node.parentNode.removeChild(previousSibling);
-        }
-    }
-
-    function removeExtraneousLineBreaksAtTheEndOf(node) {
-        // "If node is not an Element, or it is an inline node, do nothing and
-        // abort these steps."
-        if (!node || node.nodeType != 1 || isInlineNode(node)) {
-            return;
-        }
-
-        // "If node has at least two children, and its last child is a br, and its
-        // second-to-last child is an inline node that is not a br, remove the last
-        // child of node from node."
-        var lastChild = node.lastChild, lastChildPreviousSibling;
-        if (node.childNodes.length >= 2 && isHtmlElement(node.lastChild, "br")
-                && isInlineNode( (lastChildPreviousSibling = node.lastChild.previousSibling) )
-                && !isHtmlElement(lastChildPreviousSibling, "br")) {
-            node.removeChild(lastChild);
-        }
-    }
-
-    // "To remove extraneous line breaks from a node, first remove extraneous line
-    // breaks before it, then remove extraneous line breaks at the end of it."
-    function removeExtraneousLineBreaksFrom(node) {
-        removeExtraneousLineBreaksBefore(node);
-        removeExtraneousLineBreaksAtTheEndOf(node);
-    }
-
-    function wrap(nodeList, siblingCriteria, newParentInstructions, context) {
-        var firstNode = nodeList[0];
-        var options = context.options, rangesToPreserve = context.rangesToPreserve;
-        var i, len, range;
-
-        // "If node list is empty, or the first member of node list is not
-        // editable, return null and abort these steps."
-        if (!nodeList.length || !isEditable(firstNode, options)) {
-            return null;
-        }
-
-        var lastNode = nodeList[nodeList.length - 1];
-
-        // "If node list's last member is an inline node that's not a br, and node
-        // list's last member's nextSibling is a br, append that br to node list."
-        if (isInlineNode(lastNode) && !isHtmlElement(lastNode, "br") && isHtmlElement(lastNode.nextSibling, "br")) {
-            nodeList.push(lastNode.nextSibling);
-        }
-
-        // "If the previousSibling of the first member of node list is editable and
-        // meets the sibling criteria, let new parent be the previousSibling of the
-        // first member of node list."
-        var newParent, nodePriorToFirstNode = firstNode.previousSibling, nodeAfterLastNode = lastNode.nextSibling;
-
-        if (isEditable(nodePriorToFirstNode, options) && siblingCriteria(nodePriorToFirstNode)) {
-            newParent = nodePriorToFirstNode;
-
-        // "Otherwise, if the nextSibling of the last member of node list is
-        // editable and meets the sibling criteria, let new parent be the
-        // nextSibling of the last member of node list."
-        } else if (isEditable(nodeAfterLastNode, options) && siblingCriteria(nodeAfterLastNode)) {
-            newParent = nodeAfterLastNode;
-
-        // "Otherwise, run the new parent instructions, and let new parent be the
-        // result."
-        } else {
-            newParent = newParentInstructions();
-        }
-
-        // "If new parent is null, abort these steps and return null."
-        if (!newParent) {
-            return null;
-        }
-
-        var doc = dom.getDocument(newParent);
-        var newParentParent = newParent.parentNode, firstNodeParent = firstNode.parentNode;
-
-        // "If new parent's parent is null:"
-        if (!newParentParent) {
-            // "Insert new parent into the parent of the first member of node list
-            // immediately before the first member of node list."
-            firstNodeParent.insertBefore(newParent, firstNode);
-
-            // "If any range has a boundary point with node equal to the parent of
-            // new parent and offset equal to the index of new parent, add one to
-            // that boundary point's offset."
-
-            // Preserve only the ranges passed in
-            for (i = 0; range = rangesToPreserve[i++]; ) {
-                if (range.startContainer == newParentParent && range.startOffset == dom.getNodeIndex(newParent)) {
-                    range.setStart(range.startContainer, range.startOffset + 1);
-                }
-                if (range.endContainer == newParentParent && range.endOffset == dom.getNodeIndex(newParent)) {
-                    range.setEnd(range.endContainer, range.endOffset + 1);
-                }
-            }
-        }
-
-        // "Let original parent be the parent of the first member of node list."
-
-        // "If new parent is before the first member of node list in tree order:"
-        if (isBefore(newParent, firstNode)) {
-            // "If new parent is not an inline node, but the last child of new
-            // parent and the first member of node list are both inline nodes, and
-            // the last child of new parent is not a br, call createElement("br")
-            // on the ownerDocument of new parent and append the result as the last
-            // child of new parent."
-            if (!isInlineNode(newParent) && isInlineNode(newParent.lastChild) && isInlineNode(firstNode) && !isHtmlElement(newParent.lastChild, "br")) {
-                newParent.appendChild(doc.createElement("br"));
-            }
-
-            // "For each node in node list, append node as the last child of new
-            // parent, preserving ranges."
-            for (i = 0, len = nodeList.length; i < len; ++i) {
-                movePreservingRanges(nodeList[i], newParent, -1, rangesToPreserve);
-            }
-
-        // "Otherwise:"
-        } else {
-            // "If new parent is not an inline node, but the first child of new
-            // parent and the last member of node list are both inline nodes, and
-            // the last member of node list is not a br, call createElement("br")
-            // on the ownerDocument of new parent and insert the result as the
-            // first child of new parent."
-            if (!isInlineNode(newParent) && isInlineNode(newParent.firstChild) && isInlineNode(lastNode) && !isHtmlElement(lastNode, "br")) {
-                newParent.insertBefore(doc.createElement("br"), newParent.firstChild);
-            }
-
-            // "For each node in node list, in reverse order, insert node as the
-            // first child of new parent, preserving ranges."
-            for (i = nodeList.length - 1; i >= 0; i--) {
-                movePreservingRanges(nodeList[i], newParent, 0, rangesToPreserve);
-            }
-        }
-
-        // "If original parent is editable and has no children, remove it from its
-        // parent."
-        if (isEditable(firstNodeParent, options) && !firstNodeParent.hasChildNodes()) {
-            firstNodeParent.parentNode.removeChild(firstNodeParent);
-        }
-
-        // "If new parent's nextSibling is editable and meets the sibling
-        // criteria:"
-        var newParentNextSibling = newParent.nextSibling;
-        if (isEditable(newParentNextSibling, options) && siblingCriteria(newParentNextSibling)) {
-            // "If new parent is not an inline node, but new parent's last child
-            // and new parent's nextSibling's first child are both inline nodes,
-            // and new parent's last child is not a br, call createElement("br") on
-            // the ownerDocument of new parent and append the result as the last
-            // child of new parent."
-            if (!isInlineNode(newParent) && isInlineNode(newParent.lastChild) &&
-                    isInlineNode(newParentNextSibling.firstChild) && !isHtmlElement(newParent.lastChild, "br")) {
-                newParent.appendChild(doc.createElement("br"));
-            }
-
-            // "While new parent's nextSibling has children, append its first child
-            // as the last child of new parent, preserving ranges."
-            while (newParentNextSibling.hasChildNodes()) {
-                movePreservingRanges(newParentNextSibling.firstChild, newParent, -1, rangesToPreserve);
-            }
-
-            // "Remove new parent's nextSibling from its parent."
-            newParent.parentNode.removeChild(newParentNextSibling);
-        }
-
-        // "Remove extraneous line breaks from new parent."
-        removeExtraneousLineBreaksFrom(newParent);
-
-        // "Return new parent."
-        return newParent;
-    }
-
-    function reorderModifiableDescendants(node, command, newValue, context, siblingPropName) {
-        var candidate = node[siblingPropName], rangesToPreserve = context.rangesToPreserve;
-
-        // "While candidate is a modifiable element, and candidate has exactly one
-        // child, and that child is also a modifiable element, and candidate is
-        // not a simple modifiable element or candidate's specified value for
-        // command is not new value, set candidate to its child."
-        while (isModifiableElement(candidate, context)
-                && candidate.childNodes.length == 1
-                && isModifiableElement(candidate.firstChild, context)
-                && (!isSimpleModifiableElement(candidate, context)
-                    || !valuesEqual(command, command.getSpecifiedValue(candidate, context), newValue))) {
-            candidate = candidate.firstChild;
-        }
-
-        // "If candidate is a simple modifiable element whose specified value and
-        // effective value for command are both new value, and candidate is
-        // not the previousSibling/nextSibling of node:"
-        if (isSimpleModifiableElement(candidate, context)
-                && valuesEqual(command, command.getSpecifiedValue(candidate, context), newValue)
-                && valuesEqual(command, getEffectiveValue(candidate, context), newValue)
-                && candidate != node[siblingPropName]) {
-
-            // "While candidate has children, insert the first child of
-            // candidate into candidate's parent immediately before candidate,
-            // preserving ranges."
-            moveChildrenPreservingRanges(candidate, candidate.parentNode, dom.getNodeIndex(candidate), false, rangesToPreserve);
-
-            // "Insert candidate into node's parent before node's
-            // previousSibling."
-            node.parentNode.insertBefore(candidate, node[siblingPropName]);
-
-            // "Append the nextSibling of candidate as the last child of
-            // candidate, preserving ranges."
-            movePreservingRanges(candidate.nextSibling, candidate, candidate.childNodes.length, rangesToPreserve);
-        }
-    }
-
-    function forceValue(node, newValue, context) {
-        var child, i, len, children, nodeType = node.nodeType;
-        var command = context.command, rangesToPreserve = context.rangesToPreserve, options = context.options;
-
-        // "If node's parent is null, abort this algorithm."
-        if (!node.parentNode) {
-            return;
-        }
-
-        // "If new value is null, abort this algorithm."
-        if (newValue === null) {
-            return;
-        }
-
-        // "If node is an Element, Text, Comment, or ProcessingInstruction node,
-        // and is not an unwrappable node:"
-        if (/^(1|3|4|7)$/.test("" + nodeType) && !isUnwrappable(node, options)) {
-		    // "Reorder modifiable descendants of node's previousSibling."
-            reorderModifiableDescendants(node, command, newValue, context, "previousSibling");
-
-    		// "Reorder modifiable descendants of node's nextSibling."
-            reorderModifiableDescendants(node, command, newValue, context, "nextSibling");
-
-            // "Wrap the one-node list consisting of node, with sibling criteria
-            // matching a simple modifiable element whose specified value and
-            // effective value for command are both new value, and with new parent
-            // instructions returning null."
-            wrap([node],
-                function(node) {
-                    return isSimpleModifiableElement(node, context)
-                        && valuesEqual(command, command.getSpecifiedValue(node, context), newValue)
-                        && valuesEqual(command, getEffectiveValue(node, context), newValue);
-                },
-                function() { return null; },
-                context
-            );
-        }
-
-        // "If the effective value of command is new value on node, abort this
-        // algorithm."
-        if (valuesEqual(command, getEffectiveValue(node, context), newValue)) {
-            return;
-        }
-
-        // "If node is an unwrappable node:"
-        if (isUnwrappable(node, options)) {
-            // "Let children be all children of node, omitting any that are
-            // Elements whose specified value for command is neither null nor
-            // equal to new value."
-            children = [];
-            for (i = 0, len = node.childNodes.length, specifiedValue; i < len; ++i) {
-                child = node.childNodes[i];
-                if (child.nodeType == 1) {
-                    specifiedValue = command.getSpecifiedValue(child, context);
-                    if (specifiedValue !== null && !valuesEqual(command, newValue, specifiedValue)) {
-                        continue;
-                    }
-                }
-                children.push(child);
-            }
-
-            // "Force the value of each Node in children, with command and new
-            // value as in this invocation of the algorithm."
-            for (i = 0; child = children[i++]; ) {
-                forceValue(child, newValue, context);
-            }
-
-            // "Abort this algorithm."
-            return;
-        }
-
-        // "If node is a Comment or ProcessingInstruction, abort this algorithm."
-        if (nodeType == 4 || nodeType == 7) {
-            return;
-        }
-
-        // "If the effective value of command is new value on node, abort this
-        // algorithm."
-        if (valuesEqual(command, getEffectiveValue(node, context), newValue)) {
-            return;
-        }
-
-        // "Let new parent be null."
-        var newParent = null;
-
-        // "If the CSS styling flag is false:"
-        if (!options.styleWithCss && command.createNonCssElement) {
-            newParent = command.createNonCssElement(node, newValue, context);
-        }
-
-        // "If new parent is null, let new parent be the result of calling
-        // createElement("span") on the ownerDocument of node."
-        if (!newParent) {
-            if (command.createCssElement) {
-                newParent = command.createCssElement(dom.getDocument(node), context);
-            } else {
-                newParent = dom.getDocument(node).createElement("span");
-            }
-        }
-
-        // "Insert new parent in node's parent before node."
-        node.parentNode.insertBefore(newParent, node);
-
-        // "If the effective value of command for new parent is not new value, and
-        // the relevant CSS property for command is not null, set that CSS property
-        // of new parent to new value (if the new value would be valid)."
-        var property = command.relevantCssProperty;
-        if (property !== null && !valuesEqual(command, getEffectiveValue(newParent, context), newValue)) {
-            newParent.style[property] = newValue;
-        }
-
-        // Perform additional styling (for commands such as strikethrough and underline)
-        if (command.styleCssElement) {
-            command.styleCssElement(newParent, newValue);
-        }
-
-        // "Append node to new parent as its last child, preserving ranges."
-        movePreservingRanges(node, newParent, newParent.childNodes.length, rangesToPreserve);
-
-        // "If node is an Element and the effective value of command for node is
-        // not new value:"
-        if (nodeType == 1 && !valuesEqual(command, getEffectiveValue(node, context), newValue)) {
-            // "Insert node into the parent of new parent before new parent,
-            // preserving ranges."
-            movePreservingRanges(node, newParent.parentNode, dom.getNodeIndex(newParent), rangesToPreserve);
-
-            // "Remove new parent from its parent."
-            newParent.parentNode.removeChild(newParent);
-
-            // "If new parent is a span, and either a) command is "underline" or
-            // "strikethrough", or b) command is "fontSize" and new value is not
-            // "xxx-large", or c) command is not "fontSize" and the relevant CSS
-            // property for command is not null:"
-            if (newParent.tagName.toLowerCase() == "span"
-                    && ((command.hasSpecialSpanStyling && command.hasSpecialSpanStyling(newValue))
-                    || property !== null)) {
-
-                // "If the relevant CSS property for command is not null, set that
-                // CSS property of node to new value."
-                if (property !== null) {
-                    node.style[property] = newValue;
-                }
-
-                if (command.styleSpanChildElement) {
-                    command.styleSpanChildElement(node, newValue);
-                }
-
-            // "Otherwise:"
-            } else {
-                // "Let children be all children of node, omitting any that are
-                // Elements whose specified value for command is neither null nor
-                // equal to new value."
-                children = [];
-                var specifiedValue;
-                for (i = 0, len = node.childNodes.length; i < len; ++i) {
-                    child = node.childNodes[i];
-                    if (child.nodeType == 1) {
-                        specifiedValue = command.getSpecifiedValue(child, context);
-
-                        if (specifiedValue !== null && !valuesEqual(command, newValue, specifiedValue)) {
-                            continue;
-                        }
-                    }
-                    children.push(child);
-                }
-
-                // "Force the value of each Node in children, with command and new
-                // value as in this invocation of the algorithm."
-                for (i = 0, len = children.length; i < len; ++i) {
-                    forceValue(children[i], newValue, context);
-                }
-            }
-        }
-    }
-
-    function pushDownValues(node, context) {
-        var command = context.command,
-            newValue = context.value,
-            options = context.options,
-            parent = node.parentNode;
-
-        // "If node's parent is not an Element, abort this algorithm."
-        if (!parent || parent.nodeType != 1) {
-            return;
-        }
-
-        // "If the effective value of command is new value on node, abort this
-        // algorithm."
-        if (valuesEqual(command, getEffectiveValue(node, context), newValue)) {
-            return;
-        }
-
-        // "Let current ancestor be node's parent."
-        var currentAncestor = parent;
-
-        // "Let ancestor list be a list of Nodes, initially empty."
-        var ancestorList = [];
-
-        // "While current ancestor is an editable Element and the effective value
-        // of command is not new value on it, append current ancestor to ancestor
-        // list, then set current ancestor to its parent."
-        while (isEditable(currentAncestor, options) && currentAncestor.nodeType == 1
-                && !valuesEqual(command, getEffectiveValue(currentAncestor, context), newValue)) {
-            ancestorList.push(currentAncestor);
-            currentAncestor = currentAncestor.parentNode;
-        }
-
-        // "If ancestor list is empty, abort this algorithm."
-        if (ancestorList.length == 0) {
-            return;
-        }
-
-        // "Let propagated value be the specified value of command on the last
-        // member of ancestor list."
-        var lastAncestor = ancestorList[ancestorList.length - 1],
-            propagatedValue = command.getSpecifiedValue(lastAncestor, context);
-
-        // "If propagated value is null and is not equal to new value, abort this
-        // algorithm."
-        if (propagatedValue === null && propagatedValue != newValue) {
-            return;
-        }
-
-        // "If the effective value of command is not new value on the parent of
-        // the last member of ancestor list, and new value is not null, abort this
-        // algorithm."
-        if (newValue !== null && !valuesEqual(command, getEffectiveValue(lastAncestor.parentNode, context), newValue)) {
-            return;
-        }
-
-        // "While ancestor list is not empty:"
-        while (ancestorList.length) {
-            // "Let current ancestor be the last member of ancestor list."
-            // "Remove the last member from ancestor list."
-            currentAncestor = ancestorList.pop();
-
-            // "If the specified value of current ancestor for command is not null,
-            // set propagated value to that value."
-            if (command.getSpecifiedValue(currentAncestor, context) !== null) {
-                propagatedValue = command.getSpecifiedValue(currentAncestor, context);
-            }
-
-            // "Let children be the children of current ancestor."
-            var children = toArray(currentAncestor.childNodes);
-
-            // "If the specified value of current ancestor for command is not null,
-            // clear the value of current ancestor."
-            if (command.getSpecifiedValue(currentAncestor, context) !== null) {
-                clearValue(currentAncestor, context);
-            }
-
-            // "For every child in children:"
-            for (var i = 0, child; child = children[i++]; ) {
-                // "If child is node, continue with the next child."
-                if (child == node) {
-                    continue;
-                }
-
-                // "If child is an Element whose specified value for command
-                // is neither null nor equal to propagated value, continue with the
-                // next child."
-                if (child.nodeType == 1
-                        && command.getSpecifiedValue(child, context) !== null
-                        && !valuesEqual(command, propagatedValue, command.getSpecifiedValue(child, context))) {
-                    continue;
-                }
-
-                // "If child is the last member of ancestor list, continue with the
-                // next child."
-                if (child == lastAncestor) {
-                    continue;
-                }
-
-                // "Force the value of child, with command as in this algorithm
-                // and new value equal to propagated value."
-                forceValue(child, propagatedValue, context);
-            }
-        }
-    }
-
-    function setChildrenNodeValue(node, context) {
-        var children = toArray(node.childNodes);
-        for (var i = 0, len = children.length; i < len; ++i) {
-            setNodeValue(children[i], context);
-        }
-    }
-
-    function outerHtml(node) {
-        if (node === null) {
-            return "null";
-        } else if (node.nodeType == 3) {
-            return node.data;
-        } else {
-            var div = dom.getDocument(node).createElement("div");
-            div.appendChild(node.cloneNode(true));
-            return div.innerHTML;
-        }
-    }
-
-    function getRangeContainerHtml(range) {
-        return outerHtml(range.commonAncestorContainer);
-    }
-
-    function setNodeValue(node, context) {
-        var i, len, child, nodeType = node.nodeType;
-
-        // "If node is a Document, set the value of its Element child (if it has
-        // one) and abort this algorithm."
-        if (nodeType == 9) {
-            for (i = 0; i < node.childNodes.length; ++i) {
-                child = node.childNodes[i];
-                if (child.nodeType == 1) {
-                    setNodeValue(child, context);
-                    break;
-                }
-            }
-            return;
-        }
-
-        // "If node is a DocumentFragment, let children be a list of its children.
-        // Set the value of each member of children, then abort this algorithm."
-        if (nodeType == 11) {
-            setChildrenNodeValue(node, context);
-            return;
-        }
-
-        // "If node's parent is null, or if node is a DocumentType, abort this
-        // algorithm."
-        if (!node.parentNode || nodeType == 10) {
-            return;
-        }
-
-        // If node is a ignorable text node, abort
-        if (isIgnoredNode(node, context.options)) {
-            return;
-        }
-
-        // "If node is not editable, let children be the children of node. Set the value of each member of children.
-        // Abort this algorithm."
-        if (!isEditable(node, context.options)) {
-            setChildrenNodeValue(node, context);
-            return;
-        }
-
-        // "If node is an Element:"
-        if (nodeType == 1) {
-            // "Clear the value of node, and let new nodes be the result."
-            var newNodes = clearValue(node, context);
-
-            // "For each new node in new nodes, set the value of new node, with the
-            // same inputs as this invocation of the algorithm."
-            for (i = 0, len = newNodes.length; i < len; ++i) {
-                setNodeValue(newNodes[i], context);
-            }
-
-            // "If node's parent is null, abort this algorithm."
-            if (!node.parentNode) {
-                return;
-            }
-        }
-
-        // "Push down values on node."
-        pushDownValues(node, context);
-
-        // "Force the value of node."
-        forceValue(node, context.value, context);
-
-        // "Let children be the children of node. Set the value of each member of children."
-        setChildrenNodeValue(node, context);
-    }
-
-    // TODO: Add something about whitespace text nodes (option?)
-    function getEffectiveTextNodes(range, context) {
-        return range.getNodes([3], function(node) {
-            return isEffectivelyContained(node, range) && !isIgnoredNode(node, context.options);
-        });
-    }
-
-    function Command() {}
-
-    Command.prototype = {
-        relevantCssProperty: null,
-
-        getSpecifiedValue: function() {
-            //throw new module.createError("Command '" + this.name + "' does not implement getSpecifiedValue()");
-            return null;
-        },
-
-        clearValue: function(/*element*/) {},
-
-        getEffectiveValue: function(element, context) {
-            return getComputedStyleProperty(element, this.relevantCssProperty);
-        },
-
-        createCssElement: null,
-
-        createNonCssElement: null,
-
-        styleCssElement: null,
-
-        hasSpecialSpanStyling: null,
-
-        styleSpanChildElement: null,
-
-        isSimpleModifiableElement: null,
-
-        defaultOptions: null,
-
-        addDefaultOptions: null,
-
-        valuesEqual: function(val1, val2) {
-            return val1 === val2;
-        },
-
-        createContext: function(value, rangesToPreserve, options) {
-            var defaultOptions = this.defaultOptions;
-            if (defaultOptions) {
-                for (var i in defaultOptions) {
-                    if (defaultOptions.hasOwnProperty(i) && !options.hasOwnProperty(i)) {
-                        options[i] = defaultOptions[i];
-                    }
-                }
-            }
-            return {
-                command: this,
-                value: value,
-                rangesToPreserve: rangesToPreserve || [],
-                options: options || {}
-            };
-        },
-
-        getSelectionValue: function(/*sel, context*/) {
-            return null;
-        },
-
-        getNewRangeValue: function(/*range, context*/) {
-            return null;
-        },
-
-        getNewSelectionValue: function(/*sel, context*/) {
-            return null;
-        },
-
-        applyToRange: function(doc, value, options, range) {
-            var context = this.createContext(value, [range], options);
-            context.value = this.getNewRangeValue(range, context);
-            this.applyValueToRange(range, context);
-        },
-
-        applyToSelection: function(doc, value, options) {
-            var win = dom.getWindow(doc);
-            var sel = api.getSelection(win);
-            var selRanges = sel.getAllRanges();
-            var context = this.createContext(value, selRanges, options);
-            context.value = this.getNewSelectionValue(sel, context);
-
-            for (var i = 0, len = selRanges.length; i < len; ++i) {
-                this.applyValueToRange(selRanges[i], context);
-            }
-
-            sel.setRanges(selRanges);
-        }
-    };
-
-    Command.util = {
-        getComputedStyleProperty: getComputedStyleProperty,
-        getFurthestAncestor: getFurthestAncestor,
-        isContained: isContained,
-        isEffectivelyContained: isEffectivelyContained,
-        isHtmlNode: isHtmlNode,
-        isHtmlElement: isHtmlElement,
-        isInlineNode: isInlineNode,
-        isUnwrappable: isUnwrappable,
-        blockExtend: blockExtend,
-        isModifiableElement: isModifiableElement,
-        isSimpleModifiableElement: isSimpleModifiableElement,
-        moveChildrenPreservingRanges: moveChildrenPreservingRanges,
-        replaceWithOwnChildren: replaceWithOwnChildren,
-        copyAttributes: copyAttributes,
-        getEffectiveValue: getEffectiveValue,
-        getEffectiveTextNodes: getEffectiveTextNodes,
-        setNodeValue: setNodeValue,
-        wrap: wrap,
-        decomposeRange: decomposeRange,
-
-        setGlobalOption: function(name, value) {
-            globalOptions[name] = value;
-        }
-    };
-
-    Command.create = function(commandConstructor, properties) {
-        var proto = new Command();
-        commandConstructor.prototype = proto;
-
-        if (typeof properties == "object") {
-            for (var i in properties) {
-                if (properties.hasOwnProperty(i)) {
-                    proto[i] = properties[i];
-                }
-            }
-        }
-    };
-
-    var commandsByName = {};
-
-    api.registerCommand = function(name, command) {
-        if (!(command instanceof Command)) {
-            throw module.createError("registerCommand(): Object supplied is not a Command");
-        }
-        commandsByName[name.toLowerCase()] = command;
-    };
-
-    function getCommand(name) {
-        var lowerName = name.toLowerCase();
-        if (commandsByName.hasOwnProperty(lowerName)) {
-            return commandsByName[lowerName];
-        } else {
-            throw module.createError("getCommand(): No command registered with the name '" + name + "'");
-        }
-    }
-
-    api.execCommand = function(name, options, range) {
-        options = options || {};
-        var doc = options.hasOwnProperty("document") ? options.document : document;
-        var value = options.hasOwnProperty("value") ? options.value : null;
-        var command = getCommand(name);
-        if (range) {
-            command.applyToRange(doc, value, options, range);
-        } else {
-            command.applyToSelection(doc, value, options);
-        }
-    };
-
-    api.queryCommandValue = function(name, options, range) {
-        options = options || {};
-        var win = options.hasOwnProperty("document") ? dom.getWindow(options.document) : window;
-        var value = options.hasOwnProperty("value") ? options.value : null;
-        var command = getCommand(name);
-        var sel = api.getSelection(win);
-        var context = command.createContext(value, null, options);
-
-        return command.getSelectionValue(sel, context);
-    };
-
-    api.getCommand = getCommand;
-    api.Command = Command;
-
+/**
+ * Commands module for Rangy.
+ * Provides replacements for many document.execCommand() commands, applicable to Ranges and Selections.
+ *
+ * Part of Rangy, a cross-browser JavaScript range and selection library
+ * http://code.google.com/p/rangy/
+ *
+ * Depends on Rangy core.
+ *
+ * Algorithm is based on Aryeh Gregor's HTML Editing Commands specification
+ * http://aryeh.name/gitweb.cgi?p=editcommands;a=blob_plain;f=editcommands.html;hb=HEAD
+ *
+ * Parts of this code are based on Aryeh Gregor's implementation of his algorithm
+ * http://aryeh.name/spec/editcommands/autoimplementation.html
+ *
+ * Copyright %%build:year%%, Tim Down
+ * Licensed under the MIT license.
+ * Version: %%build:version%%
+ * Build date: %%build:date%%
+ */
+rangy.createModule("Commands", ["WrappedSelection"], function(api, module) {
+    /*
+    http://aryeh.name/spec/editcommands/autoimplementation.html
+    https://bitbucket.org/ms2ger/dom-range/src/tip/test/
+    http://aryeh.name/gitweb.cgi?p=editcommands;a=blob_plain;f=editcommands.html;hb=HEAD
+     */
+
+    var dom = api.dom;
+    var log = log4javascript.getLogger("rangy.commands");
+    var BOOLEAN = "boolean", UNDEF = "undefined";
+    var getRootContainer = dom.getRootContainer;
+
+    var globalOptions = {
+        applyToEditableOnly: false
+    };
+
+    var getComputedStyleProperty;
+
+    if (typeof window.getComputedStyle != UNDEF) {
+        getComputedStyleProperty = function(el, propName) {
+            return dom.getWindow(el).getComputedStyle(el, null)[propName];
+        };
+    } else if (typeof document.documentElement.currentStyle != UNDEF) {
+        getComputedStyleProperty = function(el, propName) {
+            return el.currentStyle[propName];
+        };
+    } else {
+        module.fail("No means of obtaining computed style properties found");
+    }
+
+    function isBefore(nodeA, nodeB) {
+        var parentA = nodeA.parentNode, parentB = nodeB.parentNode;
+        if (parentA && parentB) {
+            return dom.comparePoints(nodeA.parentNode, dom.getNodeIndex(nodeA), nodeB.parentNode, dom.getNodeIndex(nodeB)) == -1;
+        } else {
+            return !parentA;
+        }
+    }
+
+    var toArray = util.toArray;
+
+    /**
+     * Returns the furthest ancestor of a Node as defined by DOM Range.
+     */
+    function getFurthestAncestor(node) {
+        var root = node;
+        while (root.parentNode != null) {
+            root = root.parentNode;
+        }
+        return root;
+    }
+
+    function isEditableElement(node) {
+        return node && node.nodeType == 1 && node.isContentEditable;
+    }
+
+    // The spec says "An editing host is a node that is either an Element with a contenteditable
+    // attribute set to the true state, or a Document whose designMode is enabled."
+    // Because Safari returns "true" for the contentEditable property of an element that actually inherits its
+    // editability from its parent, we use a different definition:
+
+    // "An editing host is a node that is either an Element whose isContentEditable property returns true but whose
+    // parent node is not an element or whose isContentEditable property returns false, or a Document whose designMode
+    // is enabled."
+    function isEditingHost(node) {
+        return node &&
+            ((node.nodeType == 9 && node.designMode == "on") ||
+            (isEditableElement(node) && !isEditableElement(node.parentNode)));
+    }
+
+    // The spec says "Something is editable if it is a node which is not an editing host, does
+    // not have a contenteditable attribute set to the false state, and whose
+    // parent is an editing host or editable."
+
+    // We're not making any distinction, unless the applyToEditableOnly global option is set to true. Rangy commands can
+    // run on non-editable content. The revised definition:
+
+    // "A node is editable if it is not an editing host and is or is the child of an Element whose isContentEditable
+    // property returns true."
+    function isEditable(node, options) {
+        // This is slightly a lie, because we're excluding non-HTML elements with
+        // contentEditable attributes.
+        return !options || !options.applyToEditableOnly
+            || ( (isEditableElement(node) || isEditableElement(node.parentNode)) && !isEditingHost(node) );
+    }
+
+    /**
+     * "contained" as defined by DOM Range: "A Node node is contained in a range
+     * range if node's furthest ancestor is the same as range's root, and (node, 0)
+     * is after range's start, and (node, length of node) is before range's end."
+     */
+    function isContained(node, range) {
+        var pos1 = dom.comparePoints(node, 0, range.startContainer, range.startOffset);
+        var pos2 = dom.comparePoints(node, dom.getNodeLength(node), range.endContainer, range.endOffset);
+
+        return getRootContainer(node) == getRootContainer(range.startContainer)
+            && pos1 == 1
+            && pos2 == -1;
+    }
+
+    /**
+     * "A Node is effectively contained in a Range if either it is contained in the
+     * Range; or it is the Range's start node, it is a Text node, and its length is
+     * different from the Range's start offset; or it is the Range's end node, it
+     * is a Text node, and the Range's end offset is not 0; or it has at least one
+     * child, and all its children are effectively contained in the Range."
+     */
+    function isEffectivelyContained(node, range) {
+        if (isContained(node, range)) {
+            return true;
+        }
+        var isCharData = dom.isCharacterDataNode(node);
+        if (node == range.startContainer && isCharData && dom.getNodeLength(node) != range.startOffset) {
+            return true;
+        }
+        if (node == range.endContainer && isCharData && range.endOffset != 0) {
+            return true;
+        }
+        var children = node.childNodes, childCount = children.length;
+        if (childCount != 0) {
+            for (var i = 0; i < childCount; ++i) {
+                if (!isEffectivelyContained(children[i], range)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+
+    // Opera 11 puts HTML elements in the null namespace, it seems, and IE 7 has undefined namespaceURI
+    function isHtmlNode(node) {
+        var ns;
+        return typeof (ns = node.namespaceURI) == UNDEF || (ns === null || ns == "http://www.w3.org/1999/xhtml");
+    }
+
+
+    var unwrappableTagNamesRegex = /^(h[1-6]|p|hr|pre|blockquote|ol|ul|li|dl|dt|dd|div|table|caption|colgroup|col|tbody|thead|tfoot|tr|th|td|address)$/i;
+    var inlineDisplayRegex = /^inline(-block|-table)?$/i;
+
+    /**
+     * "An inline node is either a Text node, or an Element whose 'display'
+     * property computes to 'inline', 'inline-block', or 'inline-table'."
+     */
+    function isInlineNode(node) {
+        return dom.isCharacterDataNode(node) ||
+                (node.nodeType == 1 && inlineDisplayRegex.test(getComputedStyleProperty(node, "display")));
+    }
+
+    function isNullOrInlineNode(node) {
+        return !node || isInlineNode(node);
+    }
+
+    function isNonBrInlineNode(node) {
+        return isInlineNode(node) && node.nodeName.toLowerCase() != "br";
+    }
+
+    function isHtmlElement(node, tagNames) {
+        if (!node || node.nodeType != 1 || !isHtmlNode(node)) {
+            return false;
+        }
+        switch (typeof tagNames) {
+            case "string":
+                return node.tagName.toLowerCase() == tagNames.toLowerCase();
+            case "object":
+                return new RegExp("^(" + tagNames.join(",") + ")$", "i").test(node.tagName);
+            default:
+                return true;
+        }
+    }
+
+    /**
+     * "An unwrappable node is an HTML element which may not be used where only
+     * phrasing content is expected (not counting unknown or obsolete elements,
+     * which cannot be used at all); or any Element whose display property computes
+     * to something other than 'inline', 'inline-block', or 'inline-table'; or any
+     * node whose parent is not editable."
+     */
+    function isUnwrappable(node, options) {
+        if (!isHtmlElement(node)) {
+            return false;
+        }
+
+        if (!isInlineNode(node)) {
+            return true;
+        }
+
+        if (!isEditable(node, options)) {
+            return true;
+        }
+
+/*
+        if (node.nodeType == 3 && options.ignoreWhiteSpace && !/[^\r\n\t ]/.test(node.data)
+                && (isUnwrappable(node.previousSibling, options) || isUnwrappable(node.nextSibling, options))) {
+            return true;
+        }
+*/
+
+        return unwrappableTagNamesRegex.test(node.tagName);
+    }
+
+
+/*
+    function isWhitespaceNode(node) {
+        return node.nodeType == 3 && !/[^\r\n\t ]/.test(node.data);
+    }
+*/
+
+    function isIgnoredNode(node, options) {
+        // Ignore comment nodes
+        if (node.nodeType == 8) {
+            return true;
+        } else if (node.nodeType == 3) {
+            // Ignore text nodes that are within <script> and <style> elements
+            if (node.parentNode && /^(script|style)$/i.test(node.parentNode.tagName)) {
+                //log.fatal("IGNORED NODE " + dom.inspectNode(node));
+                return true;
+            }
+
+            // Ignore whitespace nodes that are next to an unwrappable element
+            if (options.ignoreWhiteSpace && !/[^\r\n\t ]/.test(node.data)
+                    && (isUnwrappable(node.previousSibling, options) || isUnwrappable(node.nextSibling, options))) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    function blockExtend(range) {
+        // "Let start node, start offset, end node, and end offset be the start
+        // and end nodes and offsets of the range."
+        var startNode = range.startContainer,
+            startOffset = range.startOffset,
+            endNode = range.endContainer,
+            endOffset = range.endOffset,
+            startChildNode,
+            endChildNode;
+
+        // "Repeat the following steps:"
+        while (true) {
+            // "If start node is a Text or Comment node or start offset is 0,
+            // set start offset to the index of start node and then set start
+            // node to its parent."
+            if (dom.isCharacterDataNode(startNode) || startOffset == 0) {
+                startOffset = dom.getNodeIndex(startNode);
+                startNode = startNode.parentNode;
+
+            // "Otherwise, if start offset is equal to the length of start
+            // node, set start offset to one plus the index of start node and
+            // then set start node to its parent."
+            } else if (startOffset == dom.getNodeLength(startNode)) {
+                startOffset = 1 + dom.getNodeIndex(startNode);
+                startNode = startNode.parentNode;
+
+            // "Otherwise, if the child of start node with index start offset and
+            // its previousSibling are both inline nodes and neither is a br,
+            // subtract one from start offset."
+            } else if ( (startChildNode = startNode.childNodes[startOffset])
+                    && isNonBrInlineNode(startChildNode)
+                    && isNonBrInlineNode(startChildNode.previousSibling)) {
+
+                startOffset--;
+
+            // "Otherwise, break from this loop."
+            } else {
+                break;
+            }
+        }
+
+        // "Repeat the following steps:"
+        while (true) {
+            // "If end offset is 0, set end offset to the index of end node and
+            // then set end node to its parent."
+            if (endOffset == 0) {
+                endOffset = dom.getNodeIndex(endNode);
+                endNode = endNode.parentNode;
+
+            // "Otherwise, if end node is a Text or Comment node or end offset
+            // is equal to the length of end node, set end offset to one plus
+            // the index of end node and then set end node to its parent."
+            } else if (dom.isCharacterDataNode(endNode) || endOffset == dom.getNodeLength(endNode)) {
+                endOffset = 1 + dom.getNodeIndex(endNode);
+                endNode = endNode.parentNode;
+
+            // "Otherwise, if the child of end node with index end offset and its
+            // nextSibling are both inline nodes and neither is a br, add one
+            // to end offset."
+            } else if ( (endChildNode = endNode.childNodes[endOffset])
+                    && isNonBrInlineNode(endChildNode)
+                    && isNonBrInlineNode(endChildNode.previousSibling)) {
+
+                endOffset++;
+
+            // "Otherwise, break from this loop."
+            } else {
+                break;
+            }
+        }
+
+        // "Let new range be a new range whose start and end nodes and offsets
+        // are start node, start offset, end node, and end offset."
+        var newRange = range.cloneRange();
+        newRange.setStart(startNode, startOffset);
+        newRange.setEnd(endNode, endOffset);
+
+        // "Return new range."
+        return newRange;
+    }
+
+    function elementOnlyHasAttributes(el, attrs) {
+        log.debug("elementOnlyHasAttributes. attr length: " + el.attributes.length);
+        for (var i = 0, len = el.attributes.length, attrName; i < len; ++i) {
+            attrName = el.attributes[i].name;
+            //log.info("name: " + attrName + ", specified: " + el.attributes[i].specified);
+            if (el.attributes[i].specified && (!attrs || !dom.arrayContains(attrs, attrName))) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    // "A modifiable element is a b, em, i, s, span, strong, sub, sup, or u element
+    // with no attributes except possibly style; or a font element with no
+    // attributes except possibly style, color, face, and/or size; or an a element
+    // with no attributes except possibly style and/or href."
+    var modifiableElements = "b|em|i|s|span|strike|strong|sub|sup|u";
+    var modifiableElementRegex = new RegExp("^(" + modifiableElements + ")$");
+
+    function isModifiableElement(node, context) {
+        //log.info("isModifiableElement nodeType " + node.nodeType + ", isHtmlNode " + isHtmlNode(node));
+        if (!isHtmlElement(node)) {
+            return false;
+        }
+        if (context && context.command.isModifiableElement) {
+            return context.command.isModifiableElement(el, context);
+        }
+        var tagName = node.tagName.toLowerCase(), allowedAttributes;
+
+        if (modifiableElementRegex.test(tagName)) {
+            allowedAttributes = ["style", "class"];
+        } else if (tagName == "a") {
+            allowedAttributes = ["style", "class", "href"];
+        } else if (tagName == "font") {
+            allowedAttributes = ["style", "class", "color", "face", "size"];
+        } else {
+            return false;
+        }
+        return elementOnlyHasAttributes(node, allowedAttributes);
+    }
+
+    var simpleModifiableElements = modifiableElements + "|a|font";
+    var simpleModifiableElementRegex = new RegExp("^(" + simpleModifiableElements + ")$");
+
+    function isSimpleModifiableElement(el, context) {
+        // "A simple modifiable element is an HTML element for which at least one
+        // of the following holds:"
+        if (!isHtmlElement(el)) {
+            return false;
+        }
+
+        if (context && context.command.isSimpleModifiableElement) {
+            return context.command.isSimpleModifiableElement(el, context);
+        }
+
+        // Only these elements can possibly be a simple modifiable element.
+        var tagName = el.tagName.toLowerCase();
+        if (!simpleModifiableElementRegex.test(tagName)) {
+            return false;
+        }
+
+        // Extract attributes once and quit if more than one is found
+        var attrName, attrValue, hasAnyAttrs = false;
+        for (var i = 0, len = el.attributes.length; i < len; ++i) {
+            //log.info("attr specified: " + el.attributes[i].specified + ", name " + el.attributes[i].name);
+            if (el.attributes[i].specified) {
+                // If it's got more than one attribute, everything after this fails.
+                if (hasAnyAttrs) {
+                    return false;
+                } else {
+                    attrName = el.attributes[i].name;
+                    attrValue = el.getAttribute(attrName);
+                    hasAnyAttrs = true;
+                }
+            }
+        }
+
+        // "It is an a, b, em, font, i, s, span, strike, strong, sub, sup, or u
+        // element with no attributes."
+        if (!hasAnyAttrs) {
+            return true;
+        }
+
+        // "It is an a, b, em, font, i, s, span, strike, strong, sub, sup, or u
+        // element with exactly one attribute, which is style, which sets no CSS
+        // properties (including invalid or unrecognized properties)."
+        if (attrName == "style" && el.style.cssText.length == 0) {
+            return true;
+        }
+
+        // "It is an a element with exactly one attribute, which is href."
+        if (tagName == "a" && attrName == "href") {
+            return true;
+        }
+
+        // "It is a font element with exactly one attribute, which is either color,
+        // face, or size."
+        if (tagName == "font" && /^(color|face|size)$/.test(attrName)) {
+            return true;
+        }
+
+        // Check style attribute and bail out if it has more than one property
+        if ( attrName != "style" || (typeof el.style.length == "number" && el.style.length > 1) ||
+                !/^[a-z\-]+:[^;]+;?\s?$/i.test(el.style.cssText)) {
+            return false;
+        }
+
+        // "It is a b or strong element with exactly one attribute, which is style,
+        // and the style attribute sets exactly one CSS property (including invalid
+        // or unrecognized properties), which is "font-weight"."
+
+        if ((tagName == "b" || tagName == "strong") && el.style.fontWeight != "") {
+            return true;
+        }
+
+        // "It is an i or em element with exactly one attribute, which is style,
+        // and the style attribute sets exactly one CSS property (including invalid
+        // or unrecognized properties), which is "font-style"."
+        if ((tagName == "i" || tagName == "em") && el.style.fontStyle != "") {
+            return true;
+        }
+
+        // "It is a sub or sub element with exactly one attribute, which is style,
+        // and the style attribute sets exactly one CSS property (including invalid
+        // or unrecognized properties), which is "vertical-align"."
+        if ((tagName == "sub" || tagName == "sup") && el.style.verticalAlign != "") {
+            return true;
+        }
+
+        // "It is an a, font, or span element with exactly one attribute, which is
+        // style, and the style attribute sets exactly one CSS property (including
+        // invalid or unrecognized properties), and that property is not
+        // "text-decoration"."
+        if ((tagName == "a" || tagName == "font" || tagName == "span") && el.style.textDecoration == "") {
+            return true;
+        }
+
+        // "It is an a, font, s, span, strike, or u element with exactly one
+        // attribute, which is style, and the style attribute sets exactly one CSS
+        // property (including invalid or unrecognized properties), which is
+        // "text-decoration", which is set to "line-through" or "underline" or
+        // "overline" or "none"."
+        if (/^(a|font|s|span|strike|u)$/.test(tagName) && /^(line-through|underline|overline|none)$/.test(el.style.textDecoration)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    function addRangeMove(rangeMoves, range, oldParent, oldIndex, newParent, newIndex) {
+        var sc = range.startContainer, so = range.startOffset,
+            ec = range.endContainer, eo = range.endOffset;
+
+        var newSc = sc, newSo = so, newEc = ec, newEo = eo;
+
+        // "If a boundary point's node is the same as or a descendant of node,
+        // leave it unchanged, so it moves to the new location."
+        //
+        // No modifications necessary.
+
+        // "If a boundary point's node is new parent and its offset is greater than
+        // new index, add one to its offset."
+        if (sc == newParent && so > newIndex) {
+            newSo++;
+        }
+        if (ec == newParent && eo > newIndex) {
+            newEo++;
+        }
+
+        // "If a boundary point's node is old parent and its offset is old index or
+        // old index + 1, set its node to new parent and add new index  old index
+        // to its offset."
+        if (sc == oldParent && (so == oldIndex  || so == oldIndex + 1)) {
+            newSc = newParent;
+            newSo += newIndex - oldIndex;
+        }
+        if (ec == oldParent && (eo == oldIndex || eo == oldIndex + 1)) {
+            newEc = newParent;
+            newEo += newIndex - oldIndex;
+        }
+
+        // "If a boundary point's node is old parent and its offset is greater than
+        // old index + 1, subtract one from its offset."
+        if (sc == oldParent && so > oldIndex + 1) {
+            newSo--;
+        }
+        if (ec == oldParent && eo > oldIndex + 1) {
+            newEo--;
+        }
+
+        if (newSc == sc && newSo == so && newEc == ec && newEo == eo) {
+            rangeMoves.push([range, newSc, newSo, newEc, newEo]);
+        }
+    }
+
+    function movePreservingRanges(node, newParent, newIndex, rangesToPreserve) {
+        // For convenience, allow newIndex to be -1 to mean "insert at the end".
+        if (newIndex == -1) {
+            newIndex = newParent.childNodes.length;
+        }
+
+        // "When the user agent is to move a Node to a new location, preserving
+        // ranges, it must remove the Node from its original parent (if any), then insert it
+        // in the new location. In doing so, however, it must ignore the regular
+        // range mutation rules, and instead follow these rules:"
+
+        // "Let node be the moved Node, old parent and old index be the old parent
+        // and index, and new parent and new index be the new parent and index."
+        var oldParent = node.parentNode;
+        var oldIndex = dom.getNodeIndex(node);
+
+        var rangeMoves = [];
+
+        for (var i = 0, len = rangesToPreserve.length; i < len; ++i) {
+            addRangeMove(rangeMoves, rangesToPreserve[i], oldParent, oldIndex, newParent, newIndex);
+        }
+
+        // Now actually move the node.
+        if (newParent.childNodes.length == newIndex) {
+            newParent.appendChild(node);
+        } else {
+            newParent.insertBefore(node, newParent.childNodes[newIndex]);
+        }
+
+        // Set the new range boundaries
+        log.debug("Node move: ", dom.inspectNode(node), "to", dom.inspectNode(newParent), newIndex);
+        for (var j = 0, rangeMove; rangeMove = rangeMoves[j++]; ) {
+            log.debug("Moving " + rangeMove[0].inspect(), dom.inspectNode(rangeMove[1]), rangeMove[2], dom.inspectNode(rangeMove[3]), rangeMove[4]);
+            rangeMove[0].setStart(rangeMove[1], rangeMove[2]);
+            rangeMove[0].setEnd(rangeMove[3], rangeMove[4]);
+        }
+    }
+
+    function decomposeSubtree(rangeIterator, nodes) {
+        nodes = nodes || [];
+        for (var node, subRangeIterator; node = rangeIterator.next(); ) {
+            if (rangeIterator.isPartiallySelectedSubtree()) {
+                // The node is partially selected by the Range, so we can use a new RangeIterator on the portion of the
+                // node selected by the Range.
+                subRangeIterator = rangeIterator.getSubtreeIterator();
+                decomposeSubtree(subRangeIterator, nodes);
+                subRangeIterator.detach();
+            } else {
+                nodes.push(node);
+            }
+        }
+        return nodes;
+    }
+
+    function decomposeRange(range, rangesToPreserve) {
+        // "If range's start and end are the same, return an empty list."
+        if (range.startContainer == range.endContainer && range.startOffset == range.endOffset) {
+            return [];
+        }
+
+        range.splitBoundaries(rangesToPreserve);
+
+        // "Let cloned range be the result of calling cloneRange() on range."
+        var clonedRange = range.cloneRange();
+
+        // "While the start offset of cloned range is 0, and the parent of cloned
+        // range's start node is not null, set the start of cloned range to (parent
+        // of start node, index of start node)."
+        while (clonedRange.startOffset == 0 && clonedRange.startContainer.parentNode) {
+            clonedRange.setStart(clonedRange.startContainer.parentNode, dom.getNodeIndex(clonedRange.startContainer));
+        }
+
+        // "While the end offset of cloned range equals the length of its end node,
+        // and the parent of clone range's end node is not null, set the end of
+        // cloned range to (parent of end node, 1 + index of end node)."
+        while (clonedRange.endOffset == dom.getNodeLength(clonedRange.endContainer) && clonedRange.endContainer.parentNode) {
+            clonedRange.setEnd(clonedRange.endContainer.parentNode, 1 + dom.getNodeIndex(clonedRange.endContainer));
+        }
+
+        // "Return a list consisting of every Node contained in cloned range in
+        // tree order, omitting any whose parent is also contained in cloned
+        // range."
+
+        var iterator = new rangy.DomRange.RangeIterator(clonedRange, false);
+        var nodes = decomposeSubtree(iterator);
+        iterator.detach();
+        return nodes;
+    }
+
+    function moveChildrenPreservingRanges(node, newParent, newIndex, removeNode, rangesToPreserve) {
+        var child, children = [];
+        while ( (child = node.firstChild) ) {
+            movePreservingRanges(child, newParent, newIndex++, rangesToPreserve);
+            children.push(child);
+        }
+        if (removeNode) {
+            node.parentNode.removeChild(node);
+        }
+        return children;
+    }
+
+    function replaceWithOwnChildren(element, rangesToPreserve) {
+        return moveChildrenPreservingRanges(element, element.parentNode, dom.getNodeIndex(element), true, rangesToPreserve);
+    }
+
+    function copyAttributes(fromElement, toElement) {
+        var attrs = fromElement.attributes;
+
+        for (var i = 0, len = attrs.length; i < len; ++i) {
+            if (attrs[i].specified) {
+                // For IE, which doesn't allow copying of the entire style object using get/setAttribute
+                if (attrs[i].name == "style") {
+                    toElement.style.cssText = toElement.style.cssText;
+                } else {
+                    toElement.setAttribute(attrs[i].name, attrs[i].value);
+                }
+            }
+        }
+    }
+
+    function clearValue(element, context) {
+        var command = context.command, rangesToPreserve = context.rangesToPreserve;
+
+        // "If element's specified value for command is null, return the empty
+        // list."
+        if (command.getSpecifiedValue(element, context) === null) {
+            return [];
+        }
+
+        // "If element is a simple modifiable element:"
+        if (isSimpleModifiableElement(element, context)) {
+            var p = element.parentNode;
+            return replaceWithOwnChildren(element, rangesToPreserve);
+        }
+
+        // Command-specific special cases
+        if (command.clearValue) {
+            command.clearValue(element, context);
+        }
+
+        // "If the relevant CSS property for command is not null, unset the CSS
+        // property property of element."
+        if (command.relevantCssProperty !== null) {
+            element.style[command.relevantCssProperty] = "";
+            if (element.style.cssText == "") {
+                element.removeAttribute("style");
+            }
+        }
+
+        // "If element's specified value for command is null, return the empty
+        // list."
+        if (command.getSpecifiedValue(element, context) === null) {
+            return [];
+        }
+
+        // "Let new element be a new HTML element with name "span", with the
+        // same attributes and ownerDocument as element."
+        var newElement = dom.getDocument(element).createElement("span");
+        copyAttributes(element, newElement);
+
+        // "Insert new element into the parent of element immediately before it."
+        element.parentNode.insertBefore(newElement, element);
+
+        // "While element has children, append its first child as the last child of
+        // new element, preserving ranges."
+        // "Remove element from its parent."
+        moveChildrenPreservingRanges(element, newElement, 0, true, rangesToPreserve);
+
+        // "Return the one-Node list consisting of new element."
+        return [newElement];
+    }
+
+    // This entire function is a massive hack to work around browser
+    // incompatibility.  It wouldn't work in real life, but it's good enough for a
+    // test implementation.  It's not clear how all this should actually be specced
+    // in practice, since CSS defines no notion of equality, does it?
+    function valuesEqual(command, val1, val2) {
+        if (val1 === null || val2 === null) {
+            return val1 === val2;
+        }
+
+        return command.valuesEqual(val1, val2);
+    }
+
+    /**
+     * "effective value" per edit command spec
+     */
+    function getEffectiveValue(node, context) {
+        var isElement = (node.nodeType == 1);
+
+        // "If neither node nor its parent is an Element, return null."
+        if (!isElement && (!node.parentNode || node.parentNode.nodeType != 1)) {
+            return null;
+        }
+
+        // "If node is not an Element, return the effective value of its parent for
+        // command."
+        if (!isElement) {
+            return getEffectiveValue(node.parentNode, context);
+        }
+
+        return context.command.getEffectiveValue(node, context);
+    }
+
+    function removeExtraneousLineBreaksBefore(node) {
+        // "If node is not an Element, or it is an inline node, do nothing and
+        // abort these steps."
+        if (!node || node.nodeType != 1 || isInlineNode(node)) {
+            return;
+        }
+
+        // "If the previousSibling of node is a br, and the previousSibling of the
+        // previousSibling of node is an inline node that is not a br, remove the
+        // previousSibling of node from its parent."
+        var previousSibling = node.previousSibling, previousSiblingPreviousSibling;
+        if (isHtmlElement(previousSibling, "br")
+                && isInlineNode( (previousSiblingPreviousSibling = node.previousSibling.previousSibling) )
+                && !isHtmlElement(previousSiblingPreviousSibling, "br")) {
+            node.parentNode.removeChild(previousSibling);
+        }
+    }
+
+    function removeExtraneousLineBreaksAtTheEndOf(node) {
+        // "If node is not an Element, or it is an inline node, do nothing and
+        // abort these steps."
+        if (!node || node.nodeType != 1 || isInlineNode(node)) {
+            return;
+        }
+
+        // "If node has at least two children, and its last child is a br, and its
+        // second-to-last child is an inline node that is not a br, remove the last
+        // child of node from node."
+        var lastChild = node.lastChild, lastChildPreviousSibling;
+        if (node.childNodes.length >= 2 && isHtmlElement(node.lastChild, "br")
+                && isInlineNode( (lastChildPreviousSibling = node.lastChild.previousSibling) )
+                && !isHtmlElement(lastChildPreviousSibling, "br")) {
+            node.removeChild(lastChild);
+        }
+    }
+
+    // "To remove extraneous line breaks from a node, first remove extraneous line
+    // breaks before it, then remove extraneous line breaks at the end of it."
+    function removeExtraneousLineBreaksFrom(node) {
+        removeExtraneousLineBreaksBefore(node);
+        removeExtraneousLineBreaksAtTheEndOf(node);
+    }
+
+    function wrap(nodeList, siblingCriteria, newParentInstructions, context) {
+        var firstNode = nodeList[0];
+        var options = context.options, rangesToPreserve = context.rangesToPreserve;
+        var i, len, range;
+
+        // "If node list is empty, or the first member of node list is not
+        // editable, return null and abort these steps."
+        if (!nodeList.length || !isEditable(firstNode, options)) {
+            return null;
+        }
+
+        var lastNode = nodeList[nodeList.length - 1];
+
+        // "If node list's last member is an inline node that's not a br, and node
+        // list's last member's nextSibling is a br, append that br to node list."
+        if (isInlineNode(lastNode) && !isHtmlElement(lastNode, "br") && isHtmlElement(lastNode.nextSibling, "br")) {
+            nodeList.push(lastNode.nextSibling);
+        }
+
+        // "If the previousSibling of the first member of node list is editable and
+        // meets the sibling criteria, let new parent be the previousSibling of the
+        // first member of node list."
+        var newParent, nodePriorToFirstNode = firstNode.previousSibling, nodeAfterLastNode = lastNode.nextSibling;
+
+        if (isEditable(nodePriorToFirstNode, options) && siblingCriteria(nodePriorToFirstNode)) {
+            newParent = nodePriorToFirstNode;
+
+        // "Otherwise, if the nextSibling of the last member of node list is
+        // editable and meets the sibling criteria, let new parent be the
+        // nextSibling of the last member of node list."
+        } else if (isEditable(nodeAfterLastNode, options) && siblingCriteria(nodeAfterLastNode)) {
+            newParent = nodeAfterLastNode;
+
+        // "Otherwise, run the new parent instructions, and let new parent be the
+        // result."
+        } else {
+            newParent = newParentInstructions();
+        }
+
+        // "If new parent is null, abort these steps and return null."
+        if (!newParent) {
+            return null;
+        }
+
+        var doc = dom.getDocument(newParent);
+        var newParentParent = newParent.parentNode, firstNodeParent = firstNode.parentNode;
+
+        // "If new parent's parent is null:"
+        if (!newParentParent) {
+            // "Insert new parent into the parent of the first member of node list
+            // immediately before the first member of node list."
+            firstNodeParent.insertBefore(newParent, firstNode);
+
+            // "If any range has a boundary point with node equal to the parent of
+            // new parent and offset equal to the index of new parent, add one to
+            // that boundary point's offset."
+
+            // Preserve only the ranges passed in
+            for (i = 0; range = rangesToPreserve[i++]; ) {
+                if (range.startContainer == newParentParent && range.startOffset == dom.getNodeIndex(newParent)) {
+                    range.setStart(range.startContainer, range.startOffset + 1);
+                }
+                if (range.endContainer == newParentParent && range.endOffset == dom.getNodeIndex(newParent)) {
+                    range.setEnd(range.endContainer, range.endOffset + 1);
+                }
+            }
+        }
+
+        // "Let original parent be the parent of the first member of node list."
+
+        // "If new parent is before the first member of node list in tree order:"
+        if (isBefore(newParent, firstNode)) {
+            // "If new parent is not an inline node, but the last child of new
+            // parent and the first member of node list are both inline nodes, and
+            // the last child of new parent is not a br, call createElement("br")
+            // on the ownerDocument of new parent and append the result as the last
+            // child of new parent."
+            if (!isInlineNode(newParent) && isInlineNode(newParent.lastChild) && isInlineNode(firstNode) && !isHtmlElement(newParent.lastChild, "br")) {
+                newParent.appendChild(doc.createElement("br"));
+            }
+
+            // "For each node in node list, append node as the last child of new
+            // parent, preserving ranges."
+            for (i = 0, len = nodeList.length; i < len; ++i) {
+                movePreservingRanges(nodeList[i], newParent, -1, rangesToPreserve);
+            }
+
+        // "Otherwise:"
+        } else {
+            // "If new parent is not an inline node, but the first child of new
+            // parent and the last member of node list are both inline nodes, and
+            // the last member of node list is not a br, call createElement("br")
+            // on the ownerDocument of new parent and insert the result as the
+            // first child of new parent."
+            if (!isInlineNode(newParent) && isInlineNode(newParent.firstChild) && isInlineNode(lastNode) && !isHtmlElement(lastNode, "br")) {
+                newParent.insertBefore(doc.createElement("br"), newParent.firstChild);
+            }
+
+            // "For each node in node list, in reverse order, insert node as the
+            // first child of new parent, preserving ranges."
+            for (i = nodeList.length - 1; i >= 0; i--) {
+                movePreservingRanges(nodeList[i], newParent, 0, rangesToPreserve);
+            }
+        }
+
+        // "If original parent is editable and has no children, remove it from its
+        // parent."
+        if (isEditable(firstNodeParent, options) && !firstNodeParent.hasChildNodes()) {
+            firstNodeParent.parentNode.removeChild(firstNodeParent);
+        }
+
+        // "If new parent's nextSibling is editable and meets the sibling
+        // criteria:"
+        var newParentNextSibling = newParent.nextSibling;
+        if (isEditable(newParentNextSibling, options) && siblingCriteria(newParentNextSibling)) {
+            // "If new parent is not an inline node, but new parent's last child
+            // and new parent's nextSibling's first child are both inline nodes,
+            // and new parent's last child is not a br, call createElement("br") on
+            // the ownerDocument of new parent and append the result as the last
+            // child of new parent."
+            if (!isInlineNode(newParent) && isInlineNode(newParent.lastChild) &&
+                    isInlineNode(newParentNextSibling.firstChild) && !isHtmlElement(newParent.lastChild, "br")) {
+                newParent.appendChild(doc.createElement("br"));
+            }
+
+            // "While new parent's nextSibling has children, append its first child
+            // as the last child of new parent, preserving ranges."
+            while (newParentNextSibling.hasChildNodes()) {
+                movePreservingRanges(newParentNextSibling.firstChild, newParent, -1, rangesToPreserve);
+            }
+
+            // "Remove new parent's nextSibling from its parent."
+            newParent.parentNode.removeChild(newParentNextSibling);
+        }
+
+        // "Remove extraneous line breaks from new parent."
+        removeExtraneousLineBreaksFrom(newParent);
+
+        // "Return new parent."
+        return newParent;
+    }
+
+    function reorderModifiableDescendants(node, command, newValue, context, siblingPropName) {
+        var candidate = node[siblingPropName], rangesToPreserve = context.rangesToPreserve;
+
+        // "While candidate is a modifiable element, and candidate has exactly one
+        // child, and that child is also a modifiable element, and candidate is
+        // not a simple modifiable element or candidate's specified value for
+        // command is not new value, set candidate to its child."
+        while (isModifiableElement(candidate, context)
+                && candidate.childNodes.length == 1
+                && isModifiableElement(candidate.firstChild, context)
+                && (!isSimpleModifiableElement(candidate, context)
+                    || !valuesEqual(command, command.getSpecifiedValue(candidate, context), newValue))) {
+            candidate = candidate.firstChild;
+        }
+
+        // "If candidate is a simple modifiable element whose specified value and
+        // effective value for command are both new value, and candidate is
+        // not the previousSibling/nextSibling of node:"
+        if (isSimpleModifiableElement(candidate, context)
+                && valuesEqual(command, command.getSpecifiedValue(candidate, context), newValue)
+                && valuesEqual(command, getEffectiveValue(candidate, context), newValue)
+                && candidate != node[siblingPropName]) {
+
+            // "While candidate has children, insert the first child of
+            // candidate into candidate's parent immediately before candidate,
+            // preserving ranges."
+            moveChildrenPreservingRanges(candidate, candidate.parentNode, dom.getNodeIndex(candidate), false, rangesToPreserve);
+
+            // "Insert candidate into node's parent before node's
+            // previousSibling."
+            node.parentNode.insertBefore(candidate, node[siblingPropName]);
+
+            // "Append the nextSibling of candidate as the last child of
+            // candidate, preserving ranges."
+            movePreservingRanges(candidate.nextSibling, candidate, candidate.childNodes.length, rangesToPreserve);
+        }
+    }
+
+    function forceValue(node, newValue, context) {
+        var child, i, len, children, nodeType = node.nodeType;
+        var command = context.command, rangesToPreserve = context.rangesToPreserve, options = context.options;
+
+        // "If node's parent is null, abort this algorithm."
+        if (!node.parentNode) {
+            return;
+        }
+
+        // "If new value is null, abort this algorithm."
+        if (newValue === null) {
+            return;
+        }
+
+        // "If node is an Element, Text, Comment, or ProcessingInstruction node,
+        // and is not an unwrappable node:"
+        if (/^(1|3|4|7)$/.test("" + nodeType) && !isUnwrappable(node, options)) {
+		    // "Reorder modifiable descendants of node's previousSibling."
+            reorderModifiableDescendants(node, command, newValue, context, "previousSibling");
+
+    		// "Reorder modifiable descendants of node's nextSibling."
+            reorderModifiableDescendants(node, command, newValue, context, "nextSibling");
+
+            // "Wrap the one-node list consisting of node, with sibling criteria
+            // matching a simple modifiable element whose specified value and
+            // effective value for command are both new value, and with new parent
+            // instructions returning null."
+            wrap([node],
+                function(node) {
+                    return isSimpleModifiableElement(node, context)
+                        && valuesEqual(command, command.getSpecifiedValue(node, context), newValue)
+                        && valuesEqual(command, getEffectiveValue(node, context), newValue);
+                },
+                function() { return null; },
+                context
+            );
+        }
+
+        // "If the effective value of command is new value on node, abort this
+        // algorithm."
+        if (valuesEqual(command, getEffectiveValue(node, context), newValue)) {
+            return;
+        }
+
+        // "If node is an unwrappable node:"
+        if (isUnwrappable(node, options)) {
+            // "Let children be all children of node, omitting any that are
+            // Elements whose specified value for command is neither null nor
+            // equal to new value."
+            children = [];
+            for (i = 0, len = node.childNodes.length, specifiedValue; i < len; ++i) {
+                child = node.childNodes[i];
+                if (child.nodeType == 1) {
+                    specifiedValue = command.getSpecifiedValue(child, context);
+                    if (specifiedValue !== null && !valuesEqual(command, newValue, specifiedValue)) {
+                        continue;
+                    }
+                }
+                children.push(child);
+            }
+
+            // "Force the value of each Node in children, with command and new
+            // value as in this invocation of the algorithm."
+            for (i = 0; child = children[i++]; ) {
+                forceValue(child, newValue, context);
+            }
+
+            // "Abort this algorithm."
+            return;
+        }
+
+        // "If node is a Comment or ProcessingInstruction, abort this algorithm."
+        if (nodeType == 4 || nodeType == 7) {
+            return;
+        }
+
+        // "If the effective value of command is new value on node, abort this
+        // algorithm."
+        if (valuesEqual(command, getEffectiveValue(node, context), newValue)) {
+            return;
+        }
+
+        // "Let new parent be null."
+        var newParent = null;
+
+        // "If the CSS styling flag is false:"
+        if (!options.styleWithCss && command.createNonCssElement) {
+            newParent = command.createNonCssElement(node, newValue, context);
+        }
+
+        // "If new parent is null, let new parent be the result of calling
+        // createElement("span") on the ownerDocument of node."
+        if (!newParent) {
+            if (command.createCssElement) {
+                newParent = command.createCssElement(dom.getDocument(node), context);
+            } else {
+                newParent = dom.getDocument(node).createElement("span");
+            }
+        }
+
+        // "Insert new parent in node's parent before node."
+        node.parentNode.insertBefore(newParent, node);
+
+        // "If the effective value of command for new parent is not new value, and
+        // the relevant CSS property for command is not null, set that CSS property
+        // of new parent to new value (if the new value would be valid)."
+        var property = command.relevantCssProperty;
+        if (property !== null && !valuesEqual(command, getEffectiveValue(newParent, context), newValue)) {
+            newParent.style[property] = newValue;
+        }
+
+        // Perform additional styling (for commands such as strikethrough and underline)
+        if (command.styleCssElement) {
+            command.styleCssElement(newParent, newValue);
+        }
+
+        // "Append node to new parent as its last child, preserving ranges."
+        movePreservingRanges(node, newParent, newParent.childNodes.length, rangesToPreserve);
+
+        // "If node is an Element and the effective value of command for node is
+        // not new value:"
+        if (nodeType == 1 && !valuesEqual(command, getEffectiveValue(node, context), newValue)) {
+            // "Insert node into the parent of new parent before new parent,
+            // preserving ranges."
+            movePreservingRanges(node, newParent.parentNode, dom.getNodeIndex(newParent), rangesToPreserve);
+
+            // "Remove new parent from its parent."
+            newParent.parentNode.removeChild(newParent);
+
+            // "If new parent is a span, and either a) command is "underline" or
+            // "strikethrough", or b) command is "fontSize" and new value is not
+            // "xxx-large", or c) command is not "fontSize" and the relevant CSS
+            // property for command is not null:"
+            if (newParent.tagName.toLowerCase() == "span"
+                    && ((command.hasSpecialSpanStyling && command.hasSpecialSpanStyling(newValue))
+                    || property !== null)) {
+
+                // "If the relevant CSS property for command is not null, set that
+                // CSS property of node to new value."
+                if (property !== null) {
+                    node.style[property] = newValue;
+                }
+
+                if (command.styleSpanChildElement) {
+                    command.styleSpanChildElement(node, newValue);
+                }
+
+            // "Otherwise:"
+            } else {
+                // "Let children be all children of node, omitting any that are
+                // Elements whose specified value for command is neither null nor
+                // equal to new value."
+                children = [];
+                var specifiedValue;
+                for (i = 0, len = node.childNodes.length; i < len; ++i) {
+                    child = node.childNodes[i];
+                    if (child.nodeType == 1) {
+                        specifiedValue = command.getSpecifiedValue(child, context);
+
+                        if (specifiedValue !== null && !valuesEqual(command, newValue, specifiedValue)) {
+                            continue;
+                        }
+                    }
+                    children.push(child);
+                }
+
+                // "Force the value of each Node in children, with command and new
+                // value as in this invocation of the algorithm."
+                for (i = 0, len = children.length; i < len; ++i) {
+                    forceValue(children[i], newValue, context);
+                }
+            }
+        }
+    }
+
+    function pushDownValues(node, context) {
+        var command = context.command,
+            newValue = context.value,
+            options = context.options,
+            parent = node.parentNode;
+
+        // "If node's parent is not an Element, abort this algorithm."
+        if (!parent || parent.nodeType != 1) {
+            return;
+        }
+
+        // "If the effective value of command is new value on node, abort this
+        // algorithm."
+        if (valuesEqual(command, getEffectiveValue(node, context), newValue)) {
+            return;
+        }
+
+        // "Let current ancestor be node's parent."
+        var currentAncestor = parent;
+
+        // "Let ancestor list be a list of Nodes, initially empty."
+        var ancestorList = [];
+
+        // "While current ancestor is an editable Element and the effective value
+        // of command is not new value on it, append current ancestor to ancestor
+        // list, then set current ancestor to its parent."
+        while (isEditable(currentAncestor, options) && currentAncestor.nodeType == 1
+                && !valuesEqual(command, getEffectiveValue(currentAncestor, context), newValue)) {
+            ancestorList.push(currentAncestor);
+            currentAncestor = currentAncestor.parentNode;
+        }
+
+        // "If ancestor list is empty, abort this algorithm."
+        if (ancestorList.length == 0) {
+            return;
+        }
+
+        // "Let propagated value be the specified value of command on the last
+        // member of ancestor list."
+        var lastAncestor = ancestorList[ancestorList.length - 1],
+            propagatedValue = command.getSpecifiedValue(lastAncestor, context);
+
+        // "If propagated value is null and is not equal to new value, abort this
+        // algorithm."
+        if (propagatedValue === null && propagatedValue != newValue) {
+            return;
+        }
+
+        // "If the effective value of command is not new value on the parent of
+        // the last member of ancestor list, and new value is not null, abort this
+        // algorithm."
+        if (newValue !== null && !valuesEqual(command, getEffectiveValue(lastAncestor.parentNode, context), newValue)) {
+            return;
+        }
+
+        // "While ancestor list is not empty:"
+        while (ancestorList.length) {
+            // "Let current ancestor be the last member of ancestor list."
+            // "Remove the last member from ancestor list."
+            currentAncestor = ancestorList.pop();
+
+            // "If the specified value of current ancestor for command is not null,
+            // set propagated value to that value."
+            if (command.getSpecifiedValue(currentAncestor, context) !== null) {
+                propagatedValue = command.getSpecifiedValue(currentAncestor, context);
+            }
+
+            // "Let children be the children of current ancestor."
+            var children = toArray(currentAncestor.childNodes);
+
+            // "If the specified value of current ancestor for command is not null,
+            // clear the value of current ancestor."
+            if (command.getSpecifiedValue(currentAncestor, context) !== null) {
+                clearValue(currentAncestor, context);
+            }
+
+            // "For every child in children:"
+            for (var i = 0, child; child = children[i++]; ) {
+                // "If child is node, continue with the next child."
+                if (child == node) {
+                    continue;
+                }
+
+                // "If child is an Element whose specified value for command
+                // is neither null nor equal to propagated value, continue with the
+                // next child."
+                if (child.nodeType == 1
+                        && command.getSpecifiedValue(child, context) !== null
+                        && !valuesEqual(command, propagatedValue, command.getSpecifiedValue(child, context))) {
+                    continue;
+                }
+
+                // "If child is the last member of ancestor list, continue with the
+                // next child."
+                if (child == lastAncestor) {
+                    continue;
+                }
+
+                // "Force the value of child, with command as in this algorithm
+                // and new value equal to propagated value."
+                forceValue(child, propagatedValue, context);
+            }
+        }
+    }
+
+    function setChildrenNodeValue(node, context) {
+        var children = toArray(node.childNodes);
+        for (var i = 0, len = children.length; i < len; ++i) {
+            setNodeValue(children[i], context);
+        }
+    }
+
+    function outerHtml(node) {
+        if (node === null) {
+            return "null";
+        } else if (node.nodeType == 3) {
+            return node.data;
+        } else {
+            var div = dom.getDocument(node).createElement("div");
+            div.appendChild(node.cloneNode(true));
+            return div.innerHTML;
+        }
+    }
+
+    function getRangeContainerHtml(range) {
+        return outerHtml(range.commonAncestorContainer);
+    }
+
+    function setNodeValue(node, context) {
+        var i, len, child, nodeType = node.nodeType;
+
+        // "If node is a Document, set the value of its Element child (if it has
+        // one) and abort this algorithm."
+        if (nodeType == 9) {
+            for (i = 0; i < node.childNodes.length; ++i) {
+                child = node.childNodes[i];
+                if (child.nodeType == 1) {
+                    setNodeValue(child, context);
+                    break;
+                }
+            }
+            return;
+        }
+
+        // "If node is a DocumentFragment, let children be a list of its children.
+        // Set the value of each member of children, then abort this algorithm."
+        if (nodeType == 11) {
+            setChildrenNodeValue(node, context);
+            return;
+        }
+
+        // "If node's parent is null, or if node is a DocumentType, abort this
+        // algorithm."
+        if (!node.parentNode || nodeType == 10) {
+            return;
+        }
+
+        // If node is a ignorable text node, abort
+        if (isIgnoredNode(node, context.options)) {
+            return;
+        }
+
+        // "If node is not editable, let children be the children of node. Set the value of each member of children.
+        // Abort this algorithm."
+        if (!isEditable(node, context.options)) {
+            setChildrenNodeValue(node, context);
+            return;
+        }
+
+        // "If node is an Element:"
+        if (nodeType == 1) {
+            // "Clear the value of node, and let new nodes be the result."
+            var newNodes = clearValue(node, context);
+
+            // "For each new node in new nodes, set the value of new node, with the
+            // same inputs as this invocation of the algorithm."
+            for (i = 0, len = newNodes.length; i < len; ++i) {
+                setNodeValue(newNodes[i], context);
+            }
+
+            // "If node's parent is null, abort this algorithm."
+            if (!node.parentNode) {
+                return;
+            }
+        }
+
+        // "Push down values on node."
+        pushDownValues(node, context);
+
+        // "Force the value of node."
+        forceValue(node, context.value, context);
+
+        // "Let children be the children of node. Set the value of each member of children."
+        setChildrenNodeValue(node, context);
+    }
+
+    // TODO: Add something about whitespace text nodes (option?)
+    function getEffectiveTextNodes(range, context) {
+        return range.getNodes([3], function(node) {
+            return isEffectivelyContained(node, range) && !isIgnoredNode(node, context.options);
+        });
+    }
+
+    function Command() {}
+
+    Command.prototype = {
+        relevantCssProperty: null,
+
+        getSpecifiedValue: function() {
+            //throw new module.createError("Command '" + this.name + "' does not implement getSpecifiedValue()");
+            return null;
+        },
+
+        clearValue: function(/*element*/) {},
+
+        getEffectiveValue: function(element, context) {
+            return getComputedStyleProperty(element, this.relevantCssProperty);
+        },
+
+        createCssElement: null,
+
+        createNonCssElement: null,
+
+        styleCssElement: null,
+
+        hasSpecialSpanStyling: null,
+
+        styleSpanChildElement: null,
+
+        isSimpleModifiableElement: null,
+
+        defaultOptions: null,
+
+        addDefaultOptions: null,
+
+        valuesEqual: function(val1, val2) {
+            return val1 === val2;
+        },
+
+        createContext: function(value, rangesToPreserve, options) {
+            var defaultOptions = this.defaultOptions;
+            if (defaultOptions) {
+                for (var i in defaultOptions) {
+                    if (defaultOptions.hasOwnProperty(i) && !options.hasOwnProperty(i)) {
+                        options[i] = defaultOptions[i];
+                    }
+                }
+            }
+            return {
+                command: this,
+                value: value,
+                rangesToPreserve: rangesToPreserve || [],
+                options: options || {}
+            };
+        },
+
+        getSelectionValue: function(/*sel, context*/) {
+            return null;
+        },
+
+        getNewRangeValue: function(/*range, context*/) {
+            return null;
+        },
+
+        getNewSelectionValue: function(/*sel, context*/) {
+            return null;
+        },
+
+        applyToRange: function(doc, value, options, range) {
+            var context = this.createContext(value, [range], options);
+            context.value = this.getNewRangeValue(range, context);
+            this.applyValueToRange(range, context);
+        },
+
+        applyToSelection: function(doc, value, options) {
+            var win = dom.getWindow(doc);
+            var sel = api.getSelection(win);
+            var selRanges = sel.getAllRanges();
+            var context = this.createContext(value, selRanges, options);
+            context.value = this.getNewSelectionValue(sel, context);
+
+            for (var i = 0, len = selRanges.length; i < len; ++i) {
+                this.applyValueToRange(selRanges[i], context);
+            }
+
+            sel.setRanges(selRanges);
+        }
+    };
+
+    Command.util = {
+        getComputedStyleProperty: getComputedStyleProperty,
+        getFurthestAncestor: getFurthestAncestor,
+        isContained: isContained,
+        isEffectivelyContained: isEffectivelyContained,
+        isHtmlNode: isHtmlNode,
+        isHtmlElement: isHtmlElement,
+        isInlineNode: isInlineNode,
+        isUnwrappable: isUnwrappable,
+        blockExtend: blockExtend,
+        isModifiableElement: isModifiableElement,
+        isSimpleModifiableElement: isSimpleModifiableElement,
+        moveChildrenPreservingRanges: moveChildrenPreservingRanges,
+        replaceWithOwnChildren: replaceWithOwnChildren,
+        copyAttributes: copyAttributes,
+        getEffectiveValue: getEffectiveValue,
+        getEffectiveTextNodes: getEffectiveTextNodes,
+        setNodeValue: setNodeValue,
+        wrap: wrap,
+        decomposeRange: decomposeRange,
+
+        setGlobalOption: function(name, value) {
+            globalOptions[name] = value;
+        }
+    };
+
+    Command.create = function(commandConstructor, properties) {
+        var proto = new Command();
+        commandConstructor.prototype = proto;
+
+        if (typeof properties == "object") {
+            for (var i in properties) {
+                if (properties.hasOwnProperty(i)) {
+                    proto[i] = properties[i];
+                }
+            }
+        }
+    };
+
+    var commandsByName = {};
+
+    api.registerCommand = function(name, command) {
+        if (!(command instanceof Command)) {
+            throw module.createError("registerCommand(): Object supplied is not a Command");
+        }
+        commandsByName[name.toLowerCase()] = command;
+    };
+
+    function getCommand(name) {
+        var lowerName = name.toLowerCase();
+        if (commandsByName.hasOwnProperty(lowerName)) {
+            return commandsByName[lowerName];
+        } else {
+            throw module.createError("getCommand(): No command registered with the name '" + name + "'");
+        }
+    }
+
+    api.execCommand = function(name, options, range) {
+        options = options || {};
+        var doc = options.hasOwnProperty("document") ? options.document : document;
+        var value = options.hasOwnProperty("value") ? options.value : null;
+        var command = getCommand(name);
+        if (range) {
+            command.applyToRange(doc, value, options, range);
+        } else {
+            command.applyToSelection(doc, value, options);
+        }
+    };
+
+    api.queryCommandValue = function(name, options, range) {
+        options = options || {};
+        var win = options.hasOwnProperty("document") ? dom.getWindow(options.document) : window;
+        var value = options.hasOwnProperty("value") ? options.value : null;
+        var command = getCommand(name);
+        var sel = api.getSelection(win);
+        var context = command.createContext(value, null, options);
+
+        return command.getSelectionValue(sel, context);
+    };
+
+    api.getCommand = getCommand;
+    api.Command = Command;
+
 });
\ No newline at end of file
diff --git a/src/js/modules/rangy-commands_new.js b/src/modules/rangy-commands_new.js
similarity index 97%
rename from src/js/modules/rangy-commands_new.js
rename to src/modules/rangy-commands_new.js
index 5f5b0bb7..19973901 100644
--- a/src/js/modules/rangy-commands_new.js
+++ b/src/modules/rangy-commands_new.js
@@ -1,1360 +1,1360 @@
-/**
- * Commands module for Rangy.
- * Provides replacements for many document.execCommand() commands, applicable to Ranges and Selections.
- *
- * Part of Rangy, a cross-browser JavaScript range and selection library
- * http://code.google.com/p/rangy/
- *
- * Depends on Rangy core.
- *
- * Algorithm is based on Aryeh Gregor's HTML Editing Commands specification
- * http://aryeh.name/gitweb.cgi?p=editcommands;a=blob_plain;f=editcommands.html;hb=HEAD
- *
- * Parts of this code are based on Aryeh Gregor's implementation of his algorithm
- * http://aryeh.name/spec/editcommands/autoimplementation.html
- *
- * Copyright %%build:year%%, Tim Down
- * Licensed under the MIT license.
- * Version: %%build:version%%
- * Build date: %%build:date%%
- */
-rangy.createModule("Commands", ["WrappedSelection"], function(api, module) {
-    /*
-    http://aryeh.name/spec/editcommands/autoimplementation.html
-    https://bitbucket.org/ms2ger/dom-range/src/tip/test/
-    http://aryeh.name/gitweb.cgi?p=editcommands;a=blob_plain;f=editcommands.html;hb=HEAD
-     */
-
-    var dom = api.dom;
-    var log = log4javascript.getLogger("rangy.commands");
-    var BOOLEAN = "boolean", UNDEF = "undefined";
-    var getRootContainer = dom.getRootContainer;
-
-    var defaultOptions = {
-        applyToEditableOnly: false,
-        styleWithCss: false,
-        ignoreInvisibleNodes: true
-    };
-
-    var getComputedStyleProperty;
-
-    if (typeof window.getComputedStyle != UNDEF) {
-        getComputedStyleProperty = function(el, propName) {
-            return dom.getWindow(el).getComputedStyle(el, null)[propName];
-        };
-    } else if (typeof document.documentElement.currentStyle != UNDEF) {
-        getComputedStyleProperty = function(el, propName) {
-            return el.currentStyle[propName];
-        };
-    } else {
-        module.fail("No means of obtaining computed style properties found");
-    }
-
-    function isBefore(nodeA, nodeB) {
-        var parentA = nodeA.parentNode, parentB = nodeB.parentNode;
-        if (parentA && parentB) {
-            return dom.comparePoints(nodeA.parentNode, dom.getNodeIndex(nodeA), nodeB.parentNode, dom.getNodeIndex(nodeB)) == -1;
-        } else {
-            return !parentA;
-        }
-    }
-
-    function outerHtml(node) {
-        if (node === null) {
-            return "null";
-        } else if (node.nodeType == 3) {
-            return node.data;
-        } else {
-            var div = dom.getDocument(node).createElement("div");
-            div.appendChild(node.cloneNode(true));
-            return div.innerHTML;
-        }
-    }
-
-    var toArray = util.toArray;
-
-    /**
-     * Returns the furthest ancestor of a Node as defined by DOM Range.
-     */
-    function getFurthestAncestor(node) {
-        var root = node;
-        while (root.parentNode != null) {
-            root = root.parentNode;
-        }
-        return root;
-    }
-
-    function getAncestors(node) {
-        var ancestors = [];
-        while ( (node = node.parentNode) ) {
-            ancestors.unshift(node);
-        }
-        return ancestors;
-    }
-
-/*
-    function getAncestorsAndSelf(node) {
-        var ancestors = getAncestors(node);
-        ancestors.push(node);
-        return ancestors;
-    }
-*/
-
-    function hasAncestor(node, matcher) {
-        while ( (node = node.parentNode) ) {
-            if (matcher(node)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    function isOrHasAncestor(node, matcher) {
-        return matcher(node) || hasAncestor(node, matcher);
-    }
-
-    function nextNodeDescendants(node) {
-        while (node && !node.nextSibling) {
-            node = node.parentNode;
-        }
-        if (!node) {
-            return null;
-        }
-        return node.nextSibling;
-    }
-
-    function nextNode(node) {
-        if (node.hasChildNodes()) {
-            return node.firstChild;
-        }
-        return nextNodeDescendants(node);
-    }
-
-    function previousNode(node) {
-        var previous = node.previousSibling;
-        if (previous) {
-            node = previous;
-            while (node.hasChildNodes()) {
-                node = node.lastChild;
-            }
-            return node;
-        }
-        var parent = node.parentNode;
-        if (parent && parent.nodeType == 1) {
-            return parent;
-        }
-        return null;
-    }
-
-    var isEditableElement;
-
-    (function() {
-        var testEl = document.createElement("div");
-        if (typeof testEl.isContentEditable == BOOLEAN) {
-            isEditableElement = function(node) {
-                return node && node.nodeType == 1 && node.isContentEditable;
-            };
-        } else {
-            isEditableElement = function(node) {
-                if (!node || node.nodeType != 1 || node.contentEditable == "false") {
-                    return false;
-                }
-                return node.contentEditable == "true" || isEditableElement(node.parentNode);
-            };
-        }
-    })();
-
-    // The spec says "An editing host is a node that is either an Element with a contenteditable
-    // attribute set to the true state, or the Element child of a Document whose designMode is enabled."
-    //
-    // Because Safari returns "true" for the contentEditable property of an element that actually inherits its
-    // editability from its parent, we use a different definition:
-    //
-    // "An editing host is a node that is either an Element with a contenteditable attribute set to the true state but
-    // whose parent node is not an element or has a contenteditable attribute set to a value other than the true state,
-    // or the Element child of a Document whose designMode is enabled."
-    function isEditingHost(node) {
-        var parent;
-        return node && node.nodeType == 1 &&
-            (( (parent = node.parentNode) && parent.nodeType == 9 && parent.designMode == "on") ||
-            (isEditableElement(node) && !isEditableElement(node.parentNode)));
-    }
-
-    // The spec says "Something is editable if it is a node which is not an editing host, does
-    // not have a contenteditable attribute set to the false state, and whose
-    // parent is an editing host or editable."
-    //
-    // We're not making any distinction, unless the applyToEditableOnly global option is set to true. Rangy commands can
-    // run on non-editable content. The revised definition:
-    //
-    // "A node is editable if it is not an editing host and is or is the child of an Element whose isContentEditable
-    // property returns true."
-    function isEditable(node, options) {
-        return node &&
-            ((options && !options.applyToEditableOnly)
-                || (((isEditableElement(node) || (node.nodeType != 1 && isEditableElement(node.parentNode)))
-                     && !isEditingHost(node) ) ));
-    }
-
-    // "contained" as defined by DOM Range: "A Node node is contained in a range
-    // range if node's furthest ancestor is the same as range's root, and (node, 0)
-    // is after range's start, and (node, length of node) is before range's end."
-    function isContained(node, range) {
-        return getRootContainer(node) == getRootContainer(range.startContainer)
-            && dom.comparePoints(node, 0, range.startContainer, range.startOffset) == 1
-            && dom.comparePoints(node, dom.getNodeLength(node), range.endContainer, range.endOffset) == -1;
-    }
-
-
-    // "A node node is effectively contained in a range range if at least one of
-    // the following holds:"
-    function isEffectivelyContained(node, range) {
-        if (range.collapsed) {
-            return false;
-        }
-
-        // "node is contained in range."
-        if (isContained(node, range)) {
-            return true;
-        }
-
-        var sc = range.startContainer, so = range.startOffset;
-        var ec = range.endContainer, eo = range.endOffset;
-
-        // "node is range's start node, it is a Text node, its length is different
-        // from range's start offset."
-        var isCharData = dom.isCharacterDataNode(node);
-        if (node == sc && isCharData && dom.getNodeLength(node) != so) {
-            return true;
-        }
-
-        // "node is range's end node, it is a Text node, range's end offset is not
-        // 0."
-        if (node == ec && isCharData && eo != 0) {
-            return true;
-        }
-
-        // "node has at least one child; and all its children are effectively
-        // contained in range; and either range's start node is not a descendant of
-        // node or is not a Text node or range's start offset is zero or range is
-        // collapsed; and either range's end node is not a descendant of node or is
-        // not a Text node or range's end offset is its end node's length."
-        var children = node.childNodes, childCount = children.length;
-        if (childCount != 0) {
-            for (var i = 0; i < childCount; ++i) {
-                if (!isEffectivelyContained(children[i], range)) {
-                    return false;
-                }
-            }
-            if ((!dom.isAncestorOf(node, sc) || sc.nodeType != 3 || so == 0)
-                    && (!dom.isAncestorOf(node, ec) || ec.nodeType != 3 || eo == dom.getNodeLength(ec))) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    // Opera 11 puts HTML elements in the null namespace, it seems, and IE 7 has undefined namespaceURI
-    function isHtmlNode(node) {
-        var ns;
-        return typeof (ns = node.namespaceURI) == UNDEF || (ns === null || ns == "http://www.w3.org/1999/xhtml");
-    }
-
-    function isHtmlElement(node, tagNames) {
-        if (!node || node.nodeType != 1 || !isHtmlNode(node)) {
-            return false;
-        }
-        switch (typeof tagNames) {
-            case "string":
-                return node.tagName.toLowerCase() == tagNames.toLowerCase();
-            case "object":
-                return new RegExp("^(" + tagNames.join(",") + ")$", "i").test(node.tagName);
-            default:
-                return true;
-        }
-    }
-
-    var unwrappableTagNamesRegex = /^(h[1-6]|p|hr|pre|blockquote|ol|ul|li|dl|dt|dd|div|table|caption|colgroup|col|tbody|thead|tfoot|tr|th|td|address)$/i;
-    var inlineDisplayRegex = /^(none|inline(-block|-table)?)$/i;
-
-    // "A block node is either an Element whose "display" property does not have
-    // resolved value "inline" or "inline-block" or "inline-table" or "none", or a
-    // Document, or a DocumentFragment."
-    function isBlockNode(node) {
-        if (!node) {
-            return false;
-        }
-        var nodeType = node.nodeType;
-        return nodeType == 1 && !inlineDisplayRegex.test(getComputedStyleProperty(node, "display"))
-            || nodeType == 9 || nodeType == 11;
-    }
-
-    // "An inline node is a node that is not a block node."
-    function isInlineNode(node) {
-        return node && !isBlockNode(node);
-    }
-
-    // "A collapsed line break is a br that begins a line box which has nothing
-    // else in it, and therefore has zero height."
-    function isCollapsedLineBreak(br) {
-        if (!isHtmlElement(br, "br")) {
-            return false;
-        }
-
-        // Add a zwsp after it and see if that changes the height of the nearest
-        // non-inline parent.  Note: this is not actually reliable, because the
-        // parent might have a fixed height or something.
-        var ref = br.parentNode;
-        while (getComputedStyleProperty(ref, "display") == "inline") {
-            ref = ref.parentNode;
-        }
-        var refStyle = ref.hasAttribute("style") ? ref.getAttribute("style") : null;
-        ref.style.height = "auto";
-        ref.style.maxHeight = "none";
-        ref.style.minHeight = "0";
-        var space = document.createTextNode("\u200b");
-        var origHeight = ref.offsetHeight;
-        if (origHeight == 0) {
-            throw "isCollapsedLineBreak: original height is zero, bug?";
-        }
-        br.parentNode.insertBefore(space, br.nextSibling);
-        var finalHeight = ref.offsetHeight;
-        space.parentNode.removeChild(space);
-        if (refStyle === null) {
-            // Without the setAttribute() line, removeAttribute() doesn't work in
-            // Chrome 14 dev.  I have no idea why.
-            ref.setAttribute("style", "");
-            ref.removeAttribute("style");
-        } else {
-            ref.setAttribute("style", refStyle);
-        }
-
-        // Allow some leeway in case the zwsp didn't create a whole new line, but
-        // only made an existing line slightly higher.  Firefox 6.0a2 shows this
-        // behavior when the first line is bold.
-        return origHeight < finalHeight - 5;
-    }
-
-    // "An extraneous line break is a br that has no visual effect, in that
-    // removing it from the DOM would not change layout, except that a br that is
-    // the sole child of an li is not extraneous."
-    //
-    // FIXME: This doesn't work in IE, since IE ignores display: none in
-    // contenteditable.
-    function isExtraneousLineBreak(br) {
-        if (!isHtmlElement(br, "br")) {
-            return false;
-        }
-
-        if (isHtmlElement(br.parentNode, "li")
-        && br.parentNode.childNodes.length == 1) {
-            return false;
-        }
-
-        // Make the line break disappear and see if that changes the block's
-        // height.  Yes, this is an absurd hack.  We have to reset height etc. on
-        // the reference node because otherwise its height won't change if it's not
-        // auto.
-        var ref = br.parentNode;
-        while (getComputedStyle(ref).display == "inline") {
-            ref = ref.parentNode;
-        }
-        var refStyle = ref.hasAttribute("style") ? ref.getAttribute("style") : null;
-        ref.style.height = "auto";
-        ref.style.maxHeight = "none";
-        ref.style.minHeight = "0";
-        var brStyle = br.hasAttribute("style") ? br.getAttribute("style") : null;
-        var origHeight = ref.offsetHeight;
-        if (origHeight == 0) {
-            throw "isExtraneousLineBreak: original height is zero, bug?";
-        }
-        br.setAttribute("style", "display:none");
-        var finalHeight = ref.offsetHeight;
-        if (refStyle === null) {
-            // Without the setAttribute() line, removeAttribute() doesn't work in
-            // Chrome 14 dev.  I have no idea why.
-            ref.setAttribute("style", "");
-            ref.removeAttribute("style");
-        } else {
-            ref.setAttribute("style", refStyle);
-        }
-        if (brStyle === null) {
-            br.removeAttribute("style");
-        } else {
-            br.setAttribute("style", brStyle);
-        }
-
-        return origHeight == finalHeight;
-    }
-
-    // "A whitespace node is either a Text node whose data is the empty string; or
-    // a Text node whose data consists only of one or more tabs (0x0009), line
-    // feeds (0x000A), carriage returns (0x000D), and/or spaces (0x0020), and whose
-    // parent is an Element whose resolved value for "white-space" is "normal" or
-    // "nowrap"; or a Text node whose data consists only of one or more tabs
-    // (0x0009), carriage returns (0x000D), and/or spaces (0x0020), and whose
-    // parent is an Element whose resolved value for "white-space" is "pre-line"."
-    function isWhitespaceNode(node) {
-        if (!node || node.nodeType != 3) {
-            return false;
-        }
-        var text = node.data
-        if (text == "") {
-            return true;
-        }
-        var parent = node.parentNode;
-        if (!parent || parent.nodeType != 1) {
-            return false;
-        }
-        var computedWhiteSpace = getComputedStyleProperty(node.parentNode, "whiteSpace");
-
-        return (/^[\t\n\r ]+$/.test(text) && /^(normal|nowrap)$/.test(computedWhiteSpace)) ||
-            (/^[\t\r ]+$/.test(text) && computedWhiteSpace == "pre-line");
-    }
-
-    // "node is a collapsed whitespace node if the following algorithm returns
-    // true:"
-    function isCollapsedWhitespaceNode(node) {
-        // "If node is not a whitespace node, return false."
-        if (!isWhitespaceNode(node)) {
-            return false;
-        }
-
-        // "If node's data is the empty string, return true."
-        if (node.data == "") {
-            return true;
-        }
-
-        // "Let ancestor be node's parent."
-        var ancestor = node.parentNode;
-
-        // "If ancestor is null, return true."
-        if (!ancestor) {
-            return true;
-        }
-
-        // "If the "display" property of some ancestor of node has resolved value
-        // "none", return true."
-        if (hasAncestor(node, function(ancestor) {
-            return ancestor.nodeType == 1 && getComputedStyleProperty(ancestor, "display") == "none";
-        })) {
-            return true;
-        }
-
-        // "While ancestor is not a block node and its parent is not null, set
-        // ancestor to its parent."
-        while (!isBlockNode(ancestor) && (ancestor = ancestor.parentNode) ) {}
-
-        // "Let reference be node."
-        var reference = node;
-
-        // "While reference is a descendant of ancestor:"
-        while (reference != ancestor) {
-            // "Let reference be the node before it in tree order."
-            reference = previousNode(reference);
-
-            // "If reference is a block node or a br, return true."
-            if (isBlockNode(reference) || isHtmlElement(reference, "br")) {
-                return true;
-            }
-
-            // "If reference is a Text node that is not a whitespace node, or is an
-            // img, break from this loop."
-            if ((reference.nodeType == 3 && !isWhitespaceNode(reference)) || isHtmlElement(reference, "img")) {
-                break;
-            }
-        }
-
-        // "Let reference be node."
-        reference = node;
-
-        // "While reference is a descendant of ancestor:"
-        var stop = nextNodeDescendants(ancestor);
-        while (reference != stop) {
-            // "Let reference be the node after it in tree order, or null if there
-            // is no such node."
-            reference = nextNode(reference);
-
-            // "If reference is a block node or a br, return true."
-            if (isBlockNode(reference) || isHtmlElement(reference, "br")) {
-                return true;
-            }
-
-            // "If reference is a Text node that is not a whitespace node, or is an
-            // img, break from this loop."
-            if ((reference && reference.nodeType == 3 && !isWhitespaceNode(reference))
-            || isHtmlElement(reference, "img")) {
-                break;
-            }
-        }
-
-        // "Return false."
-        return false;
-    }
-
-    // "Something is visible if it is a node that either is a block node, or a Text
-    // node that is not a collapsed whitespace node, or an img, or a br that is not
-    // an extraneous line break, or any node with a visible descendant; excluding
-    // any node with an ancestor container Element whose "display" property has
-    // resolved value "none"."
-    function isVisible(node) {
-        if (!node) {
-            return false;
-        }
-
-        if (isOrHasAncestor(node, function(node) {
-            return node.nodeType == 1 && getComputedStyleProperty(node, "display") == "none";
-        })) {
-            return false;
-        }
-
-        if (isBlockNode(node)
-        || (node.nodeType == 3 && !isCollapsedWhitespaceNode(node))
-        || isHtmlElement(node, "img")
-        || (isHtmlElement(node, "br") && !isExtraneousLineBreak(node))) {
-            return true;
-        }
-
-        for (var i = 0, childNodes = node.childNodes, len = childNodes.length; i < len; ++i) {
-            if (isVisible(childNodes[i])) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    // "Something is invisible if it is a node that is not visible."
-    function isInvisible(node) {
-        return node && !isVisible(node);
-    }
-
-    function getEffectiveTextNodes(range, context) {
-        return range.getNodes([3], function(node) {
-            return isEffectivelyContained(node, range) && (!context.options.ignoreInvisibleNodes || isInvisible(node));
-        });
-    }
-
-    function getEffectivelyContainedElements(range, context) {
-        return range.getNodes([1], function(node) {
-            return isEffectivelyContained(node, range) && (!context.options.ignoreInvisibleNodes || isInvisible(node));
-        });
-    }
-
-    function elementOnlyHasAttributes(el, attrs) {
-        log.debug("elementOnlyHasAttributes. attr length: " + el.attributes.length);
-        for (var i = 0, len = el.attributes.length, attrName; i < len; ++i) {
-            attrName = el.attributes[i].name;
-            //log.info("name: " + attrName + ", specified: " + el.attributes[i].specified);
-            if (el.attributes[i].specified && (!attrs || !dom.arrayContains(attrs, attrName))) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    // "A modifiable element is a b, em, i, s, span, strong, sub, sup, or u element
-    // with no attributes except possibly style; or a font element with no
-    // attributes except possibly style, color, face, and/or size; or an a element
-    // with no attributes except possibly style and/or href."
-    var modifiableElements = "b|em|i|s|span|strike|strong|sub|sup|u";
-    var modifiableElementRegex = new RegExp("^(" + modifiableElements + ")$");
-
-    function isModifiableElement(node, context) {
-        //log.info("isModifiableElement nodeType " + node.nodeType + ", isHtmlNode " + isHtmlNode(node));
-        if (!isHtmlElement(node)) {
-            return false;
-        }
-
-        // Allow commands to define whether an element is modifiable for its purposes
-        if (context && context.command.isModifiableElement) {
-            return context.command.isModifiableElement(el, context);
-        }
-        var tagName = node.tagName.toLowerCase(), allowedAttributes;
-
-        if (modifiableElementRegex.test(tagName)) {
-            allowedAttributes = ["style"];
-        } else if (tagName == "a") {
-            allowedAttributes = ["style", "href"];
-        } else if (tagName == "font") {
-            allowedAttributes = ["style", "color", "face", "size"];
-        } else {
-            return false;
-        }
-        return elementOnlyHasAttributes(node, allowedAttributes);
-    }
-
-    var simpleModifiableElements = modifiableElements + "|a|font";
-    var simpleModifiableElementRegex = new RegExp("^(" + simpleModifiableElements + ")$");
-
-    function isSimpleModifiableElement(el, context) {
-        // "A simple modifiable element is an HTML element for which at least one
-        // of the following holds:"
-        if (!isHtmlElement(el)) {
-            return false;
-        }
-
-        // Allow commands to define whether an element is simply modifiable for its purposes
-        if (context && context.command.isSimpleModifiableElement) {
-            return context.command.isSimpleModifiableElement(el, context);
-        }
-
-        // Only these elements can possibly be a simple modifiable element.
-        var tagName = el.tagName.toLowerCase();
-        if (!simpleModifiableElementRegex.test(tagName)) {
-            return false;
-        }
-
-        // Extract attributes once and quit if more than one is found
-        var attrName, attrValue, hasAnyAttrs = false;
-        for (var i = 0, len = el.attributes.length; i < len; ++i) {
-            //log.info("attr specified: " + el.attributes[i].specified + ", name " + el.attributes[i].name);
-            if (el.attributes[i].specified) {
-                // If it's got more than one attribute, everything after this fails.
-                if (hasAnyAttrs) {
-                    return false;
-                } else {
-                    attrName = el.attributes[i].name;
-                    attrValue = el.getAttribute(attrName);
-                    hasAnyAttrs = true;
-                }
-            }
-        }
-
-        // "It is an a, b, em, font, i, s, span, strike, strong, sub, sup, or u
-        // element with no attributes."
-        if (!hasAnyAttrs) {
-            return true;
-        }
-
-        // "It is an a, b, em, font, i, s, span, strike, strong, sub, sup, or u
-        // element with exactly one attribute, which is style, which sets no CSS
-        // properties (including invalid or unrecognized properties)."
-        if (attrName == "style" && el.style.cssText.length == 0) {
-            return true;
-        }
-
-        // "It is an a element with exactly one attribute, which is href."
-        if (tagName == "a" && attrName == "href") {
-            return true;
-        }
-
-        // "It is a font element with exactly one attribute, which is either color,
-        // face, or size."
-        if (tagName == "font" && /^(color|face|size)$/.test(attrName)) {
-            return true;
-        }
-
-        // Check style attribute and bail out if it has more than one property
-        if (attrName != "style" || !/^[a-z\-]+:[^;]+;?\s?$/i.test(el.style.cssText)) {
-            return false;
-        }
-
-        // "It is a b or strong element with exactly one attribute, which is style,
-        // and the style attribute sets exactly one CSS property (including invalid
-        // or unrecognized properties), which is "font-weight"."
-
-        if ((tagName == "b" || tagName == "strong") && el.style.fontWeight != "") {
-            return true;
-        }
-
-        // "It is an i or em element with exactly one attribute, which is style,
-        // and the style attribute sets exactly one CSS property (including invalid
-        // or unrecognized properties), which is "font-style"."
-        if ((tagName == "i" || tagName == "em") && el.style.fontStyle != "") {
-            return true;
-        }
-
-        // "It is a sub or sub element with exactly one attribute, which is style,
-        // and the style attribute sets exactly one CSS property (including invalid
-        // or unrecognized properties), which is "vertical-align"."
-        if ((tagName == "sub" || tagName == "sup") && el.style.verticalAlign != "") {
-            return true;
-        }
-
-        // "It is an a, font, or span element with exactly one attribute, which is
-        // style, and the style attribute sets exactly one CSS property (including
-        // invalid or unrecognized properties), and that property is not
-        // "text-decoration"."
-        if ((tagName == "a" || tagName == "font" || tagName == "span") && el.style.textDecoration == "") {
-            return true;
-        }
-
-        // "It is an a, font, s, span, strike, or u element with exactly one
-        // attribute, which is style, and the style attribute sets exactly one CSS
-        // property (including invalid or unrecognized properties), which is
-        // "text-decoration", which is set to "line-through" or "underline" or
-        // "overline" or "none"."
-        if (/^(a|font|s|span|strike|u)$/.test(tagName) && /^(line-through|underline|overline|none)$/.test(el.style.textDecoration)) {
-            return true;
-        }
-
-        return false;
-    }
-
-/*
-    function isIgnoredNode(node, options) {
-        // Ignore comment nodes
-        if (node.nodeType == 8) {
-            return true;
-        } else if (node.nodeType == 3) {
-            // Ignore text nodes that are within <script> and <style> elements
-            if (node.parentNode && /^(script|style)$/i.test(node.parentNode.tagName)) {
-                //log.fatal("IGNORED NODE " + dom.inspectNode(node));
-                return true;
-            }
-
-            // Ignore whitespace nodes that are next to an unwrappable element
-            if (options.ignoreWhiteSpace && isUnrenderedWhiteSpaceNode(node)) {
-                return true;
-            }
-        }
-        return false;
-    }
-*/
-
-    function addRangeMove(rangeMoves, range, oldParent, oldIndex, newParent, newIndex) {
-        var sc = range.startContainer, so = range.startOffset,
-            ec = range.endContainer, eo = range.endOffset;
-
-        var newSc = sc, newSo = so, newEc = ec, newEo = eo;
-
-        // "If a boundary point's node is the same as or a descendant of node,
-        // leave it unchanged, so it moves to the new location."
-        //
-        // No modifications necessary.
-
-        // "If a boundary point's node is new parent and its offset is greater than
-        // new index, add one to its offset."
-        if (sc == newParent && so > newIndex) {
-            newSo++;
-        }
-        if (ec == newParent && eo > newIndex) {
-            newEo++;
-        }
-
-        // "If a boundary point's node is old parent and its offset is old index or
-        // old index + 1, set its node to new parent and add new index  old index
-        // to its offset."
-        if (sc == oldParent && (so == oldIndex  || so == oldIndex + 1)) {
-            newSc = newParent;
-            newSo += newIndex - oldIndex;
-        }
-        if (ec == oldParent && (eo == oldIndex || eo == oldIndex + 1)) {
-            newEc = newParent;
-            newEo += newIndex - oldIndex;
-        }
-
-        // "If a boundary point's node is old parent and its offset is greater than
-        // old index + 1, subtract one from its offset."
-        if (sc == oldParent && so > oldIndex + 1) {
-            newSo--;
-        }
-        if (ec == oldParent && eo > oldIndex + 1) {
-            newEo--;
-        }
-
-        if (newSc == sc && newSo == so && newEc == ec && newEo == eo) {
-            rangeMoves.push([range, newSc, newSo, newEc, newEo]);
-        }
-    }
-
-    function movePreservingRanges(node, newParent, newIndex, rangesToPreserve) {
-        // For convenience, allow newIndex to be -1 to mean "insert at the end".
-        if (newIndex == -1) {
-            newIndex = newParent.childNodes.length;
-        }
-
-        // "When the user agent is to move a Node to a new location, preserving
-        // ranges, it must remove the Node from its original parent (if any), then insert it
-        // in the new location. In doing so, however, it must ignore the regular
-        // range mutation rules, and instead follow these rules:"
-
-        // "Let node be the moved Node, old parent and old index be the old parent
-        // and index, and new parent and new index be the new parent and index."
-        var oldParent = node.parentNode;
-        var oldIndex = dom.getNodeIndex(node);
-
-        var rangeMoves = [];
-
-        for (var i = 0, len = rangesToPreserve.length; i < len; ++i) {
-            addRangeMove(rangeMoves, rangesToPreserve[i], oldParent, oldIndex, newParent, newIndex);
-        }
-
-        // Now actually move the node.
-        if (newParent.childNodes.length == newIndex) {
-            newParent.appendChild(node);
-        } else {
-            newParent.insertBefore(node, newParent.childNodes[newIndex]);
-        }
-
-        // Set the new range boundaries
-        log.debug("Node move: ", dom.inspectNode(node), "to", dom.inspectNode(newParent), newIndex);
-        for (var j = 0, rangeMove; rangeMove = rangeMoves[j++]; ) {
-            log.debug("Moving " + rangeMove[0].inspect(), dom.inspectNode(rangeMove[1]), rangeMove[2], dom.inspectNode(rangeMove[3]), rangeMove[4]);
-            rangeMove[0].setStart(rangeMove[1], rangeMove[2]);
-            rangeMove[0].setEnd(rangeMove[3], rangeMove[4]);
-        }
-    }
-
-    function moveChildrenPreservingRanges(node, newParent, newIndex, removeNode, rangesToPreserve) {
-        var child, children = [];
-        while ( (child = node.firstChild) ) {
-            movePreservingRanges(child, newParent, newIndex++, rangesToPreserve);
-            children.push(child);
-        }
-        if (removeNode) {
-            node.parentNode.removeChild(node);
-        }
-        return children;
-    }
-
-    function replaceWithOwnChildren(element, rangesToPreserve) {
-        return moveChildrenPreservingRanges(element, element.parentNode, dom.getNodeIndex(element), true, rangesToPreserve);
-    }
-
-    function copyAttributes(fromElement, toElement) {
-        var attrs = fromElement.attributes;
-
-        for (var i = 0, len = attrs.length; i < len; ++i) {
-            if (attrs[i].specified) {
-                // For IE, which doesn't allow copying of the entire style object using get/setAttribute
-                if (attrs[i].name == "style") {
-                    toElement.style.cssText = toElement.style.cssText;
-                } else {
-                    toElement.setAttribute(attrs[i].name, attrs[i].value);
-                }
-            }
-        }
-    }
-
-    /**
-     * "effective value" per edit command spec
-     */
-    function getEffectiveCommandValue(node, context) {
-        var isElement = (node.nodeType == 1);
-
-        // "If neither node nor its parent is an Element, return null."
-        if (!isElement && (!node.parentNode || node.parentNode.nodeType != 1)) {
-            return null;
-        }
-
-        // "If node is not an Element, return the effective command value of its parent for command."
-        if (!isElement) {
-            return getEffectiveCommandValue(node.parentNode, context);
-        }
-
-        return context.command.getEffectiveValue(node, context);
-    }
-
-/*
-    // "An extraneous line break is a br that has no visual effect, in that
-    // removing it from the DOM would not change layout, except that a br that is
-    // the sole child of an li is not extraneous."
-    function isExtraneousLineBreak(br) {
-        if (!isHtmlElement(br, "br")) {
-            return false;
-        }
-
-        var ref = br.parentNode;
-        if (isHtmlElement(ref, "li") && ref.childNodes.length == 1) {
-            return false;
-        }
-
-        while (isInlineNode(ref)) {
-            ref = ref.parentNode;
-        }
-
-        var origHeight = ref.offsetHeight;
-        if (origHeight == 0) {
-            throw "isExtraneousLineBreak: original height is zero, bug?";
-        }
-        var styleAttr = br.attributes["style"];
-        var originalStyle = null;
-        if (styleAttr && styleAttr.specified) {
-            originalStyle = br.style.cssText;
-        }
-        br.style.display = "none";
-        var finalHeight = ref.offsetHeight;
-        if (originalStyle === null) {
-            br.style.cssText = "";
-            br.removeAttribute("style");
-        } else {
-            br.style.cssText = originalStyle;
-        }
-
-        return origHeight == finalHeight;
-    }
-*/
-
-    function removeExtraneousLineBreaksBefore(node) {
-        var ref;
-
-        // "Let ref be the previousSibling of node. If ref is null, abort these steps."
-        if (!node || !(ref = node.previousSibling)) {
-            return;
-        }
-
-        // "While ref has children, set ref to its lastChild."
-        while (ref.hasChildNodes()) {
-            ref = ref.lastChild;
-        }
-
-        // "While ref is invisible but not an extraneous line break, and ref does
-        // not equal node's parent, set ref to the node before it in tree order."
-        while (isInvisible(ref)
-        && !isExtraneousLineBreak(ref)
-        && ref != node.parentNode) {
-            ref = previousNode(ref);
-        }
-
-        // "If ref is an editable extraneous line break, remove it from its
-        // parent."
-        if (isEditable(ref)
-        && isExtraneousLineBreak(ref)) {
-            ref.parentNode.removeChild(ref);
-        }
-
-        
-
-        // "If node is not an Element, or it is an inline node, do nothing and
-        // abort these steps."
-        if (!node || node.nodeType != 1 || isInlineNode(node)) {
-            return;
-        }
-
-        // "If the previousSibling of node is a br, and the previousSibling of the
-        // previousSibling of node is an inline node that is not a br, remove the
-        // previousSibling of node from its parent."
-        var previousSibling = node.previousSibling, previousSiblingPreviousSibling;
-        if (isHtmlElement(previousSibling, "br")
-                && isInlineNode( (previousSiblingPreviousSibling = node.previousSibling.previousSibling) )
-                && !isHtmlElement(previousSiblingPreviousSibling, "br")) {
-            node.parentNode.removeChild(previousSibling);
-        }
-    }
-
-    function removeExtraneousLineBreaksAtTheEndOf(node) {
-        // "If node is not an Element, or it is an inline node, do nothing and
-        // abort these steps."
-        if (!node || node.nodeType != 1 || isInlineNode(node)) {
-            return;
-        }
-
-        // "If node has at least two children, and its last child is a br, and its
-        // second-to-last child is an inline node that is not a br, remove the last
-        // child of node from node."
-        var lastChild = node.lastChild, lastChildPreviousSibling;
-        if (node.childNodes.length >= 2 && isHtmlElement(node.lastChild, "br")
-                && isInlineNode( (lastChildPreviousSibling = node.lastChild.previousSibling) )
-                && !isHtmlElement(lastChildPreviousSibling, "br")) {
-            node.removeChild(lastChild);
-        }
-    }
-
-    // "To remove extraneous line breaks from a node, first remove extraneous line
-    // breaks before it, then remove extraneous line breaks at the end of it."
-    function removeExtraneousLineBreaksFrom(node) {
-        removeExtraneousLineBreaksBefore(node);
-        removeExtraneousLineBreaksAtTheEndOf(node);
-    }
-
-    function setTagName(element, newName, rangesToPreserve) {
-        // "If element is an HTML element with local name equal to new name, return element."
-        // "If element's parent is null, return element."
-        if (isHtmlElement(element, newName) || !element.parentNode) {
-            return element;
-        }
-
-        // "Let replacement element be the result of calling createElement(new
-        // name) on the ownerDocument of element."
-        var replacementElement = dom.getDocument(element).createElement(newName);
-
-        // "Insert replacement element into element's parent immediately before
-        // element."
-        element.parentNode.insertBefore(replacementElement, element);
-
-        // "Copy all attributes of element to replacement element, in order."
-        copyAttributes(element, replacementElement);
-
-        // "While element has children, append the first child of element as the
-        // last child of replacement element, preserving ranges."
-        // "Remove element from its parent."
-        moveChildrenPreservingRanges(element, replacementElement, 0, true, rangesToPreserve);
-
-        // "Return replacement element."
-        return replacementElement;
-    }
-
-    function clearValue(element, context) {
-        var command = context.command, rangesToPreserve = context.rangesToPreserve;
-
-        log.info("clearValue", outerHtml(element), command.getSpecifiedValue(element, context))
-
-        // "If element is not editable, return the empty list."
-        if (!isEditable(element, context.options)) {
-            return [];
-        }
-
-        // "If element's specified value for command is null, return the empty
-        // list."
-        if (command.getSpecifiedValue(element, context) === null) {
-            return [];
-        }
-
-        // "If element is a simple modifiable element:"
-        if (isSimpleModifiableElement(element, context)) {
-            return replaceWithOwnChildren(element, rangesToPreserve);
-        }
-
-        // Do command-specific clearing
-        if (command.clearValue) {
-            command.clearValue(element, context);
-        }
-
-        // "If element's specified value for command is null, return the empty
-        // list."
-        if (command.getSpecifiedValue(element, context) === null) {
-            return [];
-        }
-
-        // "Set the tag name of element to "span", and return the one-node list
-        // consisting of the result."
-        return [setTagName(element, "span", rangesToPreserve)];
-    }
-
-    var defaultSiblingCriteria = function() { return false };
-    var defaultNewParentInstructions = function() { return null };
-
-    function wrap(nodeList, context, siblingCriteria, newParentInstructions) {
-        // "If not provided, sibling criteria match nothing and new parent
-        // instructions return null."
-        siblingCriteria = siblingCriteria || defaultSiblingCriteria;
-        newParentInstructions = newParentInstructions || defaultNewParentInstructions;
-
-        var firstNode = nodeList[0];
-        var options = context.options, rangesToPreserve = context.rangesToPreserve;
-        var i, len, range;
-
-        // "If node list is empty, or the first member of node list is not
-        // editable, return null and abort these steps."
-        if (!nodeList.length || !isEditable(firstNode, options)) {
-            return null;
-        }
-
-        var lastNode = nodeList[nodeList.length - 1];
-
-        // "If node list's last member is an inline node that's not a br, and node
-        // list's last member's nextSibling is a br, append that br to node list."
-        if (isInlineNode(lastNode) && !isHtmlElement(lastNode, "br") && isHtmlElement(lastNode.nextSibling, "br")) {
-            nodeList.push(lastNode.nextSibling);
-        }
-
-        // "If the previousSibling of the first member of node list is editable and
-        // meets the sibling criteria, let new parent be the previousSibling of the
-        // first member of node list."
-        var newParent, nodePriorToFirstNode = firstNode.previousSibling, nodeAfterLastNode = lastNode.nextSibling;
-
-        if (isEditable(nodePriorToFirstNode, options) && siblingCriteria(nodePriorToFirstNode)) {
-            newParent = nodePriorToFirstNode;
-
-        // "Otherwise, if the nextSibling of the last member of node list is
-        // editable and meets the sibling criteria, let new parent be the
-        // nextSibling of the last member of node list."
-        } else if (isEditable(nodeAfterLastNode, options) && siblingCriteria(nodeAfterLastNode)) {
-            newParent = nodeAfterLastNode;
-
-        // "Otherwise, run the new parent instructions, and let new parent be the
-        // result."
-        } else {
-            newParent = newParentInstructions();
-        }
-
-        // "If new parent is null, abort these steps and return null."
-        if (!newParent) {
-            return null;
-        }
-
-        var doc = dom.getDocument(newParent);
-        var newParentParent = newParent.parentNode, firstNodeParent = firstNode.parentNode;
-
-        // "If new parent's parent is null:"
-        if (!newParentParent) {
-            // "Insert new parent into the parent of the first member of node list
-            // immediately before the first member of node list."
-            firstNodeParent.insertBefore(newParent, firstNode);
-
-            // "If any range has a boundary point with node equal to the parent of
-            // new parent and offset equal to the index of new parent, add one to
-            // that boundary point's offset."
-
-            // Preserve only the ranges passed in
-            var newParentNodeIndex = dom.getNodeIndex(newParent);
-            for (i = 0; range = rangesToPreserve[i++]; ) {
-                if (range.startContainer == newParentParent && range.startOffset == newParentNodeIndex) {
-                    range.setStart(range.startContainer, range.startOffset + 1);
-                }
-                if (range.endContainer == newParentParent && range.endOffset == newParentNodeIndex) {
-                    range.setEnd(range.endContainer, range.endOffset + 1);
-                }
-            }
-        }
-
-        // "Let original parent be the parent of the first member of node list."
-
-        // "If new parent is before the first member of node list in tree order:"
-        if (isBefore(newParent, firstNode)) {
-            // "If new parent is not an inline node, but the last child of new
-            // parent and the first member of node list are both inline nodes, and
-            // the last child of new parent is not a br, call createElement("br")
-            // on the ownerDocument of new parent and append the result as the last
-            // child of new parent."
-            if (!isInlineNode(newParent) && isInlineNode(newParent.lastChild) && isInlineNode(firstNode)
-                    && !isHtmlElement(newParent.lastChild, "br")) {
-                newParent.appendChild(doc.createElement("br"));
-            }
-
-            // "For each node in node list, append node as the last child of new
-            // parent, preserving ranges."
-            for (i = 0, len = nodeList.length; i < len; ++i) {
-                movePreservingRanges(nodeList[i], newParent, -1, rangesToPreserve);
-            }
-
-        // "Otherwise:"
-        } else {
-            // "If new parent is not an inline node, but the first child of new
-            // parent and the last member of node list are both inline nodes, and
-            // the last member of node list is not a br, call createElement("br")
-            // on the ownerDocument of new parent and insert the result as the
-            // first child of new parent."
-            if (!isInlineNode(newParent) && isInlineNode(newParent.firstChild) && isInlineNode(lastNode)
-                    && !isHtmlElement(lastNode, "br")) {
-                newParent.insertBefore(doc.createElement("br"), newParent.firstChild);
-            }
-
-            // "For each node in node list, in reverse order, insert node as the
-            // first child of new parent, preserving ranges."
-            for (i = nodeList.length - 1; i >= 0; i--) {
-                movePreservingRanges(nodeList[i], newParent, 0, rangesToPreserve);
-            }
-        }
-
-        // "If original parent is editable and has no children, remove it from its
-        // parent."
-        if (isEditable(firstNodeParent, options) && !firstNodeParent.hasChildNodes()) {
-            firstNodeParent.parentNode.removeChild(firstNodeParent);
-        }
-
-        // "If new parent's nextSibling is editable and meets the sibling
-        // criteria:"
-        var newParentNextSibling = newParent.nextSibling;
-        if (isEditable(newParentNextSibling, options) && siblingCriteria(newParentNextSibling)) {
-            // "If new parent is not an inline node, but new parent's last child
-            // and new parent's nextSibling's first child are both inline nodes,
-            // and new parent's last child is not a br, call createElement("br") on
-            // the ownerDocument of new parent and append the result as the last
-            // child of new parent."
-            if (!isInlineNode(newParent) && isInlineNode(newParent.lastChild)
-                    && isInlineNode(newParentNextSibling.firstChild) && !isHtmlElement(newParent.lastChild, "br")) {
-                newParent.appendChild(doc.createElement("br"));
-            }
-
-            // "While new parent's nextSibling has children, append its first child
-            // as the last child of new parent, preserving ranges."
-            while (newParentNextSibling.hasChildNodes()) {
-                movePreservingRanges(newParentNextSibling.firstChild, newParent, -1, rangesToPreserve);
-            }
-
-            // "Remove new parent's nextSibling from its parent."
-            newParent.parentNode.removeChild(newParentNextSibling);
-        }
-
-        // "Remove extraneous line breaks from new parent."
-        removeExtraneousLineBreaksFrom(newParent);
-
-        // "Return new parent."
-        return newParent;
-    }
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    function Command() {}
-
-    Command.prototype = {
-        getSpecifiedValue: function() {
-            return null;
-        },
-
-        getEffectiveValue: function(element, context) {
-            return null;
-        },
-
-        createCssElement: null,
-        createNonCssElement: null,
-        styleCssElement: null,
-        hasSpecialSpanStyling: null,
-        styleSpanChildElement: null,
-        isSimpleModifiableElement: null,
-        defaultOptions: null,
-        addDefaultOptions: null,
-
-        valuesEqual: function(val1, val2) {
-            return val1 === val2;
-        },
-
-        createContext: function(value, rangesToPreserve, options) {
-            var defaultOptions = this.defaultOptions;
-            if (defaultOptions) {
-                for (var i in defaultOptions) {
-                    if (defaultOptions.hasOwnProperty(i) && !options.hasOwnProperty(i)) {
-                        options[i] = defaultOptions[i];
-                    }
-                }
-            }
-            return {
-                command: this,
-                value: value,
-                rangesToPreserve: rangesToPreserve || [],
-                options: options || {}
-            };
-        },
-
-        getSelectionValue: function(/*sel, context*/) {
-            return null;
-        },
-
-        getNewRangeValue: function(/*range, context*/) {
-            return null;
-        },
-
-        getNewSelectionValue: function(/*sel, context*/) {
-            return null;
-        },
-
-        applyToRange: function(doc, value, options, range) {
-            var context = this.createContext(value, [range], options);
-            context.value = this.getNewRangeValue(range, context);
-            this.applyValueToRange(range, context);
-        },
-
-        applyToSelection: function(doc, value, options) {
-            var win = dom.getWindow(doc);
-            var sel = api.getSelection(win);
-            var selRanges = sel.getAllRanges();
-            var context = this.createContext(value, selRanges, options);
-            context.value = this.getNewSelectionValue(sel, context);
-
-            for (var i = 0, len = selRanges.length; i < len; ++i) {
-                this.applyValueToRange(selRanges[i], context);
-            }
-
-            sel.setRanges(selRanges);
-        }
-    };
-
-    Command.util = {
-        getComputedStyleProperty: getComputedStyleProperty,
-        getFurthestAncestor: getFurthestAncestor,
-        isContained: isContained,
-        isEffectivelyContained: isEffectivelyContained,
-        isHtmlNode: isHtmlNode,
-        isHtmlElement: isHtmlElement,
-        isBlockNode: isBlockNode,
-        isInlineNode: isInlineNode,
-/*
-        blockExtend: blockExtend,
-*/
-        isModifiableElement: isModifiableElement,
-        isSimpleModifiableElement: isSimpleModifiableElement,
-        moveChildrenPreservingRanges: moveChildrenPreservingRanges,
-        replaceWithOwnChildren: replaceWithOwnChildren,
-        copyAttributes: copyAttributes,
-        clearValue: clearValue,
-        getEffectiveTextNodes: getEffectiveTextNodes,
-        getEffectivelyContainedElements: getEffectivelyContainedElements,
-/*
-        getEffectiveValue: getEffectiveValue,
-        setNodeValue: setNodeValue,
-*/
-        wrap: wrap
-/*
-        decomposeRange: decomposeRange,
-*/
-
-    };
-
-
-    api.Command = Command;
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    function SimpleInlineCommand() {}
-
-    SimpleInlineCommand.prototype = new Command();
-
-    api.util.extend(SimpleInlineCommand.prototype, {
-        getEffectiveValue: function(element) {
-            return getComputedStyleProperty(element, this.relevantCssProperty);
-        },
-
-        clearValue: function(element) {
-            element.style[this.relevantCssProperty] = "";
-            if (element.style.cssText == "") {
-                element.removeAttribute("style");
-            }
-        }
-    });
-
-    SimpleInlineCommand.create = function(commandConstructor, properties) {
-        var proto = new Command();
-        commandConstructor.prototype = proto;
-        api.util.extend(proto, properties);
-    };
-
-    api.SimpleInlineCommand = SimpleInlineCommand;
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    var commandsByName = {};
-
-    api.registerCommand = function(name, command) {
-        if (!(command instanceof Command)) {
-            throw module.createError("registerCommand(): Object supplied is not a Command");
-        }
-        commandsByName[name.toLowerCase()] = command;
-    };
-
-    function getCommand(name) {
-        var lowerName = name.toLowerCase();
-        if (commandsByName.hasOwnProperty(lowerName)) {
-            return commandsByName[lowerName];
-        } else {
-            throw module.createError("getCommand(): No command registered with the name '" + name + "'");
-        }
-    }
-
-    api.execCommand = function(name, options, range) {
-        options = options || {};
-        var doc = options.hasOwnProperty("document") ? options.document : document;
-        var value = options.hasOwnProperty("value") ? options.value : null;
-        var command = getCommand(name);
-        if (range) {
-            command.applyToRange(doc, value, options, range);
-        } else {
-            command.applyToSelection(doc, value, options);
-        }
-    };
-
-    api.queryCommandValue = function(name, options, range) {
-        options = options || {};
-        var win = options.hasOwnProperty("document") ? dom.getWindow(options.document) : window;
-        var value = options.hasOwnProperty("value") ? options.value : null;
-        var command = getCommand(name);
-        var sel = api.getSelection(win);
-        var context = command.createContext(value, null, options);
-
-        return command.getSelectionValue(sel, context);
-    };
-
-    api.getCommand = getCommand;
+/**
+ * Commands module for Rangy.
+ * Provides replacements for many document.execCommand() commands, applicable to Ranges and Selections.
+ *
+ * Part of Rangy, a cross-browser JavaScript range and selection library
+ * http://code.google.com/p/rangy/
+ *
+ * Depends on Rangy core.
+ *
+ * Algorithm is based on Aryeh Gregor's HTML Editing Commands specification
+ * http://aryeh.name/gitweb.cgi?p=editcommands;a=blob_plain;f=editcommands.html;hb=HEAD
+ *
+ * Parts of this code are based on Aryeh Gregor's implementation of his algorithm
+ * http://aryeh.name/spec/editcommands/autoimplementation.html
+ *
+ * Copyright %%build:year%%, Tim Down
+ * Licensed under the MIT license.
+ * Version: %%build:version%%
+ * Build date: %%build:date%%
+ */
+rangy.createModule("Commands", ["WrappedSelection"], function(api, module) {
+    /*
+    http://aryeh.name/spec/editcommands/autoimplementation.html
+    https://bitbucket.org/ms2ger/dom-range/src/tip/test/
+    http://aryeh.name/gitweb.cgi?p=editcommands;a=blob_plain;f=editcommands.html;hb=HEAD
+     */
+
+    var dom = api.dom;
+    var log = log4javascript.getLogger("rangy.commands");
+    var BOOLEAN = "boolean", UNDEF = "undefined";
+    var getRootContainer = dom.getRootContainer;
+
+    var defaultOptions = {
+        applyToEditableOnly: false,
+        styleWithCss: false,
+        ignoreInvisibleNodes: true
+    };
+
+    var getComputedStyleProperty;
+
+    if (typeof window.getComputedStyle != UNDEF) {
+        getComputedStyleProperty = function(el, propName) {
+            return dom.getWindow(el).getComputedStyle(el, null)[propName];
+        };
+    } else if (typeof document.documentElement.currentStyle != UNDEF) {
+        getComputedStyleProperty = function(el, propName) {
+            return el.currentStyle[propName];
+        };
+    } else {
+        module.fail("No means of obtaining computed style properties found");
+    }
+
+    function isBefore(nodeA, nodeB) {
+        var parentA = nodeA.parentNode, parentB = nodeB.parentNode;
+        if (parentA && parentB) {
+            return dom.comparePoints(nodeA.parentNode, dom.getNodeIndex(nodeA), nodeB.parentNode, dom.getNodeIndex(nodeB)) == -1;
+        } else {
+            return !parentA;
+        }
+    }
+
+    function outerHtml(node) {
+        if (node === null) {
+            return "null";
+        } else if (node.nodeType == 3) {
+            return node.data;
+        } else {
+            var div = dom.getDocument(node).createElement("div");
+            div.appendChild(node.cloneNode(true));
+            return div.innerHTML;
+        }
+    }
+
+    var toArray = util.toArray;
+
+    /**
+     * Returns the furthest ancestor of a Node as defined by DOM Range.
+     */
+    function getFurthestAncestor(node) {
+        var root = node;
+        while (root.parentNode != null) {
+            root = root.parentNode;
+        }
+        return root;
+    }
+
+    function getAncestors(node) {
+        var ancestors = [];
+        while ( (node = node.parentNode) ) {
+            ancestors.unshift(node);
+        }
+        return ancestors;
+    }
+
+/*
+    function getAncestorsAndSelf(node) {
+        var ancestors = getAncestors(node);
+        ancestors.push(node);
+        return ancestors;
+    }
+*/
+
+    function hasAncestor(node, matcher) {
+        while ( (node = node.parentNode) ) {
+            if (matcher(node)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    function isOrHasAncestor(node, matcher) {
+        return matcher(node) || hasAncestor(node, matcher);
+    }
+
+    function nextNodeDescendants(node) {
+        while (node && !node.nextSibling) {
+            node = node.parentNode;
+        }
+        if (!node) {
+            return null;
+        }
+        return node.nextSibling;
+    }
+
+    function nextNode(node) {
+        if (node.hasChildNodes()) {
+            return node.firstChild;
+        }
+        return nextNodeDescendants(node);
+    }
+
+    function previousNode(node) {
+        var previous = node.previousSibling;
+        if (previous) {
+            node = previous;
+            while (node.hasChildNodes()) {
+                node = node.lastChild;
+            }
+            return node;
+        }
+        var parent = node.parentNode;
+        if (parent && parent.nodeType == 1) {
+            return parent;
+        }
+        return null;
+    }
+
+    var isEditableElement;
+
+    (function() {
+        var testEl = document.createElement("div");
+        if (typeof testEl.isContentEditable == BOOLEAN) {
+            isEditableElement = function(node) {
+                return node && node.nodeType == 1 && node.isContentEditable;
+            };
+        } else {
+            isEditableElement = function(node) {
+                if (!node || node.nodeType != 1 || node.contentEditable == "false") {
+                    return false;
+                }
+                return node.contentEditable == "true" || isEditableElement(node.parentNode);
+            };
+        }
+    })();
+
+    // The spec says "An editing host is a node that is either an Element with a contenteditable
+    // attribute set to the true state, or the Element child of a Document whose designMode is enabled."
+    //
+    // Because Safari returns "true" for the contentEditable property of an element that actually inherits its
+    // editability from its parent, we use a different definition:
+    //
+    // "An editing host is a node that is either an Element with a contenteditable attribute set to the true state but
+    // whose parent node is not an element or has a contenteditable attribute set to a value other than the true state,
+    // or the Element child of a Document whose designMode is enabled."
+    function isEditingHost(node) {
+        var parent;
+        return node && node.nodeType == 1 &&
+            (( (parent = node.parentNode) && parent.nodeType == 9 && parent.designMode == "on") ||
+            (isEditableElement(node) && !isEditableElement(node.parentNode)));
+    }
+
+    // The spec says "Something is editable if it is a node which is not an editing host, does
+    // not have a contenteditable attribute set to the false state, and whose
+    // parent is an editing host or editable."
+    //
+    // We're not making any distinction, unless the applyToEditableOnly global option is set to true. Rangy commands can
+    // run on non-editable content. The revised definition:
+    //
+    // "A node is editable if it is not an editing host and is or is the child of an Element whose isContentEditable
+    // property returns true."
+    function isEditable(node, options) {
+        return node &&
+            ((options && !options.applyToEditableOnly)
+                || (((isEditableElement(node) || (node.nodeType != 1 && isEditableElement(node.parentNode)))
+                     && !isEditingHost(node) ) ));
+    }
+
+    // "contained" as defined by DOM Range: "A Node node is contained in a range
+    // range if node's furthest ancestor is the same as range's root, and (node, 0)
+    // is after range's start, and (node, length of node) is before range's end."
+    function isContained(node, range) {
+        return getRootContainer(node) == getRootContainer(range.startContainer)
+            && dom.comparePoints(node, 0, range.startContainer, range.startOffset) == 1
+            && dom.comparePoints(node, dom.getNodeLength(node), range.endContainer, range.endOffset) == -1;
+    }
+
+
+    // "A node node is effectively contained in a range range if at least one of
+    // the following holds:"
+    function isEffectivelyContained(node, range) {
+        if (range.collapsed) {
+            return false;
+        }
+
+        // "node is contained in range."
+        if (isContained(node, range)) {
+            return true;
+        }
+
+        var sc = range.startContainer, so = range.startOffset;
+        var ec = range.endContainer, eo = range.endOffset;
+
+        // "node is range's start node, it is a Text node, its length is different
+        // from range's start offset."
+        var isCharData = dom.isCharacterDataNode(node);
+        if (node == sc && isCharData && dom.getNodeLength(node) != so) {
+            return true;
+        }
+
+        // "node is range's end node, it is a Text node, range's end offset is not
+        // 0."
+        if (node == ec && isCharData && eo != 0) {
+            return true;
+        }
+
+        // "node has at least one child; and all its children are effectively
+        // contained in range; and either range's start node is not a descendant of
+        // node or is not a Text node or range's start offset is zero or range is
+        // collapsed; and either range's end node is not a descendant of node or is
+        // not a Text node or range's end offset is its end node's length."
+        var children = node.childNodes, childCount = children.length;
+        if (childCount != 0) {
+            for (var i = 0; i < childCount; ++i) {
+                if (!isEffectivelyContained(children[i], range)) {
+                    return false;
+                }
+            }
+            if ((!dom.isAncestorOf(node, sc) || sc.nodeType != 3 || so == 0)
+                    && (!dom.isAncestorOf(node, ec) || ec.nodeType != 3 || eo == dom.getNodeLength(ec))) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    // Opera 11 puts HTML elements in the null namespace, it seems, and IE 7 has undefined namespaceURI
+    function isHtmlNode(node) {
+        var ns;
+        return typeof (ns = node.namespaceURI) == UNDEF || (ns === null || ns == "http://www.w3.org/1999/xhtml");
+    }
+
+    function isHtmlElement(node, tagNames) {
+        if (!node || node.nodeType != 1 || !isHtmlNode(node)) {
+            return false;
+        }
+        switch (typeof tagNames) {
+            case "string":
+                return node.tagName.toLowerCase() == tagNames.toLowerCase();
+            case "object":
+                return new RegExp("^(" + tagNames.join(",") + ")$", "i").test(node.tagName);
+            default:
+                return true;
+        }
+    }
+
+    var unwrappableTagNamesRegex = /^(h[1-6]|p|hr|pre|blockquote|ol|ul|li|dl|dt|dd|div|table|caption|colgroup|col|tbody|thead|tfoot|tr|th|td|address)$/i;
+    var inlineDisplayRegex = /^(none|inline(-block|-table)?)$/i;
+
+    // "A block node is either an Element whose "display" property does not have
+    // resolved value "inline" or "inline-block" or "inline-table" or "none", or a
+    // Document, or a DocumentFragment."
+    function isBlockNode(node) {
+        if (!node) {
+            return false;
+        }
+        var nodeType = node.nodeType;
+        return nodeType == 1 && !inlineDisplayRegex.test(getComputedStyleProperty(node, "display"))
+            || nodeType == 9 || nodeType == 11;
+    }
+
+    // "An inline node is a node that is not a block node."
+    function isInlineNode(node) {
+        return node && !isBlockNode(node);
+    }
+
+    // "A collapsed line break is a br that begins a line box which has nothing
+    // else in it, and therefore has zero height."
+    function isCollapsedLineBreak(br) {
+        if (!isHtmlElement(br, "br")) {
+            return false;
+        }
+
+        // Add a zwsp after it and see if that changes the height of the nearest
+        // non-inline parent.  Note: this is not actually reliable, because the
+        // parent might have a fixed height or something.
+        var ref = br.parentNode;
+        while (getComputedStyleProperty(ref, "display") == "inline") {
+            ref = ref.parentNode;
+        }
+        var refStyle = ref.hasAttribute("style") ? ref.getAttribute("style") : null;
+        ref.style.height = "auto";
+        ref.style.maxHeight = "none";
+        ref.style.minHeight = "0";
+        var space = document.createTextNode("\u200b");
+        var origHeight = ref.offsetHeight;
+        if (origHeight == 0) {
+            throw "isCollapsedLineBreak: original height is zero, bug?";
+        }
+        br.parentNode.insertBefore(space, br.nextSibling);
+        var finalHeight = ref.offsetHeight;
+        space.parentNode.removeChild(space);
+        if (refStyle === null) {
+            // Without the setAttribute() line, removeAttribute() doesn't work in
+            // Chrome 14 dev.  I have no idea why.
+            ref.setAttribute("style", "");
+            ref.removeAttribute("style");
+        } else {
+            ref.setAttribute("style", refStyle);
+        }
+
+        // Allow some leeway in case the zwsp didn't create a whole new line, but
+        // only made an existing line slightly higher.  Firefox 6.0a2 shows this
+        // behavior when the first line is bold.
+        return origHeight < finalHeight - 5;
+    }
+
+    // "An extraneous line break is a br that has no visual effect, in that
+    // removing it from the DOM would not change layout, except that a br that is
+    // the sole child of an li is not extraneous."
+    //
+    // FIXME: This doesn't work in IE, since IE ignores display: none in
+    // contenteditable.
+    function isExtraneousLineBreak(br) {
+        if (!isHtmlElement(br, "br")) {
+            return false;
+        }
+
+        if (isHtmlElement(br.parentNode, "li")
+        && br.parentNode.childNodes.length == 1) {
+            return false;
+        }
+
+        // Make the line break disappear and see if that changes the block's
+        // height.  Yes, this is an absurd hack.  We have to reset height etc. on
+        // the reference node because otherwise its height won't change if it's not
+        // auto.
+        var ref = br.parentNode;
+        while (getComputedStyle(ref).display == "inline") {
+            ref = ref.parentNode;
+        }
+        var refStyle = ref.hasAttribute("style") ? ref.getAttribute("style") : null;
+        ref.style.height = "auto";
+        ref.style.maxHeight = "none";
+        ref.style.minHeight = "0";
+        var brStyle = br.hasAttribute("style") ? br.getAttribute("style") : null;
+        var origHeight = ref.offsetHeight;
+        if (origHeight == 0) {
+            throw "isExtraneousLineBreak: original height is zero, bug?";
+        }
+        br.setAttribute("style", "display:none");
+        var finalHeight = ref.offsetHeight;
+        if (refStyle === null) {
+            // Without the setAttribute() line, removeAttribute() doesn't work in
+            // Chrome 14 dev.  I have no idea why.
+            ref.setAttribute("style", "");
+            ref.removeAttribute("style");
+        } else {
+            ref.setAttribute("style", refStyle);
+        }
+        if (brStyle === null) {
+            br.removeAttribute("style");
+        } else {
+            br.setAttribute("style", brStyle);
+        }
+
+        return origHeight == finalHeight;
+    }
+
+    // "A whitespace node is either a Text node whose data is the empty string; or
+    // a Text node whose data consists only of one or more tabs (0x0009), line
+    // feeds (0x000A), carriage returns (0x000D), and/or spaces (0x0020), and whose
+    // parent is an Element whose resolved value for "white-space" is "normal" or
+    // "nowrap"; or a Text node whose data consists only of one or more tabs
+    // (0x0009), carriage returns (0x000D), and/or spaces (0x0020), and whose
+    // parent is an Element whose resolved value for "white-space" is "pre-line"."
+    function isWhitespaceNode(node) {
+        if (!node || node.nodeType != 3) {
+            return false;
+        }
+        var text = node.data
+        if (text == "") {
+            return true;
+        }
+        var parent = node.parentNode;
+        if (!parent || parent.nodeType != 1) {
+            return false;
+        }
+        var computedWhiteSpace = getComputedStyleProperty(node.parentNode, "whiteSpace");
+
+        return (/^[\t\n\r ]+$/.test(text) && /^(normal|nowrap)$/.test(computedWhiteSpace)) ||
+            (/^[\t\r ]+$/.test(text) && computedWhiteSpace == "pre-line");
+    }
+
+    // "node is a collapsed whitespace node if the following algorithm returns
+    // true:"
+    function isCollapsedWhitespaceNode(node) {
+        // "If node is not a whitespace node, return false."
+        if (!isWhitespaceNode(node)) {
+            return false;
+        }
+
+        // "If node's data is the empty string, return true."
+        if (node.data == "") {
+            return true;
+        }
+
+        // "Let ancestor be node's parent."
+        var ancestor = node.parentNode;
+
+        // "If ancestor is null, return true."
+        if (!ancestor) {
+            return true;
+        }
+
+        // "If the "display" property of some ancestor of node has resolved value
+        // "none", return true."
+        if (hasAncestor(node, function(ancestor) {
+            return ancestor.nodeType == 1 && getComputedStyleProperty(ancestor, "display") == "none";
+        })) {
+            return true;
+        }
+
+        // "While ancestor is not a block node and its parent is not null, set
+        // ancestor to its parent."
+        while (!isBlockNode(ancestor) && (ancestor = ancestor.parentNode) ) {}
+
+        // "Let reference be node."
+        var reference = node;
+
+        // "While reference is a descendant of ancestor:"
+        while (reference != ancestor) {
+            // "Let reference be the node before it in tree order."
+            reference = previousNode(reference);
+
+            // "If reference is a block node or a br, return true."
+            if (isBlockNode(reference) || isHtmlElement(reference, "br")) {
+                return true;
+            }
+
+            // "If reference is a Text node that is not a whitespace node, or is an
+            // img, break from this loop."
+            if ((reference.nodeType == 3 && !isWhitespaceNode(reference)) || isHtmlElement(reference, "img")) {
+                break;
+            }
+        }
+
+        // "Let reference be node."
+        reference = node;
+
+        // "While reference is a descendant of ancestor:"
+        var stop = nextNodeDescendants(ancestor);
+        while (reference != stop) {
+            // "Let reference be the node after it in tree order, or null if there
+            // is no such node."
+            reference = nextNode(reference);
+
+            // "If reference is a block node or a br, return true."
+            if (isBlockNode(reference) || isHtmlElement(reference, "br")) {
+                return true;
+            }
+
+            // "If reference is a Text node that is not a whitespace node, or is an
+            // img, break from this loop."
+            if ((reference && reference.nodeType == 3 && !isWhitespaceNode(reference))
+            || isHtmlElement(reference, "img")) {
+                break;
+            }
+        }
+
+        // "Return false."
+        return false;
+    }
+
+    // "Something is visible if it is a node that either is a block node, or a Text
+    // node that is not a collapsed whitespace node, or an img, or a br that is not
+    // an extraneous line break, or any node with a visible descendant; excluding
+    // any node with an ancestor container Element whose "display" property has
+    // resolved value "none"."
+    function isVisible(node) {
+        if (!node) {
+            return false;
+        }
+
+        if (isOrHasAncestor(node, function(node) {
+            return node.nodeType == 1 && getComputedStyleProperty(node, "display") == "none";
+        })) {
+            return false;
+        }
+
+        if (isBlockNode(node)
+        || (node.nodeType == 3 && !isCollapsedWhitespaceNode(node))
+        || isHtmlElement(node, "img")
+        || (isHtmlElement(node, "br") && !isExtraneousLineBreak(node))) {
+            return true;
+        }
+
+        for (var i = 0, childNodes = node.childNodes, len = childNodes.length; i < len; ++i) {
+            if (isVisible(childNodes[i])) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    // "Something is invisible if it is a node that is not visible."
+    function isInvisible(node) {
+        return node && !isVisible(node);
+    }
+
+    function getEffectiveTextNodes(range, context) {
+        return range.getNodes([3], function(node) {
+            return isEffectivelyContained(node, range) && (!context.options.ignoreInvisibleNodes || isInvisible(node));
+        });
+    }
+
+    function getEffectivelyContainedElements(range, context) {
+        return range.getNodes([1], function(node) {
+            return isEffectivelyContained(node, range) && (!context.options.ignoreInvisibleNodes || isInvisible(node));
+        });
+    }
+
+    function elementOnlyHasAttributes(el, attrs) {
+        log.debug("elementOnlyHasAttributes. attr length: " + el.attributes.length);
+        for (var i = 0, len = el.attributes.length, attrName; i < len; ++i) {
+            attrName = el.attributes[i].name;
+            //log.info("name: " + attrName + ", specified: " + el.attributes[i].specified);
+            if (el.attributes[i].specified && (!attrs || !dom.arrayContains(attrs, attrName))) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    // "A modifiable element is a b, em, i, s, span, strong, sub, sup, or u element
+    // with no attributes except possibly style; or a font element with no
+    // attributes except possibly style, color, face, and/or size; or an a element
+    // with no attributes except possibly style and/or href."
+    var modifiableElements = "b|em|i|s|span|strike|strong|sub|sup|u";
+    var modifiableElementRegex = new RegExp("^(" + modifiableElements + ")$");
+
+    function isModifiableElement(node, context) {
+        //log.info("isModifiableElement nodeType " + node.nodeType + ", isHtmlNode " + isHtmlNode(node));
+        if (!isHtmlElement(node)) {
+            return false;
+        }
+
+        // Allow commands to define whether an element is modifiable for its purposes
+        if (context && context.command.isModifiableElement) {
+            return context.command.isModifiableElement(el, context);
+        }
+        var tagName = node.tagName.toLowerCase(), allowedAttributes;
+
+        if (modifiableElementRegex.test(tagName)) {
+            allowedAttributes = ["style"];
+        } else if (tagName == "a") {
+            allowedAttributes = ["style", "href"];
+        } else if (tagName == "font") {
+            allowedAttributes = ["style", "color", "face", "size"];
+        } else {
+            return false;
+        }
+        return elementOnlyHasAttributes(node, allowedAttributes);
+    }
+
+    var simpleModifiableElements = modifiableElements + "|a|font";
+    var simpleModifiableElementRegex = new RegExp("^(" + simpleModifiableElements + ")$");
+
+    function isSimpleModifiableElement(el, context) {
+        // "A simple modifiable element is an HTML element for which at least one
+        // of the following holds:"
+        if (!isHtmlElement(el)) {
+            return false;
+        }
+
+        // Allow commands to define whether an element is simply modifiable for its purposes
+        if (context && context.command.isSimpleModifiableElement) {
+            return context.command.isSimpleModifiableElement(el, context);
+        }
+
+        // Only these elements can possibly be a simple modifiable element.
+        var tagName = el.tagName.toLowerCase();
+        if (!simpleModifiableElementRegex.test(tagName)) {
+            return false;
+        }
+
+        // Extract attributes once and quit if more than one is found
+        var attrName, attrValue, hasAnyAttrs = false;
+        for (var i = 0, len = el.attributes.length; i < len; ++i) {
+            //log.info("attr specified: " + el.attributes[i].specified + ", name " + el.attributes[i].name);
+            if (el.attributes[i].specified) {
+                // If it's got more than one attribute, everything after this fails.
+                if (hasAnyAttrs) {
+                    return false;
+                } else {
+                    attrName = el.attributes[i].name;
+                    attrValue = el.getAttribute(attrName);
+                    hasAnyAttrs = true;
+                }
+            }
+        }
+
+        // "It is an a, b, em, font, i, s, span, strike, strong, sub, sup, or u
+        // element with no attributes."
+        if (!hasAnyAttrs) {
+            return true;
+        }
+
+        // "It is an a, b, em, font, i, s, span, strike, strong, sub, sup, or u
+        // element with exactly one attribute, which is style, which sets no CSS
+        // properties (including invalid or unrecognized properties)."
+        if (attrName == "style" && el.style.cssText.length == 0) {
+            return true;
+        }
+
+        // "It is an a element with exactly one attribute, which is href."
+        if (tagName == "a" && attrName == "href") {
+            return true;
+        }
+
+        // "It is a font element with exactly one attribute, which is either color,
+        // face, or size."
+        if (tagName == "font" && /^(color|face|size)$/.test(attrName)) {
+            return true;
+        }
+
+        // Check style attribute and bail out if it has more than one property
+        if (attrName != "style" || !/^[a-z\-]+:[^;]+;?\s?$/i.test(el.style.cssText)) {
+            return false;
+        }
+
+        // "It is a b or strong element with exactly one attribute, which is style,
+        // and the style attribute sets exactly one CSS property (including invalid
+        // or unrecognized properties), which is "font-weight"."
+
+        if ((tagName == "b" || tagName == "strong") && el.style.fontWeight != "") {
+            return true;
+        }
+
+        // "It is an i or em element with exactly one attribute, which is style,
+        // and the style attribute sets exactly one CSS property (including invalid
+        // or unrecognized properties), which is "font-style"."
+        if ((tagName == "i" || tagName == "em") && el.style.fontStyle != "") {
+            return true;
+        }
+
+        // "It is a sub or sub element with exactly one attribute, which is style,
+        // and the style attribute sets exactly one CSS property (including invalid
+        // or unrecognized properties), which is "vertical-align"."
+        if ((tagName == "sub" || tagName == "sup") && el.style.verticalAlign != "") {
+            return true;
+        }
+
+        // "It is an a, font, or span element with exactly one attribute, which is
+        // style, and the style attribute sets exactly one CSS property (including
+        // invalid or unrecognized properties), and that property is not
+        // "text-decoration"."
+        if ((tagName == "a" || tagName == "font" || tagName == "span") && el.style.textDecoration == "") {
+            return true;
+        }
+
+        // "It is an a, font, s, span, strike, or u element with exactly one
+        // attribute, which is style, and the style attribute sets exactly one CSS
+        // property (including invalid or unrecognized properties), which is
+        // "text-decoration", which is set to "line-through" or "underline" or
+        // "overline" or "none"."
+        if (/^(a|font|s|span|strike|u)$/.test(tagName) && /^(line-through|underline|overline|none)$/.test(el.style.textDecoration)) {
+            return true;
+        }
+
+        return false;
+    }
+
+/*
+    function isIgnoredNode(node, options) {
+        // Ignore comment nodes
+        if (node.nodeType == 8) {
+            return true;
+        } else if (node.nodeType == 3) {
+            // Ignore text nodes that are within <script> and <style> elements
+            if (node.parentNode && /^(script|style)$/i.test(node.parentNode.tagName)) {
+                //log.fatal("IGNORED NODE " + dom.inspectNode(node));
+                return true;
+            }
+
+            // Ignore whitespace nodes that are next to an unwrappable element
+            if (options.ignoreWhiteSpace && isUnrenderedWhiteSpaceNode(node)) {
+                return true;
+            }
+        }
+        return false;
+    }
+*/
+
+    function addRangeMove(rangeMoves, range, oldParent, oldIndex, newParent, newIndex) {
+        var sc = range.startContainer, so = range.startOffset,
+            ec = range.endContainer, eo = range.endOffset;
+
+        var newSc = sc, newSo = so, newEc = ec, newEo = eo;
+
+        // "If a boundary point's node is the same as or a descendant of node,
+        // leave it unchanged, so it moves to the new location."
+        //
+        // No modifications necessary.
+
+        // "If a boundary point's node is new parent and its offset is greater than
+        // new index, add one to its offset."
+        if (sc == newParent && so > newIndex) {
+            newSo++;
+        }
+        if (ec == newParent && eo > newIndex) {
+            newEo++;
+        }
+
+        // "If a boundary point's node is old parent and its offset is old index or
+        // old index + 1, set its node to new parent and add new index  old index
+        // to its offset."
+        if (sc == oldParent && (so == oldIndex  || so == oldIndex + 1)) {
+            newSc = newParent;
+            newSo += newIndex - oldIndex;
+        }
+        if (ec == oldParent && (eo == oldIndex || eo == oldIndex + 1)) {
+            newEc = newParent;
+            newEo += newIndex - oldIndex;
+        }
+
+        // "If a boundary point's node is old parent and its offset is greater than
+        // old index + 1, subtract one from its offset."
+        if (sc == oldParent && so > oldIndex + 1) {
+            newSo--;
+        }
+        if (ec == oldParent && eo > oldIndex + 1) {
+            newEo--;
+        }
+
+        if (newSc == sc && newSo == so && newEc == ec && newEo == eo) {
+            rangeMoves.push([range, newSc, newSo, newEc, newEo]);
+        }
+    }
+
+    function movePreservingRanges(node, newParent, newIndex, rangesToPreserve) {
+        // For convenience, allow newIndex to be -1 to mean "insert at the end".
+        if (newIndex == -1) {
+            newIndex = newParent.childNodes.length;
+        }
+
+        // "When the user agent is to move a Node to a new location, preserving
+        // ranges, it must remove the Node from its original parent (if any), then insert it
+        // in the new location. In doing so, however, it must ignore the regular
+        // range mutation rules, and instead follow these rules:"
+
+        // "Let node be the moved Node, old parent and old index be the old parent
+        // and index, and new parent and new index be the new parent and index."
+        var oldParent = node.parentNode;
+        var oldIndex = dom.getNodeIndex(node);
+
+        var rangeMoves = [];
+
+        for (var i = 0, len = rangesToPreserve.length; i < len; ++i) {
+            addRangeMove(rangeMoves, rangesToPreserve[i], oldParent, oldIndex, newParent, newIndex);
+        }
+
+        // Now actually move the node.
+        if (newParent.childNodes.length == newIndex) {
+            newParent.appendChild(node);
+        } else {
+            newParent.insertBefore(node, newParent.childNodes[newIndex]);
+        }
+
+        // Set the new range boundaries
+        log.debug("Node move: ", dom.inspectNode(node), "to", dom.inspectNode(newParent), newIndex);
+        for (var j = 0, rangeMove; rangeMove = rangeMoves[j++]; ) {
+            log.debug("Moving " + rangeMove[0].inspect(), dom.inspectNode(rangeMove[1]), rangeMove[2], dom.inspectNode(rangeMove[3]), rangeMove[4]);
+            rangeMove[0].setStart(rangeMove[1], rangeMove[2]);
+            rangeMove[0].setEnd(rangeMove[3], rangeMove[4]);
+        }
+    }
+
+    function moveChildrenPreservingRanges(node, newParent, newIndex, removeNode, rangesToPreserve) {
+        var child, children = [];
+        while ( (child = node.firstChild) ) {
+            movePreservingRanges(child, newParent, newIndex++, rangesToPreserve);
+            children.push(child);
+        }
+        if (removeNode) {
+            node.parentNode.removeChild(node);
+        }
+        return children;
+    }
+
+    function replaceWithOwnChildren(element, rangesToPreserve) {
+        return moveChildrenPreservingRanges(element, element.parentNode, dom.getNodeIndex(element), true, rangesToPreserve);
+    }
+
+    function copyAttributes(fromElement, toElement) {
+        var attrs = fromElement.attributes;
+
+        for (var i = 0, len = attrs.length; i < len; ++i) {
+            if (attrs[i].specified) {
+                // For IE, which doesn't allow copying of the entire style object using get/setAttribute
+                if (attrs[i].name == "style") {
+                    toElement.style.cssText = toElement.style.cssText;
+                } else {
+                    toElement.setAttribute(attrs[i].name, attrs[i].value);
+                }
+            }
+        }
+    }
+
+    /**
+     * "effective value" per edit command spec
+     */
+    function getEffectiveCommandValue(node, context) {
+        var isElement = (node.nodeType == 1);
+
+        // "If neither node nor its parent is an Element, return null."
+        if (!isElement && (!node.parentNode || node.parentNode.nodeType != 1)) {
+            return null;
+        }
+
+        // "If node is not an Element, return the effective command value of its parent for command."
+        if (!isElement) {
+            return getEffectiveCommandValue(node.parentNode, context);
+        }
+
+        return context.command.getEffectiveValue(node, context);
+    }
+
+/*
+    // "An extraneous line break is a br that has no visual effect, in that
+    // removing it from the DOM would not change layout, except that a br that is
+    // the sole child of an li is not extraneous."
+    function isExtraneousLineBreak(br) {
+        if (!isHtmlElement(br, "br")) {
+            return false;
+        }
+
+        var ref = br.parentNode;
+        if (isHtmlElement(ref, "li") && ref.childNodes.length == 1) {
+            return false;
+        }
+
+        while (isInlineNode(ref)) {
+            ref = ref.parentNode;
+        }
+
+        var origHeight = ref.offsetHeight;
+        if (origHeight == 0) {
+            throw "isExtraneousLineBreak: original height is zero, bug?";
+        }
+        var styleAttr = br.attributes["style"];
+        var originalStyle = null;
+        if (styleAttr && styleAttr.specified) {
+            originalStyle = br.style.cssText;
+        }
+        br.style.display = "none";
+        var finalHeight = ref.offsetHeight;
+        if (originalStyle === null) {
+            br.style.cssText = "";
+            br.removeAttribute("style");
+        } else {
+            br.style.cssText = originalStyle;
+        }
+
+        return origHeight == finalHeight;
+    }
+*/
+
+    function removeExtraneousLineBreaksBefore(node) {
+        var ref;
+
+        // "Let ref be the previousSibling of node. If ref is null, abort these steps."
+        if (!node || !(ref = node.previousSibling)) {
+            return;
+        }
+
+        // "While ref has children, set ref to its lastChild."
+        while (ref.hasChildNodes()) {
+            ref = ref.lastChild;
+        }
+
+        // "While ref is invisible but not an extraneous line break, and ref does
+        // not equal node's parent, set ref to the node before it in tree order."
+        while (isInvisible(ref)
+        && !isExtraneousLineBreak(ref)
+        && ref != node.parentNode) {
+            ref = previousNode(ref);
+        }
+
+        // "If ref is an editable extraneous line break, remove it from its
+        // parent."
+        if (isEditable(ref)
+        && isExtraneousLineBreak(ref)) {
+            ref.parentNode.removeChild(ref);
+        }
+
+        
+
+        // "If node is not an Element, or it is an inline node, do nothing and
+        // abort these steps."
+        if (!node || node.nodeType != 1 || isInlineNode(node)) {
+            return;
+        }
+
+        // "If the previousSibling of node is a br, and the previousSibling of the
+        // previousSibling of node is an inline node that is not a br, remove the
+        // previousSibling of node from its parent."
+        var previousSibling = node.previousSibling, previousSiblingPreviousSibling;
+        if (isHtmlElement(previousSibling, "br")
+                && isInlineNode( (previousSiblingPreviousSibling = node.previousSibling.previousSibling) )
+                && !isHtmlElement(previousSiblingPreviousSibling, "br")) {
+            node.parentNode.removeChild(previousSibling);
+        }
+    }
+
+    function removeExtraneousLineBreaksAtTheEndOf(node) {
+        // "If node is not an Element, or it is an inline node, do nothing and
+        // abort these steps."
+        if (!node || node.nodeType != 1 || isInlineNode(node)) {
+            return;
+        }
+
+        // "If node has at least two children, and its last child is a br, and its
+        // second-to-last child is an inline node that is not a br, remove the last
+        // child of node from node."
+        var lastChild = node.lastChild, lastChildPreviousSibling;
+        if (node.childNodes.length >= 2 && isHtmlElement(node.lastChild, "br")
+                && isInlineNode( (lastChildPreviousSibling = node.lastChild.previousSibling) )
+                && !isHtmlElement(lastChildPreviousSibling, "br")) {
+            node.removeChild(lastChild);
+        }
+    }
+
+    // "To remove extraneous line breaks from a node, first remove extraneous line
+    // breaks before it, then remove extraneous line breaks at the end of it."
+    function removeExtraneousLineBreaksFrom(node) {
+        removeExtraneousLineBreaksBefore(node);
+        removeExtraneousLineBreaksAtTheEndOf(node);
+    }
+
+    function setTagName(element, newName, rangesToPreserve) {
+        // "If element is an HTML element with local name equal to new name, return element."
+        // "If element's parent is null, return element."
+        if (isHtmlElement(element, newName) || !element.parentNode) {
+            return element;
+        }
+
+        // "Let replacement element be the result of calling createElement(new
+        // name) on the ownerDocument of element."
+        var replacementElement = dom.getDocument(element).createElement(newName);
+
+        // "Insert replacement element into element's parent immediately before
+        // element."
+        element.parentNode.insertBefore(replacementElement, element);
+
+        // "Copy all attributes of element to replacement element, in order."
+        copyAttributes(element, replacementElement);
+
+        // "While element has children, append the first child of element as the
+        // last child of replacement element, preserving ranges."
+        // "Remove element from its parent."
+        moveChildrenPreservingRanges(element, replacementElement, 0, true, rangesToPreserve);
+
+        // "Return replacement element."
+        return replacementElement;
+    }
+
+    function clearValue(element, context) {
+        var command = context.command, rangesToPreserve = context.rangesToPreserve;
+
+        log.info("clearValue", outerHtml(element), command.getSpecifiedValue(element, context))
+
+        // "If element is not editable, return the empty list."
+        if (!isEditable(element, context.options)) {
+            return [];
+        }
+
+        // "If element's specified value for command is null, return the empty
+        // list."
+        if (command.getSpecifiedValue(element, context) === null) {
+            return [];
+        }
+
+        // "If element is a simple modifiable element:"
+        if (isSimpleModifiableElement(element, context)) {
+            return replaceWithOwnChildren(element, rangesToPreserve);
+        }
+
+        // Do command-specific clearing
+        if (command.clearValue) {
+            command.clearValue(element, context);
+        }
+
+        // "If element's specified value for command is null, return the empty
+        // list."
+        if (command.getSpecifiedValue(element, context) === null) {
+            return [];
+        }
+
+        // "Set the tag name of element to "span", and return the one-node list
+        // consisting of the result."
+        return [setTagName(element, "span", rangesToPreserve)];
+    }
+
+    var defaultSiblingCriteria = function() { return false };
+    var defaultNewParentInstructions = function() { return null };
+
+    function wrap(nodeList, context, siblingCriteria, newParentInstructions) {
+        // "If not provided, sibling criteria match nothing and new parent
+        // instructions return null."
+        siblingCriteria = siblingCriteria || defaultSiblingCriteria;
+        newParentInstructions = newParentInstructions || defaultNewParentInstructions;
+
+        var firstNode = nodeList[0];
+        var options = context.options, rangesToPreserve = context.rangesToPreserve;
+        var i, len, range;
+
+        // "If node list is empty, or the first member of node list is not
+        // editable, return null and abort these steps."
+        if (!nodeList.length || !isEditable(firstNode, options)) {
+            return null;
+        }
+
+        var lastNode = nodeList[nodeList.length - 1];
+
+        // "If node list's last member is an inline node that's not a br, and node
+        // list's last member's nextSibling is a br, append that br to node list."
+        if (isInlineNode(lastNode) && !isHtmlElement(lastNode, "br") && isHtmlElement(lastNode.nextSibling, "br")) {
+            nodeList.push(lastNode.nextSibling);
+        }
+
+        // "If the previousSibling of the first member of node list is editable and
+        // meets the sibling criteria, let new parent be the previousSibling of the
+        // first member of node list."
+        var newParent, nodePriorToFirstNode = firstNode.previousSibling, nodeAfterLastNode = lastNode.nextSibling;
+
+        if (isEditable(nodePriorToFirstNode, options) && siblingCriteria(nodePriorToFirstNode)) {
+            newParent = nodePriorToFirstNode;
+
+        // "Otherwise, if the nextSibling of the last member of node list is
+        // editable and meets the sibling criteria, let new parent be the
+        // nextSibling of the last member of node list."
+        } else if (isEditable(nodeAfterLastNode, options) && siblingCriteria(nodeAfterLastNode)) {
+            newParent = nodeAfterLastNode;
+
+        // "Otherwise, run the new parent instructions, and let new parent be the
+        // result."
+        } else {
+            newParent = newParentInstructions();
+        }
+
+        // "If new parent is null, abort these steps and return null."
+        if (!newParent) {
+            return null;
+        }
+
+        var doc = dom.getDocument(newParent);
+        var newParentParent = newParent.parentNode, firstNodeParent = firstNode.parentNode;
+
+        // "If new parent's parent is null:"
+        if (!newParentParent) {
+            // "Insert new parent into the parent of the first member of node list
+            // immediately before the first member of node list."
+            firstNodeParent.insertBefore(newParent, firstNode);
+
+            // "If any range has a boundary point with node equal to the parent of
+            // new parent and offset equal to the index of new parent, add one to
+            // that boundary point's offset."
+
+            // Preserve only the ranges passed in
+            var newParentNodeIndex = dom.getNodeIndex(newParent);
+            for (i = 0; range = rangesToPreserve[i++]; ) {
+                if (range.startContainer == newParentParent && range.startOffset == newParentNodeIndex) {
+                    range.setStart(range.startContainer, range.startOffset + 1);
+                }
+                if (range.endContainer == newParentParent && range.endOffset == newParentNodeIndex) {
+                    range.setEnd(range.endContainer, range.endOffset + 1);
+                }
+            }
+        }
+
+        // "Let original parent be the parent of the first member of node list."
+
+        // "If new parent is before the first member of node list in tree order:"
+        if (isBefore(newParent, firstNode)) {
+            // "If new parent is not an inline node, but the last child of new
+            // parent and the first member of node list are both inline nodes, and
+            // the last child of new parent is not a br, call createElement("br")
+            // on the ownerDocument of new parent and append the result as the last
+            // child of new parent."
+            if (!isInlineNode(newParent) && isInlineNode(newParent.lastChild) && isInlineNode(firstNode)
+                    && !isHtmlElement(newParent.lastChild, "br")) {
+                newParent.appendChild(doc.createElement("br"));
+            }
+
+            // "For each node in node list, append node as the last child of new
+            // parent, preserving ranges."
+            for (i = 0, len = nodeList.length; i < len; ++i) {
+                movePreservingRanges(nodeList[i], newParent, -1, rangesToPreserve);
+            }
+
+        // "Otherwise:"
+        } else {
+            // "If new parent is not an inline node, but the first child of new
+            // parent and the last member of node list are both inline nodes, and
+            // the last member of node list is not a br, call createElement("br")
+            // on the ownerDocument of new parent and insert the result as the
+            // first child of new parent."
+            if (!isInlineNode(newParent) && isInlineNode(newParent.firstChild) && isInlineNode(lastNode)
+                    && !isHtmlElement(lastNode, "br")) {
+                newParent.insertBefore(doc.createElement("br"), newParent.firstChild);
+            }
+
+            // "For each node in node list, in reverse order, insert node as the
+            // first child of new parent, preserving ranges."
+            for (i = nodeList.length - 1; i >= 0; i--) {
+                movePreservingRanges(nodeList[i], newParent, 0, rangesToPreserve);
+            }
+        }
+
+        // "If original parent is editable and has no children, remove it from its
+        // parent."
+        if (isEditable(firstNodeParent, options) && !firstNodeParent.hasChildNodes()) {
+            firstNodeParent.parentNode.removeChild(firstNodeParent);
+        }
+
+        // "If new parent's nextSibling is editable and meets the sibling
+        // criteria:"
+        var newParentNextSibling = newParent.nextSibling;
+        if (isEditable(newParentNextSibling, options) && siblingCriteria(newParentNextSibling)) {
+            // "If new parent is not an inline node, but new parent's last child
+            // and new parent's nextSibling's first child are both inline nodes,
+            // and new parent's last child is not a br, call createElement("br") on
+            // the ownerDocument of new parent and append the result as the last
+            // child of new parent."
+            if (!isInlineNode(newParent) && isInlineNode(newParent.lastChild)
+                    && isInlineNode(newParentNextSibling.firstChild) && !isHtmlElement(newParent.lastChild, "br")) {
+                newParent.appendChild(doc.createElement("br"));
+            }
+
+            // "While new parent's nextSibling has children, append its first child
+            // as the last child of new parent, preserving ranges."
+            while (newParentNextSibling.hasChildNodes()) {
+                movePreservingRanges(newParentNextSibling.firstChild, newParent, -1, rangesToPreserve);
+            }
+
+            // "Remove new parent's nextSibling from its parent."
+            newParent.parentNode.removeChild(newParentNextSibling);
+        }
+
+        // "Remove extraneous line breaks from new parent."
+        removeExtraneousLineBreaksFrom(newParent);
+
+        // "Return new parent."
+        return newParent;
+    }
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    function Command() {}
+
+    Command.prototype = {
+        getSpecifiedValue: function() {
+            return null;
+        },
+
+        getEffectiveValue: function(element, context) {
+            return null;
+        },
+
+        createCssElement: null,
+        createNonCssElement: null,
+        styleCssElement: null,
+        hasSpecialSpanStyling: null,
+        styleSpanChildElement: null,
+        isSimpleModifiableElement: null,
+        defaultOptions: null,
+        addDefaultOptions: null,
+
+        valuesEqual: function(val1, val2) {
+            return val1 === val2;
+        },
+
+        createContext: function(value, rangesToPreserve, options) {
+            var defaultOptions = this.defaultOptions;
+            if (defaultOptions) {
+                for (var i in defaultOptions) {
+                    if (defaultOptions.hasOwnProperty(i) && !options.hasOwnProperty(i)) {
+                        options[i] = defaultOptions[i];
+                    }
+                }
+            }
+            return {
+                command: this,
+                value: value,
+                rangesToPreserve: rangesToPreserve || [],
+                options: options || {}
+            };
+        },
+
+        getSelectionValue: function(/*sel, context*/) {
+            return null;
+        },
+
+        getNewRangeValue: function(/*range, context*/) {
+            return null;
+        },
+
+        getNewSelectionValue: function(/*sel, context*/) {
+            return null;
+        },
+
+        applyToRange: function(doc, value, options, range) {
+            var context = this.createContext(value, [range], options);
+            context.value = this.getNewRangeValue(range, context);
+            this.applyValueToRange(range, context);
+        },
+
+        applyToSelection: function(doc, value, options) {
+            var win = dom.getWindow(doc);
+            var sel = api.getSelection(win);
+            var selRanges = sel.getAllRanges();
+            var context = this.createContext(value, selRanges, options);
+            context.value = this.getNewSelectionValue(sel, context);
+
+            for (var i = 0, len = selRanges.length; i < len; ++i) {
+                this.applyValueToRange(selRanges[i], context);
+            }
+
+            sel.setRanges(selRanges);
+        }
+    };
+
+    Command.util = {
+        getComputedStyleProperty: getComputedStyleProperty,
+        getFurthestAncestor: getFurthestAncestor,
+        isContained: isContained,
+        isEffectivelyContained: isEffectivelyContained,
+        isHtmlNode: isHtmlNode,
+        isHtmlElement: isHtmlElement,
+        isBlockNode: isBlockNode,
+        isInlineNode: isInlineNode,
+/*
+        blockExtend: blockExtend,
+*/
+        isModifiableElement: isModifiableElement,
+        isSimpleModifiableElement: isSimpleModifiableElement,
+        moveChildrenPreservingRanges: moveChildrenPreservingRanges,
+        replaceWithOwnChildren: replaceWithOwnChildren,
+        copyAttributes: copyAttributes,
+        clearValue: clearValue,
+        getEffectiveTextNodes: getEffectiveTextNodes,
+        getEffectivelyContainedElements: getEffectivelyContainedElements,
+/*
+        getEffectiveValue: getEffectiveValue,
+        setNodeValue: setNodeValue,
+*/
+        wrap: wrap
+/*
+        decomposeRange: decomposeRange,
+*/
+
+    };
+
+
+    api.Command = Command;
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    function SimpleInlineCommand() {}
+
+    SimpleInlineCommand.prototype = new Command();
+
+    api.util.extend(SimpleInlineCommand.prototype, {
+        getEffectiveValue: function(element) {
+            return getComputedStyleProperty(element, this.relevantCssProperty);
+        },
+
+        clearValue: function(element) {
+            element.style[this.relevantCssProperty] = "";
+            if (element.style.cssText == "") {
+                element.removeAttribute("style");
+            }
+        }
+    });
+
+    SimpleInlineCommand.create = function(commandConstructor, properties) {
+        var proto = new Command();
+        commandConstructor.prototype = proto;
+        api.util.extend(proto, properties);
+    };
+
+    api.SimpleInlineCommand = SimpleInlineCommand;
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    var commandsByName = {};
+
+    api.registerCommand = function(name, command) {
+        if (!(command instanceof Command)) {
+            throw module.createError("registerCommand(): Object supplied is not a Command");
+        }
+        commandsByName[name.toLowerCase()] = command;
+    };
+
+    function getCommand(name) {
+        var lowerName = name.toLowerCase();
+        if (commandsByName.hasOwnProperty(lowerName)) {
+            return commandsByName[lowerName];
+        } else {
+            throw module.createError("getCommand(): No command registered with the name '" + name + "'");
+        }
+    }
+
+    api.execCommand = function(name, options, range) {
+        options = options || {};
+        var doc = options.hasOwnProperty("document") ? options.document : document;
+        var value = options.hasOwnProperty("value") ? options.value : null;
+        var command = getCommand(name);
+        if (range) {
+            command.applyToRange(doc, value, options, range);
+        } else {
+            command.applyToSelection(doc, value, options);
+        }
+    };
+
+    api.queryCommandValue = function(name, options, range) {
+        options = options || {};
+        var win = options.hasOwnProperty("document") ? dom.getWindow(options.document) : window;
+        var value = options.hasOwnProperty("value") ? options.value : null;
+        var command = getCommand(name);
+        var sel = api.getSelection(win);
+        var context = command.createContext(value, null, options);
+
+        return command.getSelectionValue(sel, context);
+    };
+
+    api.getCommand = getCommand;
 });
\ No newline at end of file
diff --git a/src/js/modules/rangy-events.js b/src/modules/rangy-events.js
similarity index 97%
rename from src/js/modules/rangy-events.js
rename to src/modules/rangy-events.js
index 24e0302b..bcf1fc54 100644
--- a/src/js/modules/rangy-events.js
+++ b/src/modules/rangy-events.js
@@ -1,133 +1,133 @@
-/**
- * Events module for Rangy.
- * Extensions to Range and Selection objects that dispatch mouse and touch events for ranges and selections
- *
- * Part of Rangy, a cross-browser JavaScript range and selection library
- * http://code.google.com/p/rangy/
- *
- * Depends on Rangy core.
- *
- * Copyright %%build:year%%, Tim Down
- * Licensed under the MIT license.
- * Version: %%build:version%%
- * Build date: %%build:date%%
- */
-rangy.createModule("Events", ["Position"], function(api, module) {
-    var log = log4javascript.getLogger("rangy.events");
-    var DomPosition = api.dom.DomPosition;
-    
-    var documentEventStores = [];
-    
-    function getEventStore(range) {
-        var doc = api.DomRange.getRangeDocument(range);
-        var i = documentEventStores.length, store;
-        while (i--) {
-            store = documentEventStores[i];
-            if (store.doc === doc) {
-                return store;
-            }
-        }
-        
-        store = new DocumentEventStore(doc);
-        documentEventStores.push(store);
-        return store;
-    }
-    
-    function getPositionFromEvent(doc, evt) {
-        return api.util.areHostProperties(evt, ["rangeOffset", "rangeParent"]) ?
-            new DomPosition(evt.rangeParent, evt.rangeOffset) :
-            api.positionFromPoint(evt.clientX, evt.clientY, doc);
-    }
-    
-    function DocumentEventStore(doc) {
-        this.doc = doc;
-        this.listenersByType = {};
-    }
-
-    DocumentEventStore.prototype = {
-        createDomListener: function(eventType, rangeListeners) {
-            var that = this;
-
-            var listener = function(evt) {
-                var pos = getPositionFromEvent(that.doc, evt);
-                //console.log(evt.type, pos);
-                for (var i = 0, rangeListener; rangeListener = rangeListeners[i++]; ) {
-                    if (rangeListener.range.isPointInRange(pos.node, pos.offset)) {
-                        rangeListener.listener.call(rangeListener.range, {
-                            originalEvent: evt,
-                            type: evt.type,
-                            caretPosition: {
-                                offsetNode: pos.node,
-                                offset: pos.offset
-                            }
-                        });
-                    }
-                }
-            };
-
-            api.util.addListener(that.doc, eventType, listener);
-            
-            return listener;
-        },
-        
-        addListener: function(range, eventType, listener) {
-            var listenersByType = this.listenersByType;
-            if (!listenersByType.hasOwnProperty(eventType)) {
-                var rangeListeners = [];
-                listenersByType[eventType] = {
-                    domListener: this.createDomListener(eventType, rangeListeners),
-                    rangeListeners: rangeListeners
-                };
-            }
-            // Start listening to events of this type
-            var listenersForType = listenersByType[eventType];
-            listenersForType.rangeListeners.push( { range: range, listener: listener} );
-        },
-        
-        removeListener: function(range, eventType, listener) {
-            var listenersByType = this.listenersByType;
-            if (listenersByType.hasOwnProperty(eventType)) {
-                var rangeListenersForType = listenersByType[eventType].rangeListeners;
-                for (var i = 0, len = rangeListenersForType.length; i < len; ++i) {
-                    if (rangeListenersForType[i].range === range && rangeListenersForType[i].listener === listener) {
-                        rangeListenersForType.splice(i, 1);
-                        console.log("REMOVED");
-                        break;
-                    }
-                }
-            }
-        },
-
-        removeRangeListeners: function(range) {
-            var listenersByType = this.listenersByType, rangeListenersForType, i, len;
-            for (var eventType in listenersByType) {
-                if (listenersByType.hasOwnProperty(eventType)) {
-                    rangeListenersForType = listenersByType[eventType].rangeListeners;
-                    for (i = 0, len = rangeListenersForType.length; i < len; ++i) {
-                        if (rangeListenersForType[i].range === range) {
-                            rangeListenersForType.splice(i, 1);
-                            --i;
-                            console.log("REMOVED");
-                        }
-                    }
-                }
-            }
-        },
-        
-        cleanDetachedRanges: function() {
-            // TODO: Implement this
-        }
-    };
-
-    api.rangePrototype.addListener = function(eventType, listener) {
-        getEventStore(this).addListener(this, eventType, listener);
-    };
-
-    api.rangePrototype.removeListener = function(eventType, listener) {
-        getEventStore(this).removeListener(this, eventType, listener);
-    };
-
-    api.rangePrototype.removeAllListeners = function() {
-        getEventStore(this).removeRangeListeners(this);
-    };
-});
+/**
+ * Events module for Rangy.
+ * Extensions to Range and Selection objects that dispatch mouse and touch events for ranges and selections
+ *
+ * Part of Rangy, a cross-browser JavaScript range and selection library
+ * http://code.google.com/p/rangy/
+ *
+ * Depends on Rangy core.
+ *
+ * Copyright %%build:year%%, Tim Down
+ * Licensed under the MIT license.
+ * Version: %%build:version%%
+ * Build date: %%build:date%%
+ */
+rangy.createModule("Events", ["Position"], function(api, module) {
+    var log = log4javascript.getLogger("rangy.events");
+    var DomPosition = api.dom.DomPosition;
+    
+    var documentEventStores = [];
+    
+    function getEventStore(range) {
+        var doc = api.DomRange.getRangeDocument(range);
+        var i = documentEventStores.length, store;
+        while (i--) {
+            store = documentEventStores[i];
+            if (store.doc === doc) {
+                return store;
+            }
+        }
+        
+        store = new DocumentEventStore(doc);
+        documentEventStores.push(store);
+        return store;
+    }
+    
+    function getPositionFromEvent(doc, evt) {
+        return api.util.areHostProperties(evt, ["rangeOffset", "rangeParent"]) ?
+            new DomPosition(evt.rangeParent, evt.rangeOffset) :
+            api.positionFromPoint(evt.clientX, evt.clientY, doc);
+    }
+    
+    function DocumentEventStore(doc) {
+        this.doc = doc;
+        this.listenersByType = {};
+    }
+
+    DocumentEventStore.prototype = {
+        createDomListener: function(eventType, rangeListeners) {
+            var that = this;
+
+            var listener = function(evt) {
+                var pos = getPositionFromEvent(that.doc, evt);
+                //console.log(evt.type, pos);
+                for (var i = 0, rangeListener; rangeListener = rangeListeners[i++]; ) {
+                    if (rangeListener.range.isPointInRange(pos.node, pos.offset)) {
+                        rangeListener.listener.call(rangeListener.range, {
+                            originalEvent: evt,
+                            type: evt.type,
+                            caretPosition: {
+                                offsetNode: pos.node,
+                                offset: pos.offset
+                            }
+                        });
+                    }
+                }
+            };
+
+            api.util.addListener(that.doc, eventType, listener);
+            
+            return listener;
+        },
+        
+        addListener: function(range, eventType, listener) {
+            var listenersByType = this.listenersByType;
+            if (!listenersByType.hasOwnProperty(eventType)) {
+                var rangeListeners = [];
+                listenersByType[eventType] = {
+                    domListener: this.createDomListener(eventType, rangeListeners),
+                    rangeListeners: rangeListeners
+                };
+            }
+            // Start listening to events of this type
+            var listenersForType = listenersByType[eventType];
+            listenersForType.rangeListeners.push( { range: range, listener: listener} );
+        },
+        
+        removeListener: function(range, eventType, listener) {
+            var listenersByType = this.listenersByType;
+            if (listenersByType.hasOwnProperty(eventType)) {
+                var rangeListenersForType = listenersByType[eventType].rangeListeners;
+                for (var i = 0, len = rangeListenersForType.length; i < len; ++i) {
+                    if (rangeListenersForType[i].range === range && rangeListenersForType[i].listener === listener) {
+                        rangeListenersForType.splice(i, 1);
+                        console.log("REMOVED");
+                        break;
+                    }
+                }
+            }
+        },
+
+        removeRangeListeners: function(range) {
+            var listenersByType = this.listenersByType, rangeListenersForType, i, len;
+            for (var eventType in listenersByType) {
+                if (listenersByType.hasOwnProperty(eventType)) {
+                    rangeListenersForType = listenersByType[eventType].rangeListeners;
+                    for (i = 0, len = rangeListenersForType.length; i < len; ++i) {
+                        if (rangeListenersForType[i].range === range) {
+                            rangeListenersForType.splice(i, 1);
+                            --i;
+                            console.log("REMOVED");
+                        }
+                    }
+                }
+            }
+        },
+        
+        cleanDetachedRanges: function() {
+            // TODO: Implement this
+        }
+    };
+
+    api.rangePrototype.addListener = function(eventType, listener) {
+        getEventStore(this).addListener(this, eventType, listener);
+    };
+
+    api.rangePrototype.removeListener = function(eventType, listener) {
+        getEventStore(this).removeListener(this, eventType, listener);
+    };
+
+    api.rangePrototype.removeAllListeners = function() {
+        getEventStore(this).removeRangeListeners(this);
+    };
+});
diff --git a/src/js/modules/rangy-highlighter-old.js b/src/modules/rangy-highlighter-old.js
similarity index 97%
rename from src/js/modules/rangy-highlighter-old.js
rename to src/modules/rangy-highlighter-old.js
index 179d0b8c..cceaa819 100644
--- a/src/js/modules/rangy-highlighter-old.js
+++ b/src/modules/rangy-highlighter-old.js
@@ -1,258 +1,258 @@
-/**
- * Highlighter module for Rangy, a cross-browser JavaScript range and selection library
- * http://code.google.com/p/rangy/
- *
- * Depends on Rangy core, SaveRestore, CssClassApplier and Serializer modules.
- *
- * Copyright %%build:year%%, Tim Down
- * Licensed under the MIT license.
- * Version: %%build:version%%
- * Build date: %%build:date%%
- */
-rangy.createModule("Highlighter", ["SaveRestore", "Serializer", "ClassApplier"], function(api, module) {
-    var log = log4javascript.getLogger("rangy.Highlighter");
-    var dom = api.dom;
-    var contains = dom.arrayContains;
-
-    // Puts highlights in order, last in document first.
-    function compareHighlights(h1, h2) {
-        return h2.range.compareBoundaryPoints(h1.range.START_TO_START, h1.range);
-    }
-
-    var nextHighlightId = 1;
-
-    function Highlight(range, cssClassApplier, id) {
-        if (id) {
-            this.id = id;
-            nextHighlightId = Math.max(nextHighlightId, id + 1);
-        } else {
-            this.id = nextHighlightId++;
-        }
-        this.range = range;
-        this.cssClassApplier = cssClassApplier;
-    }
-
-    Highlight.prototype = {
-        containsElement: function(el) {
-            return this.range.containsNodeContents(el.firstChild);
-        },
-
-        toString: function() {
-            return "[Highlight(ID: " + this.id + ", class: " + this.cssClassApplier.cssClass + ", range: " + this.range.inspect() + ")]";
-        }
-    };
-
-    /*
-    - Highlight object with range, class applier and id
-    - Serialize range plus class and id
-     */
-
-    function Highlighter() {
-        // CSS class applier must normalize so that it can restore the DOM exactly after removing highlights
-        this.cssClassAppliers = {};
-        this.highlights = [];
-    }
-
-    Highlighter.prototype = {
-        addCssClassApplier: function(cssClassApplier) {
-            this.cssClassAppliers[cssClassApplier.cssClass] = cssClassApplier;
-        },
-
-        getHighlightForElement: function(el) {
-            var highlights = this.highlights;
-            for (var i = 0, len = highlights.length; i < len; ++i) {
-                if (highlights[i].containsElement(el)) {
-                    return highlights[i];
-                }
-            }
-            return null;
-        },
-
-        highlightRanges: function(ranges, cssClassApplier) {
-            log.info("Current highlights ", this.highlights, "Adding new ranges", ranges);
-
-            var highlights = this.highlights, cssClassAppliers = this.cssClassAppliers;
-            var originalHighlights = highlights.slice(0);
-
-            for (var i = 0, len = ranges.length; i < len; ++i) {
-                highlights.push( new Highlight(ranges[i], cssClassApplier) );
-            }
-
-            highlights.sort(compareHighlights);
-
-            var highlightRanges = [];
-            for (i = 0, len = highlights.length; i < len; ++i) {
-                highlightRanges[i] = highlights[i].range;
-            }
-
-            var rangeInfos = api.saveRanges(highlightRanges), range;
-            log.info(rangeInfos);
-
-            // Temporarily restore each highlight range in turn and add the highlight class if not already applied.
-            for (i = rangeInfos.length; i-- > 0; ) {
-                range = api.restoreRange(rangeInfos[i]);
-                var applierForRange = cssClassApplier;
-
-                for (var c in cssClassAppliers) {
-                    if (cssClassAppliers.hasOwnProperty(c)) {
-                        if (cssClassAppliers[c].isAppliedToRange(range)) {
-                            applierForRange = cssClassAppliers[c];
-                        }
-                        cssClassAppliers[c].undoToRange(range);
-                    }
-                }
-                applierForRange.applyToRange(range);
-                rangeInfos[i] = api.saveRanges([range])[0];
-            }
-
-            var restoredRanges = api.restoreRanges(rangeInfos), newHighlights = [], highlight;
-            for (i = 0, len = highlights.length; i < len; ++i) {
-                highlight = highlights[i];
-                highlight.range = restoredRanges[i];
-                if (!contains(originalHighlights, highlight)) {
-                    newHighlights.push(highlight);
-                }
-            }
-
-            return newHighlights;
-        },
-
-        removeHighlights: function(highlights) {
-            var ranges = [];
-            var currentHighlights = this.highlights, cssClassAppliers = this.cssClassAppliers;
-
-            for (var i = 0, len = highlights.length; i < len; ++i) {
-                ranges[i] = highlights[i].range;
-            }
-
-            currentHighlights.sort(compareHighlights);
-
-            var rangeInfos = [], highlightRange;
-
-            for (i = 0; i < currentHighlights.length; ++i) {
-                highlightRange = currentHighlights[i].range;
-                if (contains(ranges, highlightRange)) {
-                    for (var c in cssClassAppliers) {
-                        if (cssClassAppliers.hasOwnProperty(c)) {
-                            cssClassAppliers[c].undoToRange(highlightRange);
-                        }
-                    }
-                    currentHighlights.splice(i--, 1);
-                } else {
-                    rangeInfos.push.apply(rangeInfos, api.saveRanges( [highlightRange] ));
-                }
-            }
-            var restoredRanges = api.restoreRanges(rangeInfos);
-            for (i = 0; i < currentHighlights.length; ++i) {
-                currentHighlights[i].range = restoredRanges[i];
-            }
-        },
-
-        getIntersectingHighlights: function(ranges) {
-            // Test each range against each of the highlighted ranges to see whether they overlap
-            var intersectingHighlights = [], highlights = this.highlights;
-            for (var i = 0, len = ranges.length, selRange, highlightRange; i < len; ++i) {
-                selRange = ranges[i];
-                for (var j = 0, jLen = highlights.length; j < jLen; ++j) {
-                    highlightRange = highlights[j].range;
-                    if (selRange.intersectsRange(highlightRange) && !contains(intersectingHighlights, highlightRange)) {
-                        intersectingHighlights.push(highlights[j]);
-                    }
-                }
-            }
-            return intersectingHighlights;
-        },
-
-        highlightSelection: function(cssClass, selection) {
-            selection = selection || rangy.getSelection();
-            var cssClassApplier = this.cssClassAppliers[cssClass];
-            var highlights = this.highlights;
-
-            if (!cssClassApplier) {
-                throw new Error("No CSS class applier found for class '" + cssClass + "'");
-            }
-
-            var ranges = selection.getAllRanges();
-            for (var i = 0, len = ranges.length, highlightRange; i < len; ++i) {
-                ranges[i] = ranges[i].cloneRange();
-
-                // Check for intersection with existing highlights. For each intersection, extend the existing highlight
-                // to be the union of the highlight range and the selected range
-                for (var j = 0; j < highlights.length; ++j) {
-                    highlightRange = highlights[j].range;
-                    if (ranges[i].intersectsRange(highlightRange)) {
-                        ranges[i] = ranges[i].union(highlightRange);
-                        highlights.splice(j--, 1);
-                    }
-                }
-            }
-
-            selection.removeAllRanges();
-            return this.highlightRanges(ranges, cssClassApplier);
-        },
-
-        unhighlightSelection: function(selection) {
-            selection = selection || rangy.getSelection();
-            var intersectingHighlights = this.getIntersectingHighlights(selection.getAllRanges());
-
-            // Now unhighlight all the highlighted ranges that overlap with the selection
-            if (intersectingHighlights.length > 0) {
-                this.removeHighlights(intersectingHighlights);
-                selection.removeAllRanges();
-            }
-        },
-
-        selectionOverlapsHighlight: function(selection) {
-            selection = selection || rangy.getSelection();
-            return this.getIntersectingHighlights(selection.getAllRanges()).length > 0;
-        },
-
-        serialize: function() {
-            var highlights = this.highlights;
-            if (highlights.length > 0) {
-                highlights.sort(compareHighlights);
-
-                // Remove all the highlights but preserve the ranges
-                var highlightRanges = [];
-                for (var i = 0, len = highlights.length; i < len; ++i) {
-                    highlightRanges[i] = highlights[i].range;
-                }
-
-                var rangeInfos = api.saveRanges(highlightRanges), serializedHighlights = [], highlight, range;
-
-                // Restore each range in turn and remove the highlight class
-                for (i = rangeInfos.length; i-- > 0; ) {
-                    range = api.restoreRange(rangeInfos[i]);
-                    highlight = highlights[i];
-                    log.info(range + ", " + range.inspect());
-                    highlight.cssClassApplier.undoToRange(range);
-                    serializedHighlights.push( highlight.id + "$" + highlight.cssClassApplier.cssClass
-                            + "$" + api.serializeRange(range, true) );
-                }
-
-                highlights.length = 0;
-
-                return serializedHighlights.join("|");
-            } else {
-                return "";
-            }
-        },
-
-        deserialize: function(serialized, rootNode, doc) {
-            var serializedHighlights = serialized.split("|");
-
-            // Deserialize in reverse document order
-            for (var i = serializedHighlights.length, range, parts, cssClassApplier; i-- > 0; ) {
-                parts = serializedHighlights[i].split("$");
-                range = api.deserializeRange(parts[2], rootNode, doc);
-                cssClassApplier = this.cssClassAppliers[parts[1]];
-                cssClassApplier.applyToRange(range);
-                this.highlights.push( new Highlight(range, cssClassApplier, parseInt(parts[0], 10)) );
-            }
-        }
-    };
-
-    api.createHighlighter = function(cssClass, tagNames) {
-        return new Highlighter(cssClass, tagNames);
-    };
-});
+/**
+ * Highlighter module for Rangy, a cross-browser JavaScript range and selection library
+ * http://code.google.com/p/rangy/
+ *
+ * Depends on Rangy core, SaveRestore, CssClassApplier and Serializer modules.
+ *
+ * Copyright %%build:year%%, Tim Down
+ * Licensed under the MIT license.
+ * Version: %%build:version%%
+ * Build date: %%build:date%%
+ */
+rangy.createModule("Highlighter", ["SaveRestore", "Serializer", "ClassApplier"], function(api, module) {
+    var log = log4javascript.getLogger("rangy.Highlighter");
+    var dom = api.dom;
+    var contains = dom.arrayContains;
+
+    // Puts highlights in order, last in document first.
+    function compareHighlights(h1, h2) {
+        return h2.range.compareBoundaryPoints(h1.range.START_TO_START, h1.range);
+    }
+
+    var nextHighlightId = 1;
+
+    function Highlight(range, cssClassApplier, id) {
+        if (id) {
+            this.id = id;
+            nextHighlightId = Math.max(nextHighlightId, id + 1);
+        } else {
+            this.id = nextHighlightId++;
+        }
+        this.range = range;
+        this.cssClassApplier = cssClassApplier;
+    }
+
+    Highlight.prototype = {
+        containsElement: function(el) {
+            return this.range.containsNodeContents(el.firstChild);
+        },
+
+        toString: function() {
+            return "[Highlight(ID: " + this.id + ", class: " + this.cssClassApplier.cssClass + ", range: " + this.range.inspect() + ")]";
+        }
+    };
+
+    /*
+    - Highlight object with range, class applier and id
+    - Serialize range plus class and id
+     */
+
+    function Highlighter() {
+        // CSS class applier must normalize so that it can restore the DOM exactly after removing highlights
+        this.cssClassAppliers = {};
+        this.highlights = [];
+    }
+
+    Highlighter.prototype = {
+        addCssClassApplier: function(cssClassApplier) {
+            this.cssClassAppliers[cssClassApplier.cssClass] = cssClassApplier;
+        },
+
+        getHighlightForElement: function(el) {
+            var highlights = this.highlights;
+            for (var i = 0, len = highlights.length; i < len; ++i) {
+                if (highlights[i].containsElement(el)) {
+                    return highlights[i];
+                }
+            }
+            return null;
+        },
+
+        highlightRanges: function(ranges, cssClassApplier) {
+            log.info("Current highlights ", this.highlights, "Adding new ranges", ranges);
+
+            var highlights = this.highlights, cssClassAppliers = this.cssClassAppliers;
+            var originalHighlights = highlights.slice(0);
+
+            for (var i = 0, len = ranges.length; i < len; ++i) {
+                highlights.push( new Highlight(ranges[i], cssClassApplier) );
+            }
+
+            highlights.sort(compareHighlights);
+
+            var highlightRanges = [];
+            for (i = 0, len = highlights.length; i < len; ++i) {
+                highlightRanges[i] = highlights[i].range;
+            }
+
+            var rangeInfos = api.saveRanges(highlightRanges), range;
+            log.info(rangeInfos);
+
+            // Temporarily restore each highlight range in turn and add the highlight class if not already applied.
+            for (i = rangeInfos.length; i-- > 0; ) {
+                range = api.restoreRange(rangeInfos[i]);
+                var applierForRange = cssClassApplier;
+
+                for (var c in cssClassAppliers) {
+                    if (cssClassAppliers.hasOwnProperty(c)) {
+                        if (cssClassAppliers[c].isAppliedToRange(range)) {
+                            applierForRange = cssClassAppliers[c];
+                        }
+                        cssClassAppliers[c].undoToRange(range);
+                    }
+                }
+                applierForRange.applyToRange(range);
+                rangeInfos[i] = api.saveRanges([range])[0];
+            }
+
+            var restoredRanges = api.restoreRanges(rangeInfos), newHighlights = [], highlight;
+            for (i = 0, len = highlights.length; i < len; ++i) {
+                highlight = highlights[i];
+                highlight.range = restoredRanges[i];
+                if (!contains(originalHighlights, highlight)) {
+                    newHighlights.push(highlight);
+                }
+            }
+
+            return newHighlights;
+        },
+
+        removeHighlights: function(highlights) {
+            var ranges = [];
+            var currentHighlights = this.highlights, cssClassAppliers = this.cssClassAppliers;
+
+            for (var i = 0, len = highlights.length; i < len; ++i) {
+                ranges[i] = highlights[i].range;
+            }
+
+            currentHighlights.sort(compareHighlights);
+
+            var rangeInfos = [], highlightRange;
+
+            for (i = 0; i < currentHighlights.length; ++i) {
+                highlightRange = currentHighlights[i].range;
+                if (contains(ranges, highlightRange)) {
+                    for (var c in cssClassAppliers) {
+                        if (cssClassAppliers.hasOwnProperty(c)) {
+                            cssClassAppliers[c].undoToRange(highlightRange);
+                        }
+                    }
+                    currentHighlights.splice(i--, 1);
+                } else {
+                    rangeInfos.push.apply(rangeInfos, api.saveRanges( [highlightRange] ));
+                }
+            }
+            var restoredRanges = api.restoreRanges(rangeInfos);
+            for (i = 0; i < currentHighlights.length; ++i) {
+                currentHighlights[i].range = restoredRanges[i];
+            }
+        },
+
+        getIntersectingHighlights: function(ranges) {
+            // Test each range against each of the highlighted ranges to see whether they overlap
+            var intersectingHighlights = [], highlights = this.highlights;
+            for (var i = 0, len = ranges.length, selRange, highlightRange; i < len; ++i) {
+                selRange = ranges[i];
+                for (var j = 0, jLen = highlights.length; j < jLen; ++j) {
+                    highlightRange = highlights[j].range;
+                    if (selRange.intersectsRange(highlightRange) && !contains(intersectingHighlights, highlightRange)) {
+                        intersectingHighlights.push(highlights[j]);
+                    }
+                }
+            }
+            return intersectingHighlights;
+        },
+
+        highlightSelection: function(cssClass, selection) {
+            selection = selection || rangy.getSelection();
+            var cssClassApplier = this.cssClassAppliers[cssClass];
+            var highlights = this.highlights;
+
+            if (!cssClassApplier) {
+                throw new Error("No CSS class applier found for class '" + cssClass + "'");
+            }
+
+            var ranges = selection.getAllRanges();
+            for (var i = 0, len = ranges.length, highlightRange; i < len; ++i) {
+                ranges[i] = ranges[i].cloneRange();
+
+                // Check for intersection with existing highlights. For each intersection, extend the existing highlight
+                // to be the union of the highlight range and the selected range
+                for (var j = 0; j < highlights.length; ++j) {
+                    highlightRange = highlights[j].range;
+                    if (ranges[i].intersectsRange(highlightRange)) {
+                        ranges[i] = ranges[i].union(highlightRange);
+                        highlights.splice(j--, 1);
+                    }
+                }
+            }
+
+            selection.removeAllRanges();
+            return this.highlightRanges(ranges, cssClassApplier);
+        },
+
+        unhighlightSelection: function(selection) {
+            selection = selection || rangy.getSelection();
+            var intersectingHighlights = this.getIntersectingHighlights(selection.getAllRanges());
+
+            // Now unhighlight all the highlighted ranges that overlap with the selection
+            if (intersectingHighlights.length > 0) {
+                this.removeHighlights(intersectingHighlights);
+                selection.removeAllRanges();
+            }
+        },
+
+        selectionOverlapsHighlight: function(selection) {
+            selection = selection || rangy.getSelection();
+            return this.getIntersectingHighlights(selection.getAllRanges()).length > 0;
+        },
+
+        serialize: function() {
+            var highlights = this.highlights;
+            if (highlights.length > 0) {
+                highlights.sort(compareHighlights);
+
+                // Remove all the highlights but preserve the ranges
+                var highlightRanges = [];
+                for (var i = 0, len = highlights.length; i < len; ++i) {
+                    highlightRanges[i] = highlights[i].range;
+                }
+
+                var rangeInfos = api.saveRanges(highlightRanges), serializedHighlights = [], highlight, range;
+
+                // Restore each range in turn and remove the highlight class
+                for (i = rangeInfos.length; i-- > 0; ) {
+                    range = api.restoreRange(rangeInfos[i]);
+                    highlight = highlights[i];
+                    log.info(range + ", " + range.inspect());
+                    highlight.cssClassApplier.undoToRange(range);
+                    serializedHighlights.push( highlight.id + "$" + highlight.cssClassApplier.cssClass
+                            + "$" + api.serializeRange(range, true) );
+                }
+
+                highlights.length = 0;
+
+                return serializedHighlights.join("|");
+            } else {
+                return "";
+            }
+        },
+
+        deserialize: function(serialized, rootNode, doc) {
+            var serializedHighlights = serialized.split("|");
+
+            // Deserialize in reverse document order
+            for (var i = serializedHighlights.length, range, parts, cssClassApplier; i-- > 0; ) {
+                parts = serializedHighlights[i].split("$");
+                range = api.deserializeRange(parts[2], rootNode, doc);
+                cssClassApplier = this.cssClassAppliers[parts[1]];
+                cssClassApplier.applyToRange(range);
+                this.highlights.push( new Highlight(range, cssClassApplier, parseInt(parts[0], 10)) );
+            }
+        }
+    };
+
+    api.createHighlighter = function(cssClass, tagNames) {
+        return new Highlighter(cssClass, tagNames);
+    };
+});
diff --git a/src/js/modules/rangy-highlighter.js b/src/modules/rangy-highlighter.js
similarity index 97%
rename from src/js/modules/rangy-highlighter.js
rename to src/modules/rangy-highlighter.js
index d5fcbc78..9f165f2d 100644
--- a/src/js/modules/rangy-highlighter.js
+++ b/src/modules/rangy-highlighter.js
@@ -1,590 +1,590 @@
-/**
- * Highlighter module for Rangy, a cross-browser JavaScript range and selection library
- * http://code.google.com/p/rangy/
- *
- * Depends on Rangy core, TextRange and CssClassApplier modules.
- *
- * Copyright %%build:year%%, Tim Down
- * Licensed under the MIT license.
- * Version: %%build:version%%
- * Build date: %%build:date%%
- */
-/* build:modularizeWithDependencies(["./rangy-core"]) */
-rangy.createModule("Highlighter", ["ClassApplier"], function(api, module) {
-    var log = log4javascript.getLogger("rangy.Highlighter");
-    var dom = api.dom;
-    var contains = dom.arrayContains;
-    var getBody = dom.getBody;
-    var createOptions = api.util.createOptions;
-
-    // Puts highlights in order, last in document first.
-    function compareHighlights(h1, h2) {
-        return h1.characterRange.start - h2.characterRange.start;
-    }
-
-    var forEach = [].forEach ?
-        function(arr, func) {
-            arr.forEach(func);
-        } :
-        function(arr, func) {
-            for (var i = 0, len = arr.length; i < len; ++i) {
-                func( arr[i] );
-            }
-        };
-
-    var nextHighlightId = 1;
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    var highlighterTypes = {};
-
-    function HighlighterType(type, converterCreator) {
-        this.type = type;
-        this.converterCreator = converterCreator;
-    }
-
-    HighlighterType.prototype.create = function() {
-        var converter = this.converterCreator();
-        converter.type = this.type;
-        return converter;
-    };
-
-    function registerHighlighterType(type, converterCreator) {
-        highlighterTypes[type] = new HighlighterType(type, converterCreator);
-    }
-
-    function getConverter(type) {
-        var highlighterType = highlighterTypes[type];
-        if (highlighterType instanceof HighlighterType) {
-            return highlighterType.create();
-        } else {
-            throw new Error("Highlighter type '" + type + "' is not valid");
-        }
-    }
-
-    api.registerHighlighterType = registerHighlighterType;
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    function CharacterRange(start, end) {
-        this.start = start;
-        this.end = end;
-    }
-
-    CharacterRange.prototype = {
-        intersects: function(charRange) {
-            return this.start < charRange.end && this.end > charRange.start;
-        },
-
-        isContiguousWith: function(charRange) {
-            return this.start == charRange.end || this.end == charRange.start;
-        },
-
-        union: function(charRange) {
-            return new CharacterRange(Math.min(this.start, charRange.start), Math.max(this.end, charRange.end));
-        },
-        
-        intersection: function(charRange) {
-            return new CharacterRange(Math.max(this.start, charRange.start), Math.min(this.end, charRange.end));
-        },
-
-        getComplements: function(charRange) {
-            var ranges = [];
-            if (this.start >= charRange.start) {
-                if (this.end <= charRange.end) {
-                    return [];
-                }
-                ranges.push(new CharacterRange(charRange.end, this.end));
-            } else {
-                ranges.push(new CharacterRange(this.start, Math.min(this.end, charRange.start)));
-                if (this.end > charRange.end) {
-                    ranges.push(new CharacterRange(charRange.end, this.end));
-                }
-            }
-            return ranges;
-        },
-
-        toString: function() {
-            return "[CharacterRange(" + this.start + ", " + this.end + ")]";
-        }
-    };
-
-    CharacterRange.fromCharacterRange = function(charRange) {
-        return new CharacterRange(charRange.start, charRange.end);
-    };
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    var textContentConverter = {
-        rangeToCharacterRange: function(range, containerNode) {
-            var bookmark = range.getBookmark(containerNode);
-            return new CharacterRange(bookmark.start, bookmark.end);
-        },
-
-        characterRangeToRange: function(doc, characterRange, containerNode) {
-            var range = api.createRange(doc);
-            range.moveToBookmark({
-                start: characterRange.start,
-                end: characterRange.end,
-                containerNode: containerNode
-            });
-
-            return range;
-        },
-
-        serializeSelection: function(selection, containerNode) {
-            var ranges = selection.getAllRanges(), rangeCount = ranges.length;
-            var rangeInfos = [];
-
-            var backward = rangeCount == 1 && selection.isBackward();
-
-            for (var i = 0, len = ranges.length; i < len; ++i) {
-                rangeInfos[i] = {
-                    characterRange: this.rangeToCharacterRange(ranges[i], containerNode),
-                    backward: backward
-                };
-            }
-
-            return rangeInfos;
-        },
-
-        restoreSelection: function(selection, savedSelection, containerNode) {
-            selection.removeAllRanges();
-            var doc = selection.win.document;
-            for (var i = 0, len = savedSelection.length, range, rangeInfo, characterRange; i < len; ++i) {
-                rangeInfo = savedSelection[i];
-                characterRange = rangeInfo.characterRange;
-                range = this.characterRangeToRange(doc, rangeInfo.characterRange, containerNode);
-                selection.addRange(range, rangeInfo.backward);
-            }
-        }
-    };
-
-    registerHighlighterType("textContent", function() {
-        return textContentConverter;
-    });
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    // Lazily load the TextRange-based converter so that the dependency is only checked when required.
-    registerHighlighterType("TextRange", (function() {
-        var converter;
-
-        return function() {
-            if (!converter) {
-                // Test that textRangeModule exists and is supported
-                var textRangeModule = api.modules.TextRange;
-                if (!textRangeModule) {
-                    throw new Error("TextRange module is missing.");
-                } else if (!textRangeModule.supported) {
-                    throw new Error("TextRange module is present but not supported.");
-                }
-
-                converter = {
-                    rangeToCharacterRange: function(range, containerNode) {
-                        return CharacterRange.fromCharacterRange( range.toCharacterRange(containerNode) );
-                    },
-
-                    characterRangeToRange: function(doc, characterRange, containerNode) {
-                        var range = api.createRange(doc);
-                        range.selectCharacters(containerNode, characterRange.start, characterRange.end);
-                        return range;
-                    },
-
-                    serializeSelection: function(selection, containerNode) {
-                        return selection.saveCharacterRanges(containerNode);
-                    },
-
-                    restoreSelection: function(selection, savedSelection, containerNode) {
-                        selection.restoreCharacterRanges(containerNode, savedSelection);
-                    }
-                };
-            }
-
-            return converter;
-        };
-    })());
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    function Highlight(doc, characterRange, classApplier, converter, id, containerElementId) {
-        if (id) {
-            this.id = id;
-            nextHighlightId = Math.max(nextHighlightId, id + 1);
-        } else {
-            this.id = nextHighlightId++;
-        }
-        this.characterRange = characterRange;
-        this.doc = doc;
-        this.classApplier = classApplier;
-        this.converter = converter;
-        this.containerElementId = containerElementId || null;
-        this.applied = false;
-    }
-
-    Highlight.prototype = {
-        getContainerElement: function() {
-            return this.containerElementId ? this.doc.getElementById(this.containerElementId) : getBody(this.doc);
-        },
-        
-        getRange: function() {
-            return this.converter.characterRangeToRange(this.doc, this.characterRange, this.getContainerElement());
-        },
-
-        fromRange: function(range) {
-            this.characterRange = this.converter.rangeToCharacterRange(range, this.getContainerElement());
-        },
-        
-        getText: function() {
-            return this.getRange().toString();
-        },
-
-        containsElement: function(el) {
-            return this.getRange().containsNodeContents(el.firstChild);
-        },
-
-        unapply: function() {
-            this.classApplier.undoToRange(this.getRange());
-            this.applied = false;
-        },
-
-        apply: function() {
-            this.classApplier.applyToRange(this.getRange());
-            this.applied = true;
-        },
-        
-        getHighlightElements: function() {
-            return this.classApplier.getElementsWithClassIntersectingRange(this.getRange());
-        },
-
-        toString: function() {
-            return "[Highlight(ID: " + this.id + ", class: " + this.classApplier.className + ", character range: " +
-                this.characterRange.start + " - " + this.characterRange.end + ")]";
-        }
-    };
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    function Highlighter(doc, type) {
-        type = type || "textContent";
-        this.doc = doc || document;
-        this.classAppliers = {};
-        this.highlights = [];
-        this.converter = getConverter(type);
-    }
-
-    Highlighter.prototype = {
-        addClassApplier: function(classApplier) {
-            this.classAppliers[classApplier.className] = classApplier;
-        },
-
-        getHighlightForElement: function(el) {
-            var highlights = this.highlights;
-            for (var i = 0, len = highlights.length; i < len; ++i) {
-                if (highlights[i].containsElement(el)) {
-                    return highlights[i];
-                }
-            }
-            return null;
-        },
-
-        removeHighlights: function(highlights) {
-            for (var i = 0, len = this.highlights.length, highlight; i < len; ++i) {
-                highlight = this.highlights[i];
-                if (contains(highlights, highlight)) {
-                    highlight.unapply();
-                    this.highlights.splice(i--, 1);
-                }
-            }
-        },
-
-        removeAllHighlights: function() {
-            this.removeHighlights(this.highlights);
-        },
-
-        getIntersectingHighlights: function(ranges) {
-            // Test each range against each of the highlighted ranges to see whether they overlap
-            var intersectingHighlights = [], highlights = this.highlights, converter = this.converter;
-            forEach(ranges, function(range) {
-                //var selCharRange = converter.rangeToCharacterRange(range);
-                forEach(highlights, function(highlight) {
-                    if (range.intersectsRange( highlight.getRange() ) && !contains(intersectingHighlights, highlight)) {
-                        intersectingHighlights.push(highlight);
-                    }
-                });
-            });
-
-            return intersectingHighlights;
-        },
-        
-        highlightCharacterRanges: function(className, charRanges, options) {
-            var i, len, j;
-            var highlights = this.highlights;
-            var converter = this.converter;
-            var doc = this.doc;
-            var highlightsToRemove = [];
-            var classApplier = className ? this.classAppliers[className] : null;
-
-            options = createOptions(options, {
-                containerElementId: null,
-                exclusive: true
-            });
-            
-            var containerElementId = options.containerElementId;
-            var exclusive = options.exclusive;
-
-            var containerElement, containerElementRange, containerElementCharRange;
-            if (containerElementId) {
-                containerElement = this.doc.getElementById(containerElementId);
-                if (containerElement) {
-                    containerElementRange = api.createRange(this.doc);
-                    containerElementRange.selectNodeContents(containerElement);
-                    containerElementCharRange = new CharacterRange(0, containerElementRange.toString().length);
-                }
-            }
-
-            var charRange, highlightCharRange, removeHighlight, isSameClassApplier, highlightsToKeep, splitHighlight;
-
-            for (i = 0, len = charRanges.length; i < len; ++i) {
-                charRange = charRanges[i];
-                highlightsToKeep = [];
-
-                // Restrict character range to container element, if it exists
-                if (containerElementCharRange) {
-                    charRange = charRange.intersection(containerElementCharRange);
-                }
-
-                // Ignore empty ranges
-                if (charRange.start == charRange.end) {
-                    continue;
-                }
-
-                // Check for intersection with existing highlights. For each intersection, create a new highlight
-                // which is the union of the highlight range and the selected range
-                for (j = 0; j < highlights.length; ++j) {
-                    removeHighlight = false;
-
-                    if (containerElementId == highlights[j].containerElementId) {
-                        highlightCharRange = highlights[j].characterRange;
-                        isSameClassApplier = (classApplier == highlights[j].classApplier);
-                        splitHighlight = !isSameClassApplier && exclusive;
-
-                        // Replace the existing highlight if it needs to be:
-                        //  1. merged (isSameClassApplier)
-                        //  2. partially or entirely erased (className === null)
-                        //  3. partially or entirely replaced (isSameClassApplier == false && exclusive == true)
-                        if (    (highlightCharRange.intersects(charRange) || highlightCharRange.isContiguousWith(charRange)) &&
-                                (isSameClassApplier || splitHighlight) ) {
-
-                            // Remove existing highlights, keeping the unselected parts
-                            if (splitHighlight) {
-                                forEach(highlightCharRange.getComplements(charRange), function(rangeToAdd) {
-                                    highlightsToKeep.push( new Highlight(doc, rangeToAdd, highlights[j].classApplier, converter, null, containerElementId) );
-                                });
-                            }
-
-                            removeHighlight = true;
-                            if (isSameClassApplier) {
-                                charRange = highlightCharRange.union(charRange);
-                            }
-                        }
-                    }
-
-                    if (removeHighlight) {
-                        highlightsToRemove.push(highlights[j]);
-                        highlights[j] = new Highlight(doc, highlightCharRange.union(charRange), classApplier, converter, null, containerElementId);
-                    } else {
-                        highlightsToKeep.push(highlights[j]);
-                    }
-                }
-
-                // Add new range (only if cssApplier is not false)
-                if (classApplier) {
-                    highlightsToKeep.push(new Highlight(doc, charRange, classApplier, converter, null, containerElementId));
-                }
-                this.highlights = highlights = highlightsToKeep;
-            }
-            
-            // Remove the old highlights
-            forEach(highlightsToRemove, function(highlightToRemove) {
-                highlightToRemove.unapply();
-            });
-
-            // Apply new highlights
-            var newHighlights = [];
-            forEach(highlights, function(highlight) {
-                if (!highlight.applied) {
-                    highlight.apply();
-                    newHighlights.push(highlight);
-                }
-            });
-            
-            return newHighlights;
-        },
-
-        highlightRanges: function(className, ranges, options) {
-            var selCharRanges = [];
-            var converter = this.converter;
-
-            options = createOptions(options, {
-                containerElement: null,
-                exclusive: true
-            });
-
-            var containerElement = options.containerElement;
-            var containerElementId = containerElement ? containerElement.id : null;
-            var containerElementRange;
-            if (containerElement) {
-                containerElementRange = api.createRange(containerElement);
-                containerElementRange.selectNodeContents(containerElement);
-            } 
-
-            forEach(ranges, function(range) {
-                var scopedRange = containerElement ? containerElementRange.intersection(range) : range;
-                selCharRanges.push( converter.rangeToCharacterRange(scopedRange, containerElement || getBody(range.getDocument())) );
-            });
-            
-            return this.highlightCharacterRanges(className, selCharRanges, {
-                containerElementId: containerElementId,
-                exclusive: options.exclusive
-            });
-        },
-
-        highlightSelection: function(className, options) {
-            var converter = this.converter;
-            var classApplier = className ? this.classAppliers[className] : false;
-
-            options = createOptions(options, {
-                containerElementId: null,
-                selection: api.getSelection(),
-                exclusive: true
-            });
-
-            var containerElementId = options.containerElementId;
-            var exclusive = options.exclusive;
-            var selection = options.selection;
-            var doc = selection.win.document;
-            var containerElement = containerElementId ? doc.getElementById(containerElementId) : getBody(doc);
-
-            if (!classApplier && className !== false) {
-                throw new Error("No class applier found for class '" + className + "'");
-            }
-
-            // Store the existing selection as character ranges
-            var serializedSelection = converter.serializeSelection(selection, containerElement);
-
-            // Create an array of selected character ranges
-            var selCharRanges = [];
-            forEach(serializedSelection, function(rangeInfo) {
-                selCharRanges.push( CharacterRange.fromCharacterRange(rangeInfo.characterRange) );
-            });
-            
-            var newHighlights = this.highlightCharacterRanges(className, selCharRanges, {
-                containerElementId: containerElementId,
-                exclusive: exclusive
-            });
-
-            // Restore selection
-            converter.restoreSelection(selection, serializedSelection, containerElement);
-
-            return newHighlights;
-        },
-
-        unhighlightSelection: function(selection) {
-            selection = selection || api.getSelection();
-            var intersectingHighlights = this.getIntersectingHighlights( selection.getAllRanges() );
-            this.removeHighlights(intersectingHighlights);
-            selection.removeAllRanges();
-            return intersectingHighlights;
-        },
-
-        getHighlightsInSelection: function(selection) {
-            selection = selection || api.getSelection();
-            return this.getIntersectingHighlights(selection.getAllRanges());
-        },
-
-        selectionOverlapsHighlight: function(selection) {
-            return this.getHighlightsInSelection(selection).length > 0;
-        },
-
-        serialize: function(options) {
-            var highlights = this.highlights;
-            highlights.sort(compareHighlights);
-            var serializedHighlights = ["type:" + this.converter.type];
-            options = createOptions(options, {
-                serializeHighlightText: false
-            });
-
-            forEach(highlights, function(highlight) {
-                var characterRange = highlight.characterRange;
-                var parts = [
-                    characterRange.start,
-                    characterRange.end,
-                    highlight.id,
-                    highlight.classApplier.className,
-                    highlight.containerElementId
-                ];
-                if (options.serializeHighlightText) {
-                    parts.push(highlight.getText());
-                }
-                serializedHighlights.push( parts.join("$") );
-            });
-
-            return serializedHighlights.join("|");
-        },
-
-        deserialize: function(serialized) {
-            var serializedHighlights = serialized.split("|");
-            var highlights = [];
-
-            var firstHighlight = serializedHighlights[0];
-            var regexResult;
-            var serializationType, serializationConverter, convertType = false;
-            if ( firstHighlight && (regexResult = /^type:(\w+)$/.exec(firstHighlight)) ) {
-                serializationType = regexResult[1];
-                if (serializationType != this.converter.type) {
-                    serializationConverter = getConverter(serializationType);
-                    convertType = true;
-                }
-                serializedHighlights.shift();
-            } else {
-                throw new Error("Serialized highlights are invalid.");
-            }
-            
-            var classApplier, highlight, characterRange, containerElementId, containerElement;
-
-            for (var i = serializedHighlights.length, parts; i-- > 0; ) {
-                parts = serializedHighlights[i].split("$");
-                characterRange = new CharacterRange(+parts[0], +parts[1]);
-                containerElementId = parts[4] || null;
-                containerElement = containerElementId ? this.doc.getElementById(containerElementId) : getBody(this.doc);
-
-                // Convert to the current Highlighter's type, if different from the serialization type
-                if (convertType) {
-                    characterRange = this.converter.rangeToCharacterRange(
-                        serializationConverter.characterRangeToRange(this.doc, characterRange, containerElement),
-                        containerElement
-                    );
-                }
-
-                classApplier = this.classAppliers[ parts[3] ];
-                
-                if (!classApplier) {
-                    throw new Error("No class applier found for class '" + parts[3] + "'");
-                }
-
-                highlight = new Highlight(this.doc, characterRange, classApplier, this.converter, parseInt(parts[2]), containerElementId);
-                highlight.apply();
-                highlights.push(highlight);
-            }
-            this.highlights = highlights;
-        }
-    };
-
-    api.Highlighter = Highlighter;
-
-    api.createHighlighter = function(doc, rangeCharacterOffsetConverterType) {
-        return new Highlighter(doc, rangeCharacterOffsetConverterType);
-    };
-});
-/* build:modularizeEnd */
+/**
+ * Highlighter module for Rangy, a cross-browser JavaScript range and selection library
+ * http://code.google.com/p/rangy/
+ *
+ * Depends on Rangy core, TextRange and CssClassApplier modules.
+ *
+ * Copyright %%build:year%%, Tim Down
+ * Licensed under the MIT license.
+ * Version: %%build:version%%
+ * Build date: %%build:date%%
+ */
+/* build:modularizeWithDependencies(["./rangy-core"]) */
+rangy.createModule("Highlighter", ["ClassApplier"], function(api, module) {
+    var log = log4javascript.getLogger("rangy.Highlighter");
+    var dom = api.dom;
+    var contains = dom.arrayContains;
+    var getBody = dom.getBody;
+    var createOptions = api.util.createOptions;
+
+    // Puts highlights in order, last in document first.
+    function compareHighlights(h1, h2) {
+        return h1.characterRange.start - h2.characterRange.start;
+    }
+
+    var forEach = [].forEach ?
+        function(arr, func) {
+            arr.forEach(func);
+        } :
+        function(arr, func) {
+            for (var i = 0, len = arr.length; i < len; ++i) {
+                func( arr[i] );
+            }
+        };
+
+    var nextHighlightId = 1;
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    var highlighterTypes = {};
+
+    function HighlighterType(type, converterCreator) {
+        this.type = type;
+        this.converterCreator = converterCreator;
+    }
+
+    HighlighterType.prototype.create = function() {
+        var converter = this.converterCreator();
+        converter.type = this.type;
+        return converter;
+    };
+
+    function registerHighlighterType(type, converterCreator) {
+        highlighterTypes[type] = new HighlighterType(type, converterCreator);
+    }
+
+    function getConverter(type) {
+        var highlighterType = highlighterTypes[type];
+        if (highlighterType instanceof HighlighterType) {
+            return highlighterType.create();
+        } else {
+            throw new Error("Highlighter type '" + type + "' is not valid");
+        }
+    }
+
+    api.registerHighlighterType = registerHighlighterType;
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    function CharacterRange(start, end) {
+        this.start = start;
+        this.end = end;
+    }
+
+    CharacterRange.prototype = {
+        intersects: function(charRange) {
+            return this.start < charRange.end && this.end > charRange.start;
+        },
+
+        isContiguousWith: function(charRange) {
+            return this.start == charRange.end || this.end == charRange.start;
+        },
+
+        union: function(charRange) {
+            return new CharacterRange(Math.min(this.start, charRange.start), Math.max(this.end, charRange.end));
+        },
+        
+        intersection: function(charRange) {
+            return new CharacterRange(Math.max(this.start, charRange.start), Math.min(this.end, charRange.end));
+        },
+
+        getComplements: function(charRange) {
+            var ranges = [];
+            if (this.start >= charRange.start) {
+                if (this.end <= charRange.end) {
+                    return [];
+                }
+                ranges.push(new CharacterRange(charRange.end, this.end));
+            } else {
+                ranges.push(new CharacterRange(this.start, Math.min(this.end, charRange.start)));
+                if (this.end > charRange.end) {
+                    ranges.push(new CharacterRange(charRange.end, this.end));
+                }
+            }
+            return ranges;
+        },
+
+        toString: function() {
+            return "[CharacterRange(" + this.start + ", " + this.end + ")]";
+        }
+    };
+
+    CharacterRange.fromCharacterRange = function(charRange) {
+        return new CharacterRange(charRange.start, charRange.end);
+    };
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    var textContentConverter = {
+        rangeToCharacterRange: function(range, containerNode) {
+            var bookmark = range.getBookmark(containerNode);
+            return new CharacterRange(bookmark.start, bookmark.end);
+        },
+
+        characterRangeToRange: function(doc, characterRange, containerNode) {
+            var range = api.createRange(doc);
+            range.moveToBookmark({
+                start: characterRange.start,
+                end: characterRange.end,
+                containerNode: containerNode
+            });
+
+            return range;
+        },
+
+        serializeSelection: function(selection, containerNode) {
+            var ranges = selection.getAllRanges(), rangeCount = ranges.length;
+            var rangeInfos = [];
+
+            var backward = rangeCount == 1 && selection.isBackward();
+
+            for (var i = 0, len = ranges.length; i < len; ++i) {
+                rangeInfos[i] = {
+                    characterRange: this.rangeToCharacterRange(ranges[i], containerNode),
+                    backward: backward
+                };
+            }
+
+            return rangeInfos;
+        },
+
+        restoreSelection: function(selection, savedSelection, containerNode) {
+            selection.removeAllRanges();
+            var doc = selection.win.document;
+            for (var i = 0, len = savedSelection.length, range, rangeInfo, characterRange; i < len; ++i) {
+                rangeInfo = savedSelection[i];
+                characterRange = rangeInfo.characterRange;
+                range = this.characterRangeToRange(doc, rangeInfo.characterRange, containerNode);
+                selection.addRange(range, rangeInfo.backward);
+            }
+        }
+    };
+
+    registerHighlighterType("textContent", function() {
+        return textContentConverter;
+    });
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    // Lazily load the TextRange-based converter so that the dependency is only checked when required.
+    registerHighlighterType("TextRange", (function() {
+        var converter;
+
+        return function() {
+            if (!converter) {
+                // Test that textRangeModule exists and is supported
+                var textRangeModule = api.modules.TextRange;
+                if (!textRangeModule) {
+                    throw new Error("TextRange module is missing.");
+                } else if (!textRangeModule.supported) {
+                    throw new Error("TextRange module is present but not supported.");
+                }
+
+                converter = {
+                    rangeToCharacterRange: function(range, containerNode) {
+                        return CharacterRange.fromCharacterRange( range.toCharacterRange(containerNode) );
+                    },
+
+                    characterRangeToRange: function(doc, characterRange, containerNode) {
+                        var range = api.createRange(doc);
+                        range.selectCharacters(containerNode, characterRange.start, characterRange.end);
+                        return range;
+                    },
+
+                    serializeSelection: function(selection, containerNode) {
+                        return selection.saveCharacterRanges(containerNode);
+                    },
+
+                    restoreSelection: function(selection, savedSelection, containerNode) {
+                        selection.restoreCharacterRanges(containerNode, savedSelection);
+                    }
+                };
+            }
+
+            return converter;
+        };
+    })());
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    function Highlight(doc, characterRange, classApplier, converter, id, containerElementId) {
+        if (id) {
+            this.id = id;
+            nextHighlightId = Math.max(nextHighlightId, id + 1);
+        } else {
+            this.id = nextHighlightId++;
+        }
+        this.characterRange = characterRange;
+        this.doc = doc;
+        this.classApplier = classApplier;
+        this.converter = converter;
+        this.containerElementId = containerElementId || null;
+        this.applied = false;
+    }
+
+    Highlight.prototype = {
+        getContainerElement: function() {
+            return this.containerElementId ? this.doc.getElementById(this.containerElementId) : getBody(this.doc);
+        },
+        
+        getRange: function() {
+            return this.converter.characterRangeToRange(this.doc, this.characterRange, this.getContainerElement());
+        },
+
+        fromRange: function(range) {
+            this.characterRange = this.converter.rangeToCharacterRange(range, this.getContainerElement());
+        },
+        
+        getText: function() {
+            return this.getRange().toString();
+        },
+
+        containsElement: function(el) {
+            return this.getRange().containsNodeContents(el.firstChild);
+        },
+
+        unapply: function() {
+            this.classApplier.undoToRange(this.getRange());
+            this.applied = false;
+        },
+
+        apply: function() {
+            this.classApplier.applyToRange(this.getRange());
+            this.applied = true;
+        },
+        
+        getHighlightElements: function() {
+            return this.classApplier.getElementsWithClassIntersectingRange(this.getRange());
+        },
+
+        toString: function() {
+            return "[Highlight(ID: " + this.id + ", class: " + this.classApplier.className + ", character range: " +
+                this.characterRange.start + " - " + this.characterRange.end + ")]";
+        }
+    };
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    function Highlighter(doc, type) {
+        type = type || "textContent";
+        this.doc = doc || document;
+        this.classAppliers = {};
+        this.highlights = [];
+        this.converter = getConverter(type);
+    }
+
+    Highlighter.prototype = {
+        addClassApplier: function(classApplier) {
+            this.classAppliers[classApplier.className] = classApplier;
+        },
+
+        getHighlightForElement: function(el) {
+            var highlights = this.highlights;
+            for (var i = 0, len = highlights.length; i < len; ++i) {
+                if (highlights[i].containsElement(el)) {
+                    return highlights[i];
+                }
+            }
+            return null;
+        },
+
+        removeHighlights: function(highlights) {
+            for (var i = 0, len = this.highlights.length, highlight; i < len; ++i) {
+                highlight = this.highlights[i];
+                if (contains(highlights, highlight)) {
+                    highlight.unapply();
+                    this.highlights.splice(i--, 1);
+                }
+            }
+        },
+
+        removeAllHighlights: function() {
+            this.removeHighlights(this.highlights);
+        },
+
+        getIntersectingHighlights: function(ranges) {
+            // Test each range against each of the highlighted ranges to see whether they overlap
+            var intersectingHighlights = [], highlights = this.highlights, converter = this.converter;
+            forEach(ranges, function(range) {
+                //var selCharRange = converter.rangeToCharacterRange(range);
+                forEach(highlights, function(highlight) {
+                    if (range.intersectsRange( highlight.getRange() ) && !contains(intersectingHighlights, highlight)) {
+                        intersectingHighlights.push(highlight);
+                    }
+                });
+            });
+
+            return intersectingHighlights;
+        },
+        
+        highlightCharacterRanges: function(className, charRanges, options) {
+            var i, len, j;
+            var highlights = this.highlights;
+            var converter = this.converter;
+            var doc = this.doc;
+            var highlightsToRemove = [];
+            var classApplier = className ? this.classAppliers[className] : null;
+
+            options = createOptions(options, {
+                containerElementId: null,
+                exclusive: true
+            });
+            
+            var containerElementId = options.containerElementId;
+            var exclusive = options.exclusive;
+
+            var containerElement, containerElementRange, containerElementCharRange;
+            if (containerElementId) {
+                containerElement = this.doc.getElementById(containerElementId);
+                if (containerElement) {
+                    containerElementRange = api.createRange(this.doc);
+                    containerElementRange.selectNodeContents(containerElement);
+                    containerElementCharRange = new CharacterRange(0, containerElementRange.toString().length);
+                }
+            }
+
+            var charRange, highlightCharRange, removeHighlight, isSameClassApplier, highlightsToKeep, splitHighlight;
+
+            for (i = 0, len = charRanges.length; i < len; ++i) {
+                charRange = charRanges[i];
+                highlightsToKeep = [];
+
+                // Restrict character range to container element, if it exists
+                if (containerElementCharRange) {
+                    charRange = charRange.intersection(containerElementCharRange);
+                }
+
+                // Ignore empty ranges
+                if (charRange.start == charRange.end) {
+                    continue;
+                }
+
+                // Check for intersection with existing highlights. For each intersection, create a new highlight
+                // which is the union of the highlight range and the selected range
+                for (j = 0; j < highlights.length; ++j) {
+                    removeHighlight = false;
+
+                    if (containerElementId == highlights[j].containerElementId) {
+                        highlightCharRange = highlights[j].characterRange;
+                        isSameClassApplier = (classApplier == highlights[j].classApplier);
+                        splitHighlight = !isSameClassApplier && exclusive;
+
+                        // Replace the existing highlight if it needs to be:
+                        //  1. merged (isSameClassApplier)
+                        //  2. partially or entirely erased (className === null)
+                        //  3. partially or entirely replaced (isSameClassApplier == false && exclusive == true)
+                        if (    (highlightCharRange.intersects(charRange) || highlightCharRange.isContiguousWith(charRange)) &&
+                                (isSameClassApplier || splitHighlight) ) {
+
+                            // Remove existing highlights, keeping the unselected parts
+                            if (splitHighlight) {
+                                forEach(highlightCharRange.getComplements(charRange), function(rangeToAdd) {
+                                    highlightsToKeep.push( new Highlight(doc, rangeToAdd, highlights[j].classApplier, converter, null, containerElementId) );
+                                });
+                            }
+
+                            removeHighlight = true;
+                            if (isSameClassApplier) {
+                                charRange = highlightCharRange.union(charRange);
+                            }
+                        }
+                    }
+
+                    if (removeHighlight) {
+                        highlightsToRemove.push(highlights[j]);
+                        highlights[j] = new Highlight(doc, highlightCharRange.union(charRange), classApplier, converter, null, containerElementId);
+                    } else {
+                        highlightsToKeep.push(highlights[j]);
+                    }
+                }
+
+                // Add new range (only if cssApplier is not false)
+                if (classApplier) {
+                    highlightsToKeep.push(new Highlight(doc, charRange, classApplier, converter, null, containerElementId));
+                }
+                this.highlights = highlights = highlightsToKeep;
+            }
+            
+            // Remove the old highlights
+            forEach(highlightsToRemove, function(highlightToRemove) {
+                highlightToRemove.unapply();
+            });
+
+            // Apply new highlights
+            var newHighlights = [];
+            forEach(highlights, function(highlight) {
+                if (!highlight.applied) {
+                    highlight.apply();
+                    newHighlights.push(highlight);
+                }
+            });
+            
+            return newHighlights;
+        },
+
+        highlightRanges: function(className, ranges, options) {
+            var selCharRanges = [];
+            var converter = this.converter;
+
+            options = createOptions(options, {
+                containerElement: null,
+                exclusive: true
+            });
+
+            var containerElement = options.containerElement;
+            var containerElementId = containerElement ? containerElement.id : null;
+            var containerElementRange;
+            if (containerElement) {
+                containerElementRange = api.createRange(containerElement);
+                containerElementRange.selectNodeContents(containerElement);
+            } 
+
+            forEach(ranges, function(range) {
+                var scopedRange = containerElement ? containerElementRange.intersection(range) : range;
+                selCharRanges.push( converter.rangeToCharacterRange(scopedRange, containerElement || getBody(range.getDocument())) );
+            });
+            
+            return this.highlightCharacterRanges(className, selCharRanges, {
+                containerElementId: containerElementId,
+                exclusive: options.exclusive
+            });
+        },
+
+        highlightSelection: function(className, options) {
+            var converter = this.converter;
+            var classApplier = className ? this.classAppliers[className] : false;
+
+            options = createOptions(options, {
+                containerElementId: null,
+                selection: api.getSelection(),
+                exclusive: true
+            });
+
+            var containerElementId = options.containerElementId;
+            var exclusive = options.exclusive;
+            var selection = options.selection;
+            var doc = selection.win.document;
+            var containerElement = containerElementId ? doc.getElementById(containerElementId) : getBody(doc);
+
+            if (!classApplier && className !== false) {
+                throw new Error("No class applier found for class '" + className + "'");
+            }
+
+            // Store the existing selection as character ranges
+            var serializedSelection = converter.serializeSelection(selection, containerElement);
+
+            // Create an array of selected character ranges
+            var selCharRanges = [];
+            forEach(serializedSelection, function(rangeInfo) {
+                selCharRanges.push( CharacterRange.fromCharacterRange(rangeInfo.characterRange) );
+            });
+            
+            var newHighlights = this.highlightCharacterRanges(className, selCharRanges, {
+                containerElementId: containerElementId,
+                exclusive: exclusive
+            });
+
+            // Restore selection
+            converter.restoreSelection(selection, serializedSelection, containerElement);
+
+            return newHighlights;
+        },
+
+        unhighlightSelection: function(selection) {
+            selection = selection || api.getSelection();
+            var intersectingHighlights = this.getIntersectingHighlights( selection.getAllRanges() );
+            this.removeHighlights(intersectingHighlights);
+            selection.removeAllRanges();
+            return intersectingHighlights;
+        },
+
+        getHighlightsInSelection: function(selection) {
+            selection = selection || api.getSelection();
+            return this.getIntersectingHighlights(selection.getAllRanges());
+        },
+
+        selectionOverlapsHighlight: function(selection) {
+            return this.getHighlightsInSelection(selection).length > 0;
+        },
+
+        serialize: function(options) {
+            var highlights = this.highlights;
+            highlights.sort(compareHighlights);
+            var serializedHighlights = ["type:" + this.converter.type];
+            options = createOptions(options, {
+                serializeHighlightText: false
+            });
+
+            forEach(highlights, function(highlight) {
+                var characterRange = highlight.characterRange;
+                var parts = [
+                    characterRange.start,
+                    characterRange.end,
+                    highlight.id,
+                    highlight.classApplier.className,
+                    highlight.containerElementId
+                ];
+                if (options.serializeHighlightText) {
+                    parts.push(highlight.getText());
+                }
+                serializedHighlights.push( parts.join("$") );
+            });
+
+            return serializedHighlights.join("|");
+        },
+
+        deserialize: function(serialized) {
+            var serializedHighlights = serialized.split("|");
+            var highlights = [];
+
+            var firstHighlight = serializedHighlights[0];
+            var regexResult;
+            var serializationType, serializationConverter, convertType = false;
+            if ( firstHighlight && (regexResult = /^type:(\w+)$/.exec(firstHighlight)) ) {
+                serializationType = regexResult[1];
+                if (serializationType != this.converter.type) {
+                    serializationConverter = getConverter(serializationType);
+                    convertType = true;
+                }
+                serializedHighlights.shift();
+            } else {
+                throw new Error("Serialized highlights are invalid.");
+            }
+            
+            var classApplier, highlight, characterRange, containerElementId, containerElement;
+
+            for (var i = serializedHighlights.length, parts; i-- > 0; ) {
+                parts = serializedHighlights[i].split("$");
+                characterRange = new CharacterRange(+parts[0], +parts[1]);
+                containerElementId = parts[4] || null;
+                containerElement = containerElementId ? this.doc.getElementById(containerElementId) : getBody(this.doc);
+
+                // Convert to the current Highlighter's type, if different from the serialization type
+                if (convertType) {
+                    characterRange = this.converter.rangeToCharacterRange(
+                        serializationConverter.characterRangeToRange(this.doc, characterRange, containerElement),
+                        containerElement
+                    );
+                }
+
+                classApplier = this.classAppliers[ parts[3] ];
+                
+                if (!classApplier) {
+                    throw new Error("No class applier found for class '" + parts[3] + "'");
+                }
+
+                highlight = new Highlight(this.doc, characterRange, classApplier, this.converter, parseInt(parts[2]), containerElementId);
+                highlight.apply();
+                highlights.push(highlight);
+            }
+            this.highlights = highlights;
+        }
+    };
+
+    api.Highlighter = Highlighter;
+
+    api.createHighlighter = function(doc, rangeCharacterOffsetConverterType) {
+        return new Highlighter(doc, rangeCharacterOffsetConverterType);
+    };
+});
+/* build:modularizeEnd */
diff --git a/src/js/modules/rangy-position.js b/src/modules/rangy-position.js
similarity index 97%
rename from src/js/modules/rangy-position.js
rename to src/modules/rangy-position.js
index 5e1e9989..cd4cbc08 100644
--- a/src/js/modules/rangy-position.js
+++ b/src/modules/rangy-position.js
@@ -1,537 +1,537 @@
-/**
- * Position module for Rangy.
- * Extensions to Range and Selection objects to provide access to pixel positions relative to the viewport or document.
- *
- * Part of Rangy, a cross-browser JavaScript range and selection library
- * http://code.google.com/p/rangy/
- *
- * Depends on Rangy core.
- *
- * Copyright %%build:year%%, Tim Down
- * Licensed under the MIT license.
- * Version: %%build:version%%
- * Build date: %%build:date%%
- */
-rangy.createModule("Position", ["WrappedSelection"], function(api, module) {
-    //var log = log4javascript.getLogger("rangy.position");
-
-    var NUMBER = "number", UNDEF = "undefined";
-    var WrappedRange = api.WrappedRange;
-    var WrappedTextRange = api.WrappedTextRange;
-    var dom = api.dom, util = api.util, DomPosition = dom.DomPosition;
-    
-    // Feature detection
-
-    //var caretPositionFromPointSupported = (typeof document.caretPositionFromPoint != UNDEF);
-
-    // Since Rangy can deal with multiple documents which could be in different modes, we have to do the checks every
-    // time, unless we cache a getScrollPosition function in each document. This would necessarily pollute the
-    // document's global namespace, which I'm choosing to view as a greater evil than a slight performance hit.
-    function getScrollPosition(win) {
-        var x = 0, y = 0;
-        if (typeof win.pageXOffset == NUMBER && typeof win.pageYOffset == NUMBER) {
-            x = win.pageXOffset;
-            y = win.pageYOffset;
-        } else {
-            var doc = win.document;
-            var docEl = doc.documentElement;
-            var compatMode = doc.compatMode;
-            var scrollEl = (typeof compatMode == "string" && compatMode.indexOf("CSS") >= 0 && docEl)
-                ? docEl : dom.getBody(doc);
-
-            if (scrollEl && typeof scrollEl.scrollLeft == NUMBER && typeof scrollEl.scrollTop == NUMBER) {
-                try {
-                    x = scrollEl.scrollLeft;
-                    y = scrollEl.scrollTop;
-                } catch (ex) {}
-            }
-        }
-        return { x: x, y: y };
-    }
-
-    function getAncestorElement(node, tagName) {
-        tagName = tagName.toLowerCase();
-        while (node) {
-            if (node.nodeType == 1 && node.tagName.toLowerCase() == tagName) {
-                return node;
-            }
-            node = node.parentNode;
-        }
-        return null;
-    }
-
-    function Rect(top, right, bottom, left) {
-        this.top = top;
-        this.right = right;
-        this.bottom = bottom;
-        this.left = left;
-        this.width = right - left;
-        this.height = bottom - top;
-    }
-
-    function createRelativeRect(rect, dx, dy) {
-        return new Rect(rect.top + dy, rect.right + dx, rect.bottom + dy, rect.left + dx);
-    }
-
-    function adjustClientRect(rect, doc) {
-        // Older IEs have an issue with a two pixel margin on the body element
-        var dx = 0, dy = 0;
-        var docEl = doc.documentElement, body = dom.getBody(doc);
-        var container = (docEl.clientWidth === 0 && typeof body.clientTop == NUMBER) ? body : docEl;
-        var clientLeft = container.clientLeft, clientTop = container.clientTop;
-        if (clientLeft) {
-            dx = -clientLeft;
-        }
-        if (clientTop) {
-            dy = -clientTop;
-        }
-        return createRelativeRect(rect, dx, dy);
-    }
-
-    function mergeRects(rects) {
-        var tops = [], bottoms = [], lefts = [], rights = [];
-        for (var i = 0, len = rects.length, rect; i < len; ++i) {
-            rect = rects[i];
-            if (rect) {
-                tops.push(rect.top);
-                bottoms.push(rect.bottom);
-                lefts.push(rect.left);
-                rights.push(rect.right);
-            }
-        }
-        return new Rect(
-            Math.min.apply(Math, tops),
-            Math.max.apply(Math, rights),
-            Math.max.apply(Math, bottoms),
-            Math.min.apply(Math, lefts)
-        );
-    }
-    
-    function getTextRangePosition(doc, x, y) {
-        var textRange = dom.getBody(doc).createTextRange();
-        textRange.moveToPoint(x, y);
-        var range = new api.WrappedTextRange(textRange);
-        return new DomPosition(range.startContainer, range.startOffset);
-    }
-
-    function caretPositionFromPoint(doc, x, y) {
-        var pos = doc.caretPositionFromPoint(x, y);
-        return new DomPosition(pos.offsetNode, pos.offset);
-    }
-
-    function caretRangeFromPoint(doc, x, y) {
-        var range = doc.caretRangeFromPoint(x, y);
-        return new DomPosition(range.startContainer, range.startOffset);
-    }
-
-    function getLastRangeRect(range) {
-        var rects = (range.nativeRange || range).getClientRects();
-        return (rects.length > 0) ? rects[rects.length - 1] : null;
-    }
-
-    function pointIsInOrAboveRect(x, y, rect) {
-        console.log("pointIsInOrAboveRect", x, y, Math.floor(rect.top), Math.floor(rect.right), Math.floor(rect.bottom), Math.floor(rect.left))
-        return y < rect.bottom && x >= rect.left && x <= rect.right;
-    }
-
-    function positionFromPoint(doc, x, y, favourPrecedingPosition) {
-        var el = doc.elementFromPoint(x, y);
-        
-        console.log("elementFromPoint is ", el);
-
-        var range = api.createRange(doc);
-        range.selectNodeContents(el);
-        range.collapse(true);
-
-        var node = el.firstChild, offset, rect, textLen;
-
-        if (!node) {
-            node = el.parentNode;
-            offset = dom.getNodeIndex(el);
-            if (!favourPrecedingPosition) {
-                ++offset;
-            }
-        } else {
-            // Search through the text node children of el
-            main: while (node) {
-                console.log(node);
-                if (node.nodeType == 3) {
-                    // Go through the text node character by character
-                    for (offset = 0, textLen = node.length; offset <= textLen; ++offset) {
-                        range.setEnd(node, offset);
-                        rect = getLastRangeRect(range);
-                        if (rect && pointIsInOrAboveRect(x, y, rect)) {
-                            // We've gone past the point. Now we check which side (left or right) of the character the point is nearer to
-                            if (rect.right - x > x - rect.left) {
-                                --offset;
-                            }
-                            break main;
-                        }
-                    }
-                } else {
-                    // Handle elements
-                    range.setEndAfter(node);
-                    rect = getLastRangeRect(range);
-                    if (rect && pointIsInOrAboveRect(x, y, rect)) {
-                        offset = dom.getNodeIndex(node);
-                        node = el.parentNode;
-                        if (!favourPrecedingPosition) {
-                            ++offset;
-                        }
-                        break;
-                    }
-                }
-
-                node = node.nextSibling;
-            }
-            if (!node) {
-                node = el;
-                offset = el.childNodes.length;
-            }
-        }
-
-        return new DomPosition(node, offset);
-    }
-
-    function createCaretPositionFromPointGetter(doc) {
-        if (api.features.implementsTextRange) {
-            return getTextRangePosition;
-        } else if (typeof doc.caretPositionFromPoint != UNDEF) {
-            return caretPositionFromPoint;
-        } else if (typeof doc.caretRangeFromPoint != UNDEF) {
-            return caretRangeFromPoint;
-        } else if (typeof doc.elementFromPoint != UNDEF && rangeSupportsGetClientRects) {
-            return positionFromPoint;
-        } else {
-            throw module.createError("createCaretPositionFromPointGetter(): Browser does not provide a recognised method to create a selection from pixel coordinates");
-        }
-    }
-    
-    function createRangeFromPoints(startX, startY, endX, endY, doc) {
-        doc = dom.getContentDocument(doc, module, "createRangeFromPoints");
-        var positionFinder = createCaretPositionFromPointGetter(doc);
-        var startPos = positionFinder(doc, startX, startY, false);
-        var endPos = positionFinder(doc, endX, endY, true);
-        console.log(startPos.node, startPos.offset, endPos.node, endPos.offset);
-        var range = api.createRange(doc);
-        range.setStartAndEnd(startPos.node, startPos.offset, endPos.node, endPos.offset);
-        return range;
-    }
-
-    function moveSelectionToPoints(anchorX, anchorY, focusX, focusY, doc) {
-        var startX, startY, endX, endY;
-
-        // Detect backward selection for coordinates and flip start and end coordinates if necessary
-        var backward = focusY < anchorY || (anchorY == focusY && focusX < anchorX);
-
-        if (backward) {
-            startX = focusX;
-            startY = focusY;
-            endX = anchorX;
-            endY = anchorY;
-        } else {
-            startX = anchorX;
-            startY = anchorY;
-            endX = focusX;
-            endY = focusY;
-        }
-
-        var sel = rangy.getSelection(doc);
-        var range = createRangeFromPoints(startX, startY, endX, endY, doc);
-        sel.setSingleRange(range);
-        return sel;
-    }
-    
-    // Test that <span> elements support getBoundingClientRect
-    var span = document.createElement("span");
-    var elementSupportsGetBoundingClientRect = util.isHostMethod(span, "getBoundingClientRect");
-    span = null;
-
-    // Test for getBoundingClientRect support in Range
-    var rangeSupportsGetClientRects = false, rangeSupportsGetBoundingClientRect = false;
-    if (api.features.implementsDomRange) {
-        var testRange = api.createNativeRange();
-        rangeSupportsGetClientRects = util.isHostMethod(testRange, "getClientRects");
-        rangeSupportsGetBoundingClientRect = util.isHostMethod(testRange, "getBoundingClientRect");
-    }
-
-    util.extend(api.features, {
-        rangeSupportsGetBoundingClientRect: rangeSupportsGetBoundingClientRect,
-        rangeSupportsGetClientRects: rangeSupportsGetClientRects,
-        elementSupportsGetBoundingClientRect: elementSupportsGetBoundingClientRect
-    });
-
-    var createClientBoundaryPosGetter = function(isStart) {
-        return function() {
-            var boundaryRange = this.cloneRange();
-            boundaryRange.collapse(isStart);
-            var rect = boundaryRange.getBoundingClientRect();
-            return {
-                x: rect[isStart ? "left" : "right"],
-                y: rect[isStart ? "top" : "bottom"]
-            };
-        };
-    };
-
-    var rangeProto = api.rangePrototype;
-
-    if (api.features.implementsTextRange && elementSupportsGetBoundingClientRect) {
-        rangeProto.getBoundingClientRect = function() {
-            // We need a TextRange
-            var textRange = WrappedTextRange.rangeToTextRange(this);
-
-            // Work around table problems (table cell bounding rects seem not to count if TextRange spans cells)
-            var cells = this.getNodes([1], function(el) {
-                return /^t[dh]$/i.test(el.tagName);
-            });
-
-            // Merge rects for each cell selected by the range into overall rect
-            var rect, rects = [];
-            if (cells.length > 0) {
-                var lastTable = getAncestorElement(this.startContainer, "table");
-
-                for (var i = 0, cell, tempTextRange, table, subRange, subRect; cell = cells[i]; ++i) {
-                    // Handle non-table sections of the range
-                    table = getAncestorElement(cell, "table");
-                    if (!lastTable || table != lastTable) {
-                        // There is a section of the range prior to the current table, or lying between tables.
-                        // Merge in its rect
-                        subRange = this.cloneRange();
-                        if (lastTable) {
-                            subRange.setStartAfter(lastTable);
-                        }
-                        subRange.setEndBefore(table);
-                        rects.push(WrappedTextRange.rangeToTextRange(subRange).getBoundingClientRect());
-                    }
-
-                    if (this.containsNode(cell)) {
-                        rects.push(cell.getBoundingClientRect());
-                    } else {
-                        tempTextRange = textRange.duplicate();
-                        tempTextRange.moveToElementText(cell);
-                        if (tempTextRange.compareEndPoints("StartToStart", textRange) == -1) {
-                            tempTextRange.setEndPoint("StartToStart", textRange);
-                        } else if (tempTextRange.compareEndPoints("EndToEnd", textRange) == 1) {
-                            tempTextRange.setEndPoint("EndToEnd", textRange);
-                        }
-                        rects.push(tempTextRange.getBoundingClientRect());
-                    }
-                    lastTable = table;
-                }
-
-                // Merge in the rect for any content lying after the final table
-                var endTable = getAncestorElement(this.endContainer, "table");
-                if (!endTable && lastTable) {
-                    subRange = this.cloneRange();
-                    subRange.setStartAfter(lastTable);
-                    rects.push(WrappedTextRange.rangeToTextRange(subRange).getBoundingClientRect());
-                }
-                rect = mergeRects(rects);
-            } else {
-                rect = textRange.getBoundingClientRect();
-            }
-
-            return adjustClientRect(rect, dom.getDocument(this.startContainer));
-        };
-    } else if (api.features.implementsDomRange) {
-        var createWrappedRange = function(range) {
-            return (range instanceof WrappedRange) ? range : new WrappedRange(range);
-        };
-
-        if (rangeSupportsGetBoundingClientRect) {
-            rangeProto.getBoundingClientRect = function() {
-                var nativeRange = createWrappedRange(this).nativeRange;
-                // Test for WebKit getBoundingClientRect bug (https://bugs.webkit.org/show_bug.cgi?id=65324)
-                var rect = nativeRange.getBoundingClientRect() || nativeRange.getClientRects()[0];
-                return adjustClientRect(rect, dom.getDocument(this.startContainer));
-            };
-
-            if (rangeSupportsGetClientRects) {
-                var getElementRectsForPosition = function(node, offset) {
-                    var children = node.childNodes;
-                    //if (offset < children.length)
-                };
-
-                createClientBoundaryPosGetter = function(isStart) {
-                    return function() {
-                        var rect, nativeRange = createWrappedRange(this).nativeRange;
-                        var rects = nativeRange.getClientRects();
-
-                        if (rects.length == 0 && elementSupportsGetBoundingClientRect) {
-                            if (isStart) {
-
-
-                            }
-
-                            console.log(nativeRange, nativeRange.getClientRects(), nativeRange.getBoundingClientRect());
-                            if (this.collapsed
-                                    && this.startContainer.nodeType == 1
-                                    && this.startOffset < this.startContainer.childNodes.length) {
-                                var n = this.startContainer.childNodes[this.startOffset];
-                                if (n.getClientRects) {
-                                    console.log(n, n.getClientRects(), this.startContainer.getClientRects())
-                                }
-
-                            }
-                        }
-
-                        if (rects.length > 0) {
-                            if (isStart) {
-                                rect = rects[0];
-                                return { x: rect.left, y: rect.top };
-                            } else {
-                                rect = rects[rects.length - 1];
-                                return { x: rect.right, y: rect.bottom };
-                            }
-                        } else {
-                            throw module.createError("Cannot get position for range " + this.inspect());
-                        }
-                    };
-                }
-            }
-        } else {
-            var getElementBoundingClientRect = elementSupportsGetBoundingClientRect ?
-                function(el) {
-                    return adjustClientRect(el.getBoundingClientRect(), dom.getDocument(el));
-                } :
-
-                // This implementation is very naive. There are many browser quirks that make it extremely
-                // difficult to get accurate element coordinates in all situations
-                function(el) {
-                    var x = 0, y = 0, offsetEl = el, width = el.offsetWidth, height = el.offsetHeight;
-                    while (offsetEl) {
-                        x += offsetEl.offsetLeft;
-                        y += offsetEl.offsetTop;
-                        offsetEl = offsetEl.offsetParent;
-                    }
-
-                    return adjustClientRect(new Rect(y, x + width, y + height, x), dom.getDocument(el));
-                };
-
-            var getRectFromBoundaries = function(range) {
-                var rect;
-                range.splitBoundaries();
-                var span = document.createElement("span");
-
-                if (range.collapsed) {
-                    range.insertNode(span);
-                    rect = getElementBoundingClientRect(span);
-                    span.parentNode.removeChild(span);
-                } else {
-                    // TODO: This isn't right. I'm not sure it can be made right sensibly. Consider what to do.
-                    // This doesn't consider all the line boxes it needs to consider.
-                    var workingRange = range.cloneRange();
-
-                    // Get the start rectangle
-                    workingRange.collapse(true);
-                    workingRange.insertNode(span);
-                    var startRect = getElementBoundingClientRect(span);
-                    span.parentNode.removeChild(span);
-
-                    // Get the end rectangle
-                    workingRange.collapseToPoint(range.endContainer, range.endOffset);
-                    workingRange.insertNode(span);
-                    var endRect = getElementBoundingClientRect(span);
-                    span.parentNode.removeChild(span);
-
-                    // Merge the start and end rects
-                    var rects = [startRect, endRect];
-
-                    // Merge in rectangles for all elements in the range
-                    var elements = range.getNodes([1], function(el) {
-                        return range.containsNode(el);
-                    });
-
-                    for (var i = 0, len = elements.length; i < len; ++i) {
-                        rects.push(getElementBoundingClientRect(elements[i]));
-                    }
-                    rect = mergeRects(rects)
-                }
-
-                // Clean up
-                range.normalizeBoundaries();
-                return rect;
-            };
-
-            rangeProto.getBoundingClientRect = function(range) {
-                return getRectFromBoundaries(createWrappedRange(range));
-            };
-        }
-
-        function createDocumentBoundaryPosGetter(isStart) {
-            return function() {
-                var pos = this["get" + (isStart ? "Start" : "End") + "ClientPos"]();
-                var scrollPos = getScrollPosition( dom.getWindow(this.startContainer) );
-                return { x: pos.x + scrollPos.x, y: pos.y + scrollPos.y };
-            };
-        }
-    }
-
-    util.extend(rangeProto, {
-        getBoundingDocumentRect: function() {
-            var scrollPos = getScrollPosition( dom.getWindow(this.startContainer) );
-            return createRelativeRect(this.getBoundingClientRect(), scrollPos.x, scrollPos.y);
-        },
-
-        getStartClientPos: createClientBoundaryPosGetter(true),
-        getEndClientPos: createClientBoundaryPosGetter(false),
-
-        getStartDocumentPos: createDocumentBoundaryPosGetter(true),
-        getEndDocumentPos: createDocumentBoundaryPosGetter(false)
-    });
-
-    // Add Selection methods
-    function compareRanges(r1, r2) {
-        return r1.compareBoundaryPoints(r2.START_TO_START, r2);
-    }
-
-    function createSelectionRectGetter(isDocument) {
-        return function() {
-            var rangeMethodName = "getBounding" + (isDocument ? "Document" : "Client") + "Rect";
-            var rects = [];
-            for (var i = 0, rect = null, rangeRect; i < this.rangeCount; ++i) {
-                rects.push(this.getRangeAt(i)[rangeMethodName]());
-            }
-            return mergeRects(rects);
-        };
-    }
-
-    function createSelectionBoundaryPosGetter(isStart, isDocument) {
-        return function() {
-            if (this.rangeCount == 0) {
-                return null;
-            }
-
-            var posType = isDocument ? "Document" : "Client";
-
-            var ranges = this.getAllRanges();
-            if (ranges.length > 1) {
-                // Order the ranges by position within the DOM
-                ranges.sort(compareRanges);
-            }
-
-            return isStart ?
-                ranges[0]["getStart" + posType + "Pos"]() :
-                ranges[ranges.length - 1]["getEnd" + posType + "Pos"]();
-        };
-    }
-
-    util.extend(api.selectionPrototype, {
-        getBoundingClientRect: createSelectionRectGetter(false),
-        getBoundingDocumentRect: createSelectionRectGetter(true),
-
-        getStartClientPos: createSelectionBoundaryPosGetter(true, false),
-        getEndClientPos: createSelectionBoundaryPosGetter(false, false),
-
-        getStartDocumentPos: createSelectionBoundaryPosGetter(true, true),
-        getEndDocumentPos: createSelectionBoundaryPosGetter(false, true)
-    });
-    
-    api.positionFromPoint = function(x, y, doc) {
-        doc = dom.getContentDocument(doc, module, "positionFromPoint");
-        return createCaretPositionFromPointGetter(doc)(doc, x, y);
-    };
-    
-    api.createRangeFromPoints = createRangeFromPoints;
-    api.moveSelectionToPoints = moveSelectionToPoints;
-});
+/**
+ * Position module for Rangy.
+ * Extensions to Range and Selection objects to provide access to pixel positions relative to the viewport or document.
+ *
+ * Part of Rangy, a cross-browser JavaScript range and selection library
+ * http://code.google.com/p/rangy/
+ *
+ * Depends on Rangy core.
+ *
+ * Copyright %%build:year%%, Tim Down
+ * Licensed under the MIT license.
+ * Version: %%build:version%%
+ * Build date: %%build:date%%
+ */
+rangy.createModule("Position", ["WrappedSelection"], function(api, module) {
+    //var log = log4javascript.getLogger("rangy.position");
+
+    var NUMBER = "number", UNDEF = "undefined";
+    var WrappedRange = api.WrappedRange;
+    var WrappedTextRange = api.WrappedTextRange;
+    var dom = api.dom, util = api.util, DomPosition = dom.DomPosition;
+    
+    // Feature detection
+
+    //var caretPositionFromPointSupported = (typeof document.caretPositionFromPoint != UNDEF);
+
+    // Since Rangy can deal with multiple documents which could be in different modes, we have to do the checks every
+    // time, unless we cache a getScrollPosition function in each document. This would necessarily pollute the
+    // document's global namespace, which I'm choosing to view as a greater evil than a slight performance hit.
+    function getScrollPosition(win) {
+        var x = 0, y = 0;
+        if (typeof win.pageXOffset == NUMBER && typeof win.pageYOffset == NUMBER) {
+            x = win.pageXOffset;
+            y = win.pageYOffset;
+        } else {
+            var doc = win.document;
+            var docEl = doc.documentElement;
+            var compatMode = doc.compatMode;
+            var scrollEl = (typeof compatMode == "string" && compatMode.indexOf("CSS") >= 0 && docEl)
+                ? docEl : dom.getBody(doc);
+
+            if (scrollEl && typeof scrollEl.scrollLeft == NUMBER && typeof scrollEl.scrollTop == NUMBER) {
+                try {
+                    x = scrollEl.scrollLeft;
+                    y = scrollEl.scrollTop;
+                } catch (ex) {}
+            }
+        }
+        return { x: x, y: y };
+    }
+
+    function getAncestorElement(node, tagName) {
+        tagName = tagName.toLowerCase();
+        while (node) {
+            if (node.nodeType == 1 && node.tagName.toLowerCase() == tagName) {
+                return node;
+            }
+            node = node.parentNode;
+        }
+        return null;
+    }
+
+    function Rect(top, right, bottom, left) {
+        this.top = top;
+        this.right = right;
+        this.bottom = bottom;
+        this.left = left;
+        this.width = right - left;
+        this.height = bottom - top;
+    }
+
+    function createRelativeRect(rect, dx, dy) {
+        return new Rect(rect.top + dy, rect.right + dx, rect.bottom + dy, rect.left + dx);
+    }
+
+    function adjustClientRect(rect, doc) {
+        // Older IEs have an issue with a two pixel margin on the body element
+        var dx = 0, dy = 0;
+        var docEl = doc.documentElement, body = dom.getBody(doc);
+        var container = (docEl.clientWidth === 0 && typeof body.clientTop == NUMBER) ? body : docEl;
+        var clientLeft = container.clientLeft, clientTop = container.clientTop;
+        if (clientLeft) {
+            dx = -clientLeft;
+        }
+        if (clientTop) {
+            dy = -clientTop;
+        }
+        return createRelativeRect(rect, dx, dy);
+    }
+
+    function mergeRects(rects) {
+        var tops = [], bottoms = [], lefts = [], rights = [];
+        for (var i = 0, len = rects.length, rect; i < len; ++i) {
+            rect = rects[i];
+            if (rect) {
+                tops.push(rect.top);
+                bottoms.push(rect.bottom);
+                lefts.push(rect.left);
+                rights.push(rect.right);
+            }
+        }
+        return new Rect(
+            Math.min.apply(Math, tops),
+            Math.max.apply(Math, rights),
+            Math.max.apply(Math, bottoms),
+            Math.min.apply(Math, lefts)
+        );
+    }
+    
+    function getTextRangePosition(doc, x, y) {
+        var textRange = dom.getBody(doc).createTextRange();
+        textRange.moveToPoint(x, y);
+        var range = new api.WrappedTextRange(textRange);
+        return new DomPosition(range.startContainer, range.startOffset);
+    }
+
+    function caretPositionFromPoint(doc, x, y) {
+        var pos = doc.caretPositionFromPoint(x, y);
+        return new DomPosition(pos.offsetNode, pos.offset);
+    }
+
+    function caretRangeFromPoint(doc, x, y) {
+        var range = doc.caretRangeFromPoint(x, y);
+        return new DomPosition(range.startContainer, range.startOffset);
+    }
+
+    function getLastRangeRect(range) {
+        var rects = (range.nativeRange || range).getClientRects();
+        return (rects.length > 0) ? rects[rects.length - 1] : null;
+    }
+
+    function pointIsInOrAboveRect(x, y, rect) {
+        console.log("pointIsInOrAboveRect", x, y, Math.floor(rect.top), Math.floor(rect.right), Math.floor(rect.bottom), Math.floor(rect.left))
+        return y < rect.bottom && x >= rect.left && x <= rect.right;
+    }
+
+    function positionFromPoint(doc, x, y, favourPrecedingPosition) {
+        var el = doc.elementFromPoint(x, y);
+        
+        console.log("elementFromPoint is ", el);
+
+        var range = api.createRange(doc);
+        range.selectNodeContents(el);
+        range.collapse(true);
+
+        var node = el.firstChild, offset, rect, textLen;
+
+        if (!node) {
+            node = el.parentNode;
+            offset = dom.getNodeIndex(el);
+            if (!favourPrecedingPosition) {
+                ++offset;
+            }
+        } else {
+            // Search through the text node children of el
+            main: while (node) {
+                console.log(node);
+                if (node.nodeType == 3) {
+                    // Go through the text node character by character
+                    for (offset = 0, textLen = node.length; offset <= textLen; ++offset) {
+                        range.setEnd(node, offset);
+                        rect = getLastRangeRect(range);
+                        if (rect && pointIsInOrAboveRect(x, y, rect)) {
+                            // We've gone past the point. Now we check which side (left or right) of the character the point is nearer to
+                            if (rect.right - x > x - rect.left) {
+                                --offset;
+                            }
+                            break main;
+                        }
+                    }
+                } else {
+                    // Handle elements
+                    range.setEndAfter(node);
+                    rect = getLastRangeRect(range);
+                    if (rect && pointIsInOrAboveRect(x, y, rect)) {
+                        offset = dom.getNodeIndex(node);
+                        node = el.parentNode;
+                        if (!favourPrecedingPosition) {
+                            ++offset;
+                        }
+                        break;
+                    }
+                }
+
+                node = node.nextSibling;
+            }
+            if (!node) {
+                node = el;
+                offset = el.childNodes.length;
+            }
+        }
+
+        return new DomPosition(node, offset);
+    }
+
+    function createCaretPositionFromPointGetter(doc) {
+        if (api.features.implementsTextRange) {
+            return getTextRangePosition;
+        } else if (typeof doc.caretPositionFromPoint != UNDEF) {
+            return caretPositionFromPoint;
+        } else if (typeof doc.caretRangeFromPoint != UNDEF) {
+            return caretRangeFromPoint;
+        } else if (typeof doc.elementFromPoint != UNDEF && rangeSupportsGetClientRects) {
+            return positionFromPoint;
+        } else {
+            throw module.createError("createCaretPositionFromPointGetter(): Browser does not provide a recognised method to create a selection from pixel coordinates");
+        }
+    }
+    
+    function createRangeFromPoints(startX, startY, endX, endY, doc) {
+        doc = dom.getContentDocument(doc, module, "createRangeFromPoints");
+        var positionFinder = createCaretPositionFromPointGetter(doc);
+        var startPos = positionFinder(doc, startX, startY, false);
+        var endPos = positionFinder(doc, endX, endY, true);
+        console.log(startPos.node, startPos.offset, endPos.node, endPos.offset);
+        var range = api.createRange(doc);
+        range.setStartAndEnd(startPos.node, startPos.offset, endPos.node, endPos.offset);
+        return range;
+    }
+
+    function moveSelectionToPoints(anchorX, anchorY, focusX, focusY, doc) {
+        var startX, startY, endX, endY;
+
+        // Detect backward selection for coordinates and flip start and end coordinates if necessary
+        var backward = focusY < anchorY || (anchorY == focusY && focusX < anchorX);
+
+        if (backward) {
+            startX = focusX;
+            startY = focusY;
+            endX = anchorX;
+            endY = anchorY;
+        } else {
+            startX = anchorX;
+            startY = anchorY;
+            endX = focusX;
+            endY = focusY;
+        }
+
+        var sel = rangy.getSelection(doc);
+        var range = createRangeFromPoints(startX, startY, endX, endY, doc);
+        sel.setSingleRange(range);
+        return sel;
+    }
+    
+    // Test that <span> elements support getBoundingClientRect
+    var span = document.createElement("span");
+    var elementSupportsGetBoundingClientRect = util.isHostMethod(span, "getBoundingClientRect");
+    span = null;
+
+    // Test for getBoundingClientRect support in Range
+    var rangeSupportsGetClientRects = false, rangeSupportsGetBoundingClientRect = false;
+    if (api.features.implementsDomRange) {
+        var testRange = api.createNativeRange();
+        rangeSupportsGetClientRects = util.isHostMethod(testRange, "getClientRects");
+        rangeSupportsGetBoundingClientRect = util.isHostMethod(testRange, "getBoundingClientRect");
+    }
+
+    util.extend(api.features, {
+        rangeSupportsGetBoundingClientRect: rangeSupportsGetBoundingClientRect,
+        rangeSupportsGetClientRects: rangeSupportsGetClientRects,
+        elementSupportsGetBoundingClientRect: elementSupportsGetBoundingClientRect
+    });
+
+    var createClientBoundaryPosGetter = function(isStart) {
+        return function() {
+            var boundaryRange = this.cloneRange();
+            boundaryRange.collapse(isStart);
+            var rect = boundaryRange.getBoundingClientRect();
+            return {
+                x: rect[isStart ? "left" : "right"],
+                y: rect[isStart ? "top" : "bottom"]
+            };
+        };
+    };
+
+    var rangeProto = api.rangePrototype;
+
+    if (api.features.implementsTextRange && elementSupportsGetBoundingClientRect) {
+        rangeProto.getBoundingClientRect = function() {
+            // We need a TextRange
+            var textRange = WrappedTextRange.rangeToTextRange(this);
+
+            // Work around table problems (table cell bounding rects seem not to count if TextRange spans cells)
+            var cells = this.getNodes([1], function(el) {
+                return /^t[dh]$/i.test(el.tagName);
+            });
+
+            // Merge rects for each cell selected by the range into overall rect
+            var rect, rects = [];
+            if (cells.length > 0) {
+                var lastTable = getAncestorElement(this.startContainer, "table");
+
+                for (var i = 0, cell, tempTextRange, table, subRange, subRect; cell = cells[i]; ++i) {
+                    // Handle non-table sections of the range
+                    table = getAncestorElement(cell, "table");
+                    if (!lastTable || table != lastTable) {
+                        // There is a section of the range prior to the current table, or lying between tables.
+                        // Merge in its rect
+                        subRange = this.cloneRange();
+                        if (lastTable) {
+                            subRange.setStartAfter(lastTable);
+                        }
+                        subRange.setEndBefore(table);
+                        rects.push(WrappedTextRange.rangeToTextRange(subRange).getBoundingClientRect());
+                    }
+
+                    if (this.containsNode(cell)) {
+                        rects.push(cell.getBoundingClientRect());
+                    } else {
+                        tempTextRange = textRange.duplicate();
+                        tempTextRange.moveToElementText(cell);
+                        if (tempTextRange.compareEndPoints("StartToStart", textRange) == -1) {
+                            tempTextRange.setEndPoint("StartToStart", textRange);
+                        } else if (tempTextRange.compareEndPoints("EndToEnd", textRange) == 1) {
+                            tempTextRange.setEndPoint("EndToEnd", textRange);
+                        }
+                        rects.push(tempTextRange.getBoundingClientRect());
+                    }
+                    lastTable = table;
+                }
+
+                // Merge in the rect for any content lying after the final table
+                var endTable = getAncestorElement(this.endContainer, "table");
+                if (!endTable && lastTable) {
+                    subRange = this.cloneRange();
+                    subRange.setStartAfter(lastTable);
+                    rects.push(WrappedTextRange.rangeToTextRange(subRange).getBoundingClientRect());
+                }
+                rect = mergeRects(rects);
+            } else {
+                rect = textRange.getBoundingClientRect();
+            }
+
+            return adjustClientRect(rect, dom.getDocument(this.startContainer));
+        };
+    } else if (api.features.implementsDomRange) {
+        var createWrappedRange = function(range) {
+            return (range instanceof WrappedRange) ? range : new WrappedRange(range);
+        };
+
+        if (rangeSupportsGetBoundingClientRect) {
+            rangeProto.getBoundingClientRect = function() {
+                var nativeRange = createWrappedRange(this).nativeRange;
+                // Test for WebKit getBoundingClientRect bug (https://bugs.webkit.org/show_bug.cgi?id=65324)
+                var rect = nativeRange.getBoundingClientRect() || nativeRange.getClientRects()[0];
+                return adjustClientRect(rect, dom.getDocument(this.startContainer));
+            };
+
+            if (rangeSupportsGetClientRects) {
+                var getElementRectsForPosition = function(node, offset) {
+                    var children = node.childNodes;
+                    //if (offset < children.length)
+                };
+
+                createClientBoundaryPosGetter = function(isStart) {
+                    return function() {
+                        var rect, nativeRange = createWrappedRange(this).nativeRange;
+                        var rects = nativeRange.getClientRects();
+
+                        if (rects.length == 0 && elementSupportsGetBoundingClientRect) {
+                            if (isStart) {
+
+
+                            }
+
+                            console.log(nativeRange, nativeRange.getClientRects(), nativeRange.getBoundingClientRect());
+                            if (this.collapsed
+                                    && this.startContainer.nodeType == 1
+                                    && this.startOffset < this.startContainer.childNodes.length) {
+                                var n = this.startContainer.childNodes[this.startOffset];
+                                if (n.getClientRects) {
+                                    console.log(n, n.getClientRects(), this.startContainer.getClientRects())
+                                }
+
+                            }
+                        }
+
+                        if (rects.length > 0) {
+                            if (isStart) {
+                                rect = rects[0];
+                                return { x: rect.left, y: rect.top };
+                            } else {
+                                rect = rects[rects.length - 1];
+                                return { x: rect.right, y: rect.bottom };
+                            }
+                        } else {
+                            throw module.createError("Cannot get position for range " + this.inspect());
+                        }
+                    };
+                }
+            }
+        } else {
+            var getElementBoundingClientRect = elementSupportsGetBoundingClientRect ?
+                function(el) {
+                    return adjustClientRect(el.getBoundingClientRect(), dom.getDocument(el));
+                } :
+
+                // This implementation is very naive. There are many browser quirks that make it extremely
+                // difficult to get accurate element coordinates in all situations
+                function(el) {
+                    var x = 0, y = 0, offsetEl = el, width = el.offsetWidth, height = el.offsetHeight;
+                    while (offsetEl) {
+                        x += offsetEl.offsetLeft;
+                        y += offsetEl.offsetTop;
+                        offsetEl = offsetEl.offsetParent;
+                    }
+
+                    return adjustClientRect(new Rect(y, x + width, y + height, x), dom.getDocument(el));
+                };
+
+            var getRectFromBoundaries = function(range) {
+                var rect;
+                range.splitBoundaries();
+                var span = document.createElement("span");
+
+                if (range.collapsed) {
+                    range.insertNode(span);
+                    rect = getElementBoundingClientRect(span);
+                    span.parentNode.removeChild(span);
+                } else {
+                    // TODO: This isn't right. I'm not sure it can be made right sensibly. Consider what to do.
+                    // This doesn't consider all the line boxes it needs to consider.
+                    var workingRange = range.cloneRange();
+
+                    // Get the start rectangle
+                    workingRange.collapse(true);
+                    workingRange.insertNode(span);
+                    var startRect = getElementBoundingClientRect(span);
+                    span.parentNode.removeChild(span);
+
+                    // Get the end rectangle
+                    workingRange.collapseToPoint(range.endContainer, range.endOffset);
+                    workingRange.insertNode(span);
+                    var endRect = getElementBoundingClientRect(span);
+                    span.parentNode.removeChild(span);
+
+                    // Merge the start and end rects
+                    var rects = [startRect, endRect];
+
+                    // Merge in rectangles for all elements in the range
+                    var elements = range.getNodes([1], function(el) {
+                        return range.containsNode(el);
+                    });
+
+                    for (var i = 0, len = elements.length; i < len; ++i) {
+                        rects.push(getElementBoundingClientRect(elements[i]));
+                    }
+                    rect = mergeRects(rects)
+                }
+
+                // Clean up
+                range.normalizeBoundaries();
+                return rect;
+            };
+
+            rangeProto.getBoundingClientRect = function(range) {
+                return getRectFromBoundaries(createWrappedRange(range));
+            };
+        }
+
+        function createDocumentBoundaryPosGetter(isStart) {
+            return function() {
+                var pos = this["get" + (isStart ? "Start" : "End") + "ClientPos"]();
+                var scrollPos = getScrollPosition( dom.getWindow(this.startContainer) );
+                return { x: pos.x + scrollPos.x, y: pos.y + scrollPos.y };
+            };
+        }
+    }
+
+    util.extend(rangeProto, {
+        getBoundingDocumentRect: function() {
+            var scrollPos = getScrollPosition( dom.getWindow(this.startContainer) );
+            return createRelativeRect(this.getBoundingClientRect(), scrollPos.x, scrollPos.y);
+        },
+
+        getStartClientPos: createClientBoundaryPosGetter(true),
+        getEndClientPos: createClientBoundaryPosGetter(false),
+
+        getStartDocumentPos: createDocumentBoundaryPosGetter(true),
+        getEndDocumentPos: createDocumentBoundaryPosGetter(false)
+    });
+
+    // Add Selection methods
+    function compareRanges(r1, r2) {
+        return r1.compareBoundaryPoints(r2.START_TO_START, r2);
+    }
+
+    function createSelectionRectGetter(isDocument) {
+        return function() {
+            var rangeMethodName = "getBounding" + (isDocument ? "Document" : "Client") + "Rect";
+            var rects = [];
+            for (var i = 0, rect = null, rangeRect; i < this.rangeCount; ++i) {
+                rects.push(this.getRangeAt(i)[rangeMethodName]());
+            }
+            return mergeRects(rects);
+        };
+    }
+
+    function createSelectionBoundaryPosGetter(isStart, isDocument) {
+        return function() {
+            if (this.rangeCount == 0) {
+                return null;
+            }
+
+            var posType = isDocument ? "Document" : "Client";
+
+            var ranges = this.getAllRanges();
+            if (ranges.length > 1) {
+                // Order the ranges by position within the DOM
+                ranges.sort(compareRanges);
+            }
+
+            return isStart ?
+                ranges[0]["getStart" + posType + "Pos"]() :
+                ranges[ranges.length - 1]["getEnd" + posType + "Pos"]();
+        };
+    }
+
+    util.extend(api.selectionPrototype, {
+        getBoundingClientRect: createSelectionRectGetter(false),
+        getBoundingDocumentRect: createSelectionRectGetter(true),
+
+        getStartClientPos: createSelectionBoundaryPosGetter(true, false),
+        getEndClientPos: createSelectionBoundaryPosGetter(false, false),
+
+        getStartDocumentPos: createSelectionBoundaryPosGetter(true, true),
+        getEndDocumentPos: createSelectionBoundaryPosGetter(false, true)
+    });
+    
+    api.positionFromPoint = function(x, y, doc) {
+        doc = dom.getContentDocument(doc, module, "positionFromPoint");
+        return createCaretPositionFromPointGetter(doc)(doc, x, y);
+    };
+    
+    api.createRangeFromPoints = createRangeFromPoints;
+    api.moveSelectionToPoints = moveSelectionToPoints;
+});
diff --git a/src/js/modules/rangy-selectionsaverestore.js b/src/modules/rangy-selectionsaverestore.js
similarity index 97%
rename from src/js/modules/rangy-selectionsaverestore.js
rename to src/modules/rangy-selectionsaverestore.js
index 1967e812..c820f4e3 100644
--- a/src/js/modules/rangy-selectionsaverestore.js
+++ b/src/modules/rangy-selectionsaverestore.js
@@ -1,236 +1,236 @@
-/**
- * Selection save and restore module for Rangy.
- * Saves and restores user selections using marker invisible elements in the DOM.
- *
- * Part of Rangy, a cross-browser JavaScript range and selection library
- * http://code.google.com/p/rangy/
- *
- * Depends on Rangy core.
- *
- * Copyright %%build:year%%, Tim Down
- * Licensed under the MIT license.
- * Version: %%build:version%%
- * Build date: %%build:date%%
- */
-/* build:modularizeWithDependencies(["./rangy-core"]) */
-rangy.createModule("SaveRestore", ["WrappedRange"], function(api, module) {
-    var dom = api.dom;
-
-    var markerTextChar = "\ufeff";
-
-    function gEBI(id, doc) {
-        return (doc || document).getElementById(id);
-    }
-
-    function insertRangeBoundaryMarker(range, atStart) {
-        var markerId = "selectionBoundary_" + (+new Date()) + "_" + ("" + Math.random()).slice(2);
-        var markerEl;
-        var doc = dom.getDocument(range.startContainer);
-
-        // Clone the Range and collapse to the appropriate boundary point
-        var boundaryRange = range.cloneRange();
-        boundaryRange.collapse(atStart);
-
-        // Create the marker element containing a single invisible character using DOM methods and insert it
-        markerEl = doc.createElement("span");
-        markerEl.id = markerId;
-        markerEl.style.lineHeight = "0";
-        markerEl.style.display = "none";
-        markerEl.className = "rangySelectionBoundary";
-        markerEl.appendChild(doc.createTextNode(markerTextChar));
-
-        boundaryRange.insertNode(markerEl);
-        return markerEl;
-    }
-
-    function setRangeBoundary(doc, range, markerId, atStart) {
-        var markerEl = gEBI(markerId, doc);
-        if (markerEl) {
-            range[atStart ? "setStartBefore" : "setEndBefore"](markerEl);
-            markerEl.parentNode.removeChild(markerEl);
-        } else {
-            module.warn("Marker element has been removed. Cannot restore selection.");
-        }
-    }
-
-    function compareRanges(r1, r2) {
-        return r2.compareBoundaryPoints(r1.START_TO_START, r1);
-    }
-
-    function saveRange(range, backward) {
-        var startEl, endEl, doc = api.DomRange.getRangeDocument(range), text = range.toString();
-
-        if (range.collapsed) {
-            endEl = insertRangeBoundaryMarker(range, false);
-            return {
-                document: doc,
-                markerId: endEl.id,
-                collapsed: true
-            };
-        } else {
-            endEl = insertRangeBoundaryMarker(range, false);
-            startEl = insertRangeBoundaryMarker(range, true);
-
-            return {
-                document: doc,
-                startMarkerId: startEl.id,
-                endMarkerId: endEl.id,
-                collapsed: false,
-                backward: backward,
-                toString: function() {
-                    return "original text: '" + text + "', new text: '" + range.toString() + "'";
-                }
-            };
-        }
-    }
-
-    function restoreRange(rangeInfo, normalize) {
-        var doc = rangeInfo.document;
-        if (typeof normalize == "undefined") {
-            normalize = true;
-        }
-        var range = api.createRange(doc);
-        if (rangeInfo.collapsed) {
-            var markerEl = gEBI(rangeInfo.markerId, doc);
-            if (markerEl) {
-                markerEl.style.display = "inline";
-                var previousNode = markerEl.previousSibling;
-
-                // Workaround for issue 17
-                if (previousNode && previousNode.nodeType == 3) {
-                    markerEl.parentNode.removeChild(markerEl);
-                    range.collapseToPoint(previousNode, previousNode.length);
-                } else {
-                    range.collapseBefore(markerEl);
-                    markerEl.parentNode.removeChild(markerEl);
-                }
-            } else {
-                module.warn("Marker element has been removed. Cannot restore selection.");
-            }
-        } else {
-            setRangeBoundary(doc, range, rangeInfo.startMarkerId, true);
-            setRangeBoundary(doc, range, rangeInfo.endMarkerId, false);
-        }
-
-        if (normalize) {
-            range.normalizeBoundaries();
-        }
-
-        return range;
-    }
-
-    function saveRanges(ranges, backward) {
-        var rangeInfos = [], range, doc;
-
-        // Order the ranges by position within the DOM, latest first, cloning the array to leave the original untouched
-        ranges = ranges.slice(0);
-        ranges.sort(compareRanges);
-
-        for (var i = 0, len = ranges.length; i < len; ++i) {
-            rangeInfos[i] = saveRange(ranges[i], backward);
-        }
-
-        // Now that all the markers are in place and DOM manipulation over, adjust each range's boundaries to lie
-        // between its markers
-        for (i = len - 1; i >= 0; --i) {
-            range = ranges[i];
-            doc = api.DomRange.getRangeDocument(range);
-            if (range.collapsed) {
-                range.collapseAfter(gEBI(rangeInfos[i].markerId, doc));
-            } else {
-                range.setEndBefore(gEBI(rangeInfos[i].endMarkerId, doc));
-                range.setStartAfter(gEBI(rangeInfos[i].startMarkerId, doc));
-            }
-        }
-
-        return rangeInfos;
-    }
-
-    function saveSelection(win) {
-        if (!api.isSelectionValid(win)) {
-            module.warn("Cannot save selection. This usually happens when the selection is collapsed and the selection document has lost focus.");
-            return null;
-        }
-        var sel = api.getSelection(win);
-        var ranges = sel.getAllRanges();
-        var backward = (ranges.length == 1 && sel.isBackward());
-
-        var rangeInfos = saveRanges(ranges, backward);
-
-        // Ensure current selection is unaffected
-        if (backward) {
-            sel.setSingleRange(ranges[0], "backward");
-        } else {
-            sel.setRanges(ranges);
-        }
-
-        return {
-            win: win,
-            rangeInfos: rangeInfos,
-            restored: false
-        };
-    }
-
-    function restoreRanges(rangeInfos) {
-        var ranges = [];
-
-        // Ranges are in reverse order of appearance in the DOM. We want to restore earliest first to avoid
-        // normalization affecting previously restored ranges.
-        var rangeCount = rangeInfos.length;
-
-        for (var i = rangeCount - 1; i >= 0; i--) {
-            ranges[i] = restoreRange(rangeInfos[i], true);
-        }
-
-        return ranges;
-    }
-
-    function restoreSelection(savedSelection, preserveDirection) {
-        if (!savedSelection.restored) {
-            var rangeInfos = savedSelection.rangeInfos;
-            var sel = api.getSelection(savedSelection.win);
-            var ranges = restoreRanges(rangeInfos), rangeCount = rangeInfos.length;
-
-            if (rangeCount == 1 && preserveDirection && api.features.selectionHasExtend && rangeInfos[0].backward) {
-                sel.removeAllRanges();
-                sel.addRange(ranges[0], true);
-            } else {
-                sel.setRanges(ranges);
-            }
-
-            savedSelection.restored = true;
-        }
-    }
-
-    function removeMarkerElement(doc, markerId) {
-        var markerEl = gEBI(markerId, doc);
-        if (markerEl) {
-            markerEl.parentNode.removeChild(markerEl);
-        }
-    }
-
-    function removeMarkers(savedSelection) {
-        var rangeInfos = savedSelection.rangeInfos;
-        for (var i = 0, len = rangeInfos.length, rangeInfo; i < len; ++i) {
-            rangeInfo = rangeInfos[i];
-            if (rangeInfo.collapsed) {
-                removeMarkerElement(savedSelection.doc, rangeInfo.markerId);
-            } else {
-                removeMarkerElement(savedSelection.doc, rangeInfo.startMarkerId);
-                removeMarkerElement(savedSelection.doc, rangeInfo.endMarkerId);
-            }
-        }
-    }
-
-    api.util.extend(api, {
-        saveRange: saveRange,
-        restoreRange: restoreRange,
-        saveRanges: saveRanges,
-        restoreRanges: restoreRanges,
-        saveSelection: saveSelection,
-        restoreSelection: restoreSelection,
-        removeMarkerElement: removeMarkerElement,
-        removeMarkers: removeMarkers
-    });
-});
+/**
+ * Selection save and restore module for Rangy.
+ * Saves and restores user selections using marker invisible elements in the DOM.
+ *
+ * Part of Rangy, a cross-browser JavaScript range and selection library
+ * http://code.google.com/p/rangy/
+ *
+ * Depends on Rangy core.
+ *
+ * Copyright %%build:year%%, Tim Down
+ * Licensed under the MIT license.
+ * Version: %%build:version%%
+ * Build date: %%build:date%%
+ */
+/* build:modularizeWithDependencies(["./rangy-core"]) */
+rangy.createModule("SaveRestore", ["WrappedRange"], function(api, module) {
+    var dom = api.dom;
+
+    var markerTextChar = "\ufeff";
+
+    function gEBI(id, doc) {
+        return (doc || document).getElementById(id);
+    }
+
+    function insertRangeBoundaryMarker(range, atStart) {
+        var markerId = "selectionBoundary_" + (+new Date()) + "_" + ("" + Math.random()).slice(2);
+        var markerEl;
+        var doc = dom.getDocument(range.startContainer);
+
+        // Clone the Range and collapse to the appropriate boundary point
+        var boundaryRange = range.cloneRange();
+        boundaryRange.collapse(atStart);
+
+        // Create the marker element containing a single invisible character using DOM methods and insert it
+        markerEl = doc.createElement("span");
+        markerEl.id = markerId;
+        markerEl.style.lineHeight = "0";
+        markerEl.style.display = "none";
+        markerEl.className = "rangySelectionBoundary";
+        markerEl.appendChild(doc.createTextNode(markerTextChar));
+
+        boundaryRange.insertNode(markerEl);
+        return markerEl;
+    }
+
+    function setRangeBoundary(doc, range, markerId, atStart) {
+        var markerEl = gEBI(markerId, doc);
+        if (markerEl) {
+            range[atStart ? "setStartBefore" : "setEndBefore"](markerEl);
+            markerEl.parentNode.removeChild(markerEl);
+        } else {
+            module.warn("Marker element has been removed. Cannot restore selection.");
+        }
+    }
+
+    function compareRanges(r1, r2) {
+        return r2.compareBoundaryPoints(r1.START_TO_START, r1);
+    }
+
+    function saveRange(range, backward) {
+        var startEl, endEl, doc = api.DomRange.getRangeDocument(range), text = range.toString();
+
+        if (range.collapsed) {
+            endEl = insertRangeBoundaryMarker(range, false);
+            return {
+                document: doc,
+                markerId: endEl.id,
+                collapsed: true
+            };
+        } else {
+            endEl = insertRangeBoundaryMarker(range, false);
+            startEl = insertRangeBoundaryMarker(range, true);
+
+            return {
+                document: doc,
+                startMarkerId: startEl.id,
+                endMarkerId: endEl.id,
+                collapsed: false,
+                backward: backward,
+                toString: function() {
+                    return "original text: '" + text + "', new text: '" + range.toString() + "'";
+                }
+            };
+        }
+    }
+
+    function restoreRange(rangeInfo, normalize) {
+        var doc = rangeInfo.document;
+        if (typeof normalize == "undefined") {
+            normalize = true;
+        }
+        var range = api.createRange(doc);
+        if (rangeInfo.collapsed) {
+            var markerEl = gEBI(rangeInfo.markerId, doc);
+            if (markerEl) {
+                markerEl.style.display = "inline";
+                var previousNode = markerEl.previousSibling;
+
+                // Workaround for issue 17
+                if (previousNode && previousNode.nodeType == 3) {
+                    markerEl.parentNode.removeChild(markerEl);
+                    range.collapseToPoint(previousNode, previousNode.length);
+                } else {
+                    range.collapseBefore(markerEl);
+                    markerEl.parentNode.removeChild(markerEl);
+                }
+            } else {
+                module.warn("Marker element has been removed. Cannot restore selection.");
+            }
+        } else {
+            setRangeBoundary(doc, range, rangeInfo.startMarkerId, true);
+            setRangeBoundary(doc, range, rangeInfo.endMarkerId, false);
+        }
+
+        if (normalize) {
+            range.normalizeBoundaries();
+        }
+
+        return range;
+    }
+
+    function saveRanges(ranges, backward) {
+        var rangeInfos = [], range, doc;
+
+        // Order the ranges by position within the DOM, latest first, cloning the array to leave the original untouched
+        ranges = ranges.slice(0);
+        ranges.sort(compareRanges);
+
+        for (var i = 0, len = ranges.length; i < len; ++i) {
+            rangeInfos[i] = saveRange(ranges[i], backward);
+        }
+
+        // Now that all the markers are in place and DOM manipulation over, adjust each range's boundaries to lie
+        // between its markers
+        for (i = len - 1; i >= 0; --i) {
+            range = ranges[i];
+            doc = api.DomRange.getRangeDocument(range);
+            if (range.collapsed) {
+                range.collapseAfter(gEBI(rangeInfos[i].markerId, doc));
+            } else {
+                range.setEndBefore(gEBI(rangeInfos[i].endMarkerId, doc));
+                range.setStartAfter(gEBI(rangeInfos[i].startMarkerId, doc));
+            }
+        }
+
+        return rangeInfos;
+    }
+
+    function saveSelection(win) {
+        if (!api.isSelectionValid(win)) {
+            module.warn("Cannot save selection. This usually happens when the selection is collapsed and the selection document has lost focus.");
+            return null;
+        }
+        var sel = api.getSelection(win);
+        var ranges = sel.getAllRanges();
+        var backward = (ranges.length == 1 && sel.isBackward());
+
+        var rangeInfos = saveRanges(ranges, backward);
+
+        // Ensure current selection is unaffected
+        if (backward) {
+            sel.setSingleRange(ranges[0], "backward");
+        } else {
+            sel.setRanges(ranges);
+        }
+
+        return {
+            win: win,
+            rangeInfos: rangeInfos,
+            restored: false
+        };
+    }
+
+    function restoreRanges(rangeInfos) {
+        var ranges = [];
+
+        // Ranges are in reverse order of appearance in the DOM. We want to restore earliest first to avoid
+        // normalization affecting previously restored ranges.
+        var rangeCount = rangeInfos.length;
+
+        for (var i = rangeCount - 1; i >= 0; i--) {
+            ranges[i] = restoreRange(rangeInfos[i], true);
+        }
+
+        return ranges;
+    }
+
+    function restoreSelection(savedSelection, preserveDirection) {
+        if (!savedSelection.restored) {
+            var rangeInfos = savedSelection.rangeInfos;
+            var sel = api.getSelection(savedSelection.win);
+            var ranges = restoreRanges(rangeInfos), rangeCount = rangeInfos.length;
+
+            if (rangeCount == 1 && preserveDirection && api.features.selectionHasExtend && rangeInfos[0].backward) {
+                sel.removeAllRanges();
+                sel.addRange(ranges[0], true);
+            } else {
+                sel.setRanges(ranges);
+            }
+
+            savedSelection.restored = true;
+        }
+    }
+
+    function removeMarkerElement(doc, markerId) {
+        var markerEl = gEBI(markerId, doc);
+        if (markerEl) {
+            markerEl.parentNode.removeChild(markerEl);
+        }
+    }
+
+    function removeMarkers(savedSelection) {
+        var rangeInfos = savedSelection.rangeInfos;
+        for (var i = 0, len = rangeInfos.length, rangeInfo; i < len; ++i) {
+            rangeInfo = rangeInfos[i];
+            if (rangeInfo.collapsed) {
+                removeMarkerElement(savedSelection.doc, rangeInfo.markerId);
+            } else {
+                removeMarkerElement(savedSelection.doc, rangeInfo.startMarkerId);
+                removeMarkerElement(savedSelection.doc, rangeInfo.endMarkerId);
+            }
+        }
+    }
+
+    api.util.extend(api, {
+        saveRange: saveRange,
+        restoreRange: restoreRange,
+        saveRanges: saveRanges,
+        restoreRanges: restoreRanges,
+        saveSelection: saveSelection,
+        restoreSelection: restoreSelection,
+        removeMarkerElement: removeMarkerElement,
+        removeMarkers: removeMarkers
+    });
+});
 /* build:modularizeEnd */
\ No newline at end of file
diff --git a/src/js/modules/rangy-serializer.js b/src/modules/rangy-serializer.js
similarity index 97%
rename from src/js/modules/rangy-serializer.js
rename to src/modules/rangy-serializer.js
index 699eb3eb..9d11ea14 100644
--- a/src/js/modules/rangy-serializer.js
+++ b/src/modules/rangy-serializer.js
@@ -1,300 +1,300 @@
-/**
- * Serializer module for Rangy.
- * Serializes Ranges and Selections. An example use would be to store a user's selection on a particular page in a
- * cookie or local storage and restore it on the user's next visit to the same page.
- *
- * Part of Rangy, a cross-browser JavaScript range and selection library
- * http://code.google.com/p/rangy/
- *
- * Depends on Rangy core.
- *
- * Copyright %%build:year%%, Tim Down
- * Licensed under the MIT license.
- * Version: %%build:version%%
- * Build date: %%build:date%%
- */
-/* build:modularizeWithDependencies(["./rangy-core"]) */
-rangy.createModule("Serializer", ["WrappedSelection"], function(api, module) {
-    var UNDEF = "undefined";
-
-    // encodeURIComponent and decodeURIComponent are required for cookie handling
-    if (typeof encodeURIComponent == UNDEF || typeof decodeURIComponent == UNDEF) {
-        module.fail("Global object is missing encodeURIComponent and/or decodeURIComponent method");
-    }
-
-    // Checksum for checking whether range can be serialized
-    var crc32 = (function() {
-        function utf8encode(str) {
-            var utf8CharCodes = [];
-
-            for (var i = 0, len = str.length, c; i < len; ++i) {
-                c = str.charCodeAt(i);
-                if (c < 128) {
-                    utf8CharCodes.push(c);
-                } else if (c < 2048) {
-                    utf8CharCodes.push((c >> 6) | 192, (c & 63) | 128);
-                } else {
-                    utf8CharCodes.push((c >> 12) | 224, ((c >> 6) & 63) | 128, (c & 63) | 128);
-                }
-            }
-            return utf8CharCodes;
-        }
-
-        var cachedCrcTable = null;
-
-        function buildCRCTable() {
-            var table = [];
-            for (var i = 0, j, crc; i < 256; ++i) {
-                crc = i;
-                j = 8;
-                while (j--) {
-                    if ((crc & 1) == 1) {
-                        crc = (crc >>> 1) ^ 0xEDB88320;
-                    } else {
-                        crc >>>= 1;
-                    }
-                }
-                table[i] = crc >>> 0;
-            }
-            return table;
-        }
-
-        function getCrcTable() {
-            if (!cachedCrcTable) {
-                cachedCrcTable = buildCRCTable();
-            }
-            return cachedCrcTable;
-        }
-
-        return function(str) {
-            var utf8CharCodes = utf8encode(str), crc = -1, crcTable = getCrcTable();
-            for (var i = 0, len = utf8CharCodes.length, y; i < len; ++i) {
-                y = (crc ^ utf8CharCodes[i]) & 0xFF;
-                crc = (crc >>> 8) ^ crcTable[y];
-            }
-            return (crc ^ -1) >>> 0;
-        };
-    })();
-
-    var dom = api.dom;
-
-    function escapeTextForHtml(str) {
-        return str.replace(/</g, "&lt;").replace(/>/g, "&gt;");
-    }
-
-    function nodeToInfoString(node, infoParts) {
-        infoParts = infoParts || [];
-        var nodeType = node.nodeType, children = node.childNodes, childCount = children.length;
-        var nodeInfo = [nodeType, node.nodeName, childCount].join(":");
-        var start = "", end = "";
-        switch (nodeType) {
-            case 3: // Text node
-                start = escapeTextForHtml(node.nodeValue);
-                break;
-            case 8: // Comment
-                start = "<!--" + escapeTextForHtml(node.nodeValue) + "-->";
-                break;
-            default:
-                start = "<" + nodeInfo + ">";
-                end = "</>";
-                break;
-        }
-        if (start) {
-            infoParts.push(start);
-        }
-        for (var i = 0; i < childCount; ++i) {
-            nodeToInfoString(children[i], infoParts);
-        }
-        if (end) {
-            infoParts.push(end);
-        }
-        return infoParts;
-    }
-
-    // Creates a string representation of the specified element's contents that is similar to innerHTML but omits all
-    // attributes and comments and includes child node counts. This is done instead of using innerHTML to work around
-    // IE <= 8's policy of including element properties in attributes, which ruins things by changing an element's
-    // innerHTML whenever the user changes an input within the element.
-    function getElementChecksum(el) {
-        var info = nodeToInfoString(el).join("");
-        return crc32(info).toString(16);
-    }
-
-    function serializePosition(node, offset, rootNode) {
-        var pathParts = [], n = node;
-        rootNode = rootNode || dom.getDocument(node).documentElement;
-        while (n && n != rootNode) {
-            pathParts.push(dom.getNodeIndex(n, true));
-            n = n.parentNode;
-        }
-        return pathParts.join("/") + ":" + offset;
-    }
-
-    function deserializePosition(serialized, rootNode, doc) {
-        if (!rootNode) {
-            rootNode = (doc || document).documentElement;
-        }
-        var parts = serialized.split(":");
-        var node = rootNode;
-        var nodeIndices = parts[0] ? parts[0].split("/") : [], i = nodeIndices.length, nodeIndex;
-
-        while (i--) {
-            nodeIndex = parseInt(nodeIndices[i], 10);
-            if (nodeIndex < node.childNodes.length) {
-                node = node.childNodes[nodeIndex];
-            } else {
-                throw module.createError("deserializePosition() failed: node " + dom.inspectNode(node) +
-                        " has no child with index " + nodeIndex + ", " + i);
-            }
-        }
-
-        return new dom.DomPosition(node, parseInt(parts[1], 10));
-    }
-
-    function serializeRange(range, omitChecksum, rootNode) {
-        rootNode = rootNode || api.DomRange.getRangeDocument(range).documentElement;
-        if (!dom.isOrIsAncestorOf(rootNode, range.commonAncestorContainer)) {
-            throw module.createError("serializeRange(): range " + range.inspect() +
-                " is not wholly contained within specified root node " + dom.inspectNode(rootNode));
-        }
-        var serialized = serializePosition(range.startContainer, range.startOffset, rootNode) + "," +
-            serializePosition(range.endContainer, range.endOffset, rootNode);
-        if (!omitChecksum) {
-            serialized += "{" + getElementChecksum(rootNode) + "}";
-        }
-        return serialized;
-    }
-
-    var deserializeRegex = /^([^,]+),([^,\{]+)(\{([^}]+)\})?$/;
-    
-    function deserializeRange(serialized, rootNode, doc) {
-        if (rootNode) {
-            doc = doc || dom.getDocument(rootNode);
-        } else {
-            doc = doc || document;
-            rootNode = doc.documentElement;
-        }
-        var result = deserializeRegex.exec(serialized);
-        var checksum = result[4];
-        if (checksum) {
-            var rootNodeChecksum = getElementChecksum(rootNode);
-            if (checksum !== rootNodeChecksum) {
-                throw module.createError("deserializeRange(): checksums of serialized range root node (" + checksum +
-                    ") and target root node (" + rootNodeChecksum + ") do not match");
-            }
-        }
-        var start = deserializePosition(result[1], rootNode, doc), end = deserializePosition(result[2], rootNode, doc);
-        var range = api.createRange(doc);
-        range.setStartAndEnd(start.node, start.offset, end.node, end.offset);
-        return range;
-    }
-
-    function canDeserializeRange(serialized, rootNode, doc) {
-        if (!rootNode) {
-            rootNode = (doc || document).documentElement;
-        }
-        var result = deserializeRegex.exec(serialized);
-        var checksum = result[3];
-        return !checksum || checksum === getElementChecksum(rootNode);
-    }
-
-    function serializeSelection(selection, omitChecksum, rootNode) {
-        selection = api.getSelection(selection);
-        var ranges = selection.getAllRanges(), serializedRanges = [];
-        for (var i = 0, len = ranges.length; i < len; ++i) {
-            serializedRanges[i] = serializeRange(ranges[i], omitChecksum, rootNode);
-        }
-        return serializedRanges.join("|");
-    }
-
-    function deserializeSelection(serialized, rootNode, win) {
-        if (rootNode) {
-            win = win || dom.getWindow(rootNode);
-        } else {
-            win = win || window;
-            rootNode = win.document.documentElement;
-        }
-        var serializedRanges = serialized.split("|");
-        var sel = api.getSelection(win);
-        var ranges = [];
-
-        for (var i = 0, len = serializedRanges.length; i < len; ++i) {
-            ranges[i] = deserializeRange(serializedRanges[i], rootNode, win.document);
-        }
-        sel.setRanges(ranges);
-
-        return sel;
-    }
-
-    function canDeserializeSelection(serialized, rootNode, win) {
-        var doc;
-        if (rootNode) {
-            doc = win ? win.document : dom.getDocument(rootNode);
-        } else {
-            win = win || window;
-            rootNode = win.document.documentElement;
-        }
-        var serializedRanges = serialized.split("|");
-
-        for (var i = 0, len = serializedRanges.length; i < len; ++i) {
-            if (!canDeserializeRange(serializedRanges[i], rootNode, doc)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    var cookieName = "rangySerializedSelection";
-
-    function getSerializedSelectionFromCookie(cookie) {
-        var parts = cookie.split(/[;,]/);
-        for (var i = 0, len = parts.length, nameVal, val; i < len; ++i) {
-            nameVal = parts[i].split("=");
-            if (nameVal[0].replace(/^\s+/, "") == cookieName) {
-                val = nameVal[1];
-                if (val) {
-                    return decodeURIComponent(val.replace(/\s+$/, ""));
-                }
-            }
-        }
-        return null;
-    }
-
-    function restoreSelectionFromCookie(win) {
-        win = win || window;
-        var serialized = getSerializedSelectionFromCookie(win.document.cookie);
-        if (serialized) {
-            deserializeSelection(serialized, win.doc);
-        }
-    }
-
-    function saveSelectionCookie(win, props) {
-        win = win || window;
-        props = (typeof props == "object") ? props : {};
-        var expires = props.expires ? ";expires=" + props.expires.toUTCString() : "";
-        var path = props.path ? ";path=" + props.path : "";
-        var domain = props.domain ? ";domain=" + props.domain : "";
-        var secure = props.secure ? ";secure" : "";
-        var serialized = serializeSelection(api.getSelection(win));
-        win.document.cookie = encodeURIComponent(cookieName) + "=" + encodeURIComponent(serialized) + expires + path + domain + secure;
-    }
-
-    api.serializePosition = serializePosition;
-    api.deserializePosition = deserializePosition;
-
-    api.serializeRange = serializeRange;
-    api.deserializeRange = deserializeRange;
-    api.canDeserializeRange = canDeserializeRange;
-
-    api.serializeSelection = serializeSelection;
-    api.deserializeSelection = deserializeSelection;
-    api.canDeserializeSelection = canDeserializeSelection;
-
-    api.restoreSelectionFromCookie = restoreSelectionFromCookie;
-    api.saveSelectionCookie = saveSelectionCookie;
-
-    api.getElementChecksum = getElementChecksum;
-    api.nodeToInfoString = nodeToInfoString;
-});
+/**
+ * Serializer module for Rangy.
+ * Serializes Ranges and Selections. An example use would be to store a user's selection on a particular page in a
+ * cookie or local storage and restore it on the user's next visit to the same page.
+ *
+ * Part of Rangy, a cross-browser JavaScript range and selection library
+ * http://code.google.com/p/rangy/
+ *
+ * Depends on Rangy core.
+ *
+ * Copyright %%build:year%%, Tim Down
+ * Licensed under the MIT license.
+ * Version: %%build:version%%
+ * Build date: %%build:date%%
+ */
+/* build:modularizeWithDependencies(["./rangy-core"]) */
+rangy.createModule("Serializer", ["WrappedSelection"], function(api, module) {
+    var UNDEF = "undefined";
+
+    // encodeURIComponent and decodeURIComponent are required for cookie handling
+    if (typeof encodeURIComponent == UNDEF || typeof decodeURIComponent == UNDEF) {
+        module.fail("Global object is missing encodeURIComponent and/or decodeURIComponent method");
+    }
+
+    // Checksum for checking whether range can be serialized
+    var crc32 = (function() {
+        function utf8encode(str) {
+            var utf8CharCodes = [];
+
+            for (var i = 0, len = str.length, c; i < len; ++i) {
+                c = str.charCodeAt(i);
+                if (c < 128) {
+                    utf8CharCodes.push(c);
+                } else if (c < 2048) {
+                    utf8CharCodes.push((c >> 6) | 192, (c & 63) | 128);
+                } else {
+                    utf8CharCodes.push((c >> 12) | 224, ((c >> 6) & 63) | 128, (c & 63) | 128);
+                }
+            }
+            return utf8CharCodes;
+        }
+
+        var cachedCrcTable = null;
+
+        function buildCRCTable() {
+            var table = [];
+            for (var i = 0, j, crc; i < 256; ++i) {
+                crc = i;
+                j = 8;
+                while (j--) {
+                    if ((crc & 1) == 1) {
+                        crc = (crc >>> 1) ^ 0xEDB88320;
+                    } else {
+                        crc >>>= 1;
+                    }
+                }
+                table[i] = crc >>> 0;
+            }
+            return table;
+        }
+
+        function getCrcTable() {
+            if (!cachedCrcTable) {
+                cachedCrcTable = buildCRCTable();
+            }
+            return cachedCrcTable;
+        }
+
+        return function(str) {
+            var utf8CharCodes = utf8encode(str), crc = -1, crcTable = getCrcTable();
+            for (var i = 0, len = utf8CharCodes.length, y; i < len; ++i) {
+                y = (crc ^ utf8CharCodes[i]) & 0xFF;
+                crc = (crc >>> 8) ^ crcTable[y];
+            }
+            return (crc ^ -1) >>> 0;
+        };
+    })();
+
+    var dom = api.dom;
+
+    function escapeTextForHtml(str) {
+        return str.replace(/</g, "&lt;").replace(/>/g, "&gt;");
+    }
+
+    function nodeToInfoString(node, infoParts) {
+        infoParts = infoParts || [];
+        var nodeType = node.nodeType, children = node.childNodes, childCount = children.length;
+        var nodeInfo = [nodeType, node.nodeName, childCount].join(":");
+        var start = "", end = "";
+        switch (nodeType) {
+            case 3: // Text node
+                start = escapeTextForHtml(node.nodeValue);
+                break;
+            case 8: // Comment
+                start = "<!--" + escapeTextForHtml(node.nodeValue) + "-->";
+                break;
+            default:
+                start = "<" + nodeInfo + ">";
+                end = "</>";
+                break;
+        }
+        if (start) {
+            infoParts.push(start);
+        }
+        for (var i = 0; i < childCount; ++i) {
+            nodeToInfoString(children[i], infoParts);
+        }
+        if (end) {
+            infoParts.push(end);
+        }
+        return infoParts;
+    }
+
+    // Creates a string representation of the specified element's contents that is similar to innerHTML but omits all
+    // attributes and comments and includes child node counts. This is done instead of using innerHTML to work around
+    // IE <= 8's policy of including element properties in attributes, which ruins things by changing an element's
+    // innerHTML whenever the user changes an input within the element.
+    function getElementChecksum(el) {
+        var info = nodeToInfoString(el).join("");
+        return crc32(info).toString(16);
+    }
+
+    function serializePosition(node, offset, rootNode) {
+        var pathParts = [], n = node;
+        rootNode = rootNode || dom.getDocument(node).documentElement;
+        while (n && n != rootNode) {
+            pathParts.push(dom.getNodeIndex(n, true));
+            n = n.parentNode;
+        }
+        return pathParts.join("/") + ":" + offset;
+    }
+
+    function deserializePosition(serialized, rootNode, doc) {
+        if (!rootNode) {
+            rootNode = (doc || document).documentElement;
+        }
+        var parts = serialized.split(":");
+        var node = rootNode;
+        var nodeIndices = parts[0] ? parts[0].split("/") : [], i = nodeIndices.length, nodeIndex;
+
+        while (i--) {
+            nodeIndex = parseInt(nodeIndices[i], 10);
+            if (nodeIndex < node.childNodes.length) {
+                node = node.childNodes[nodeIndex];
+            } else {
+                throw module.createError("deserializePosition() failed: node " + dom.inspectNode(node) +
+                        " has no child with index " + nodeIndex + ", " + i);
+            }
+        }
+
+        return new dom.DomPosition(node, parseInt(parts[1], 10));
+    }
+
+    function serializeRange(range, omitChecksum, rootNode) {
+        rootNode = rootNode || api.DomRange.getRangeDocument(range).documentElement;
+        if (!dom.isOrIsAncestorOf(rootNode, range.commonAncestorContainer)) {
+            throw module.createError("serializeRange(): range " + range.inspect() +
+                " is not wholly contained within specified root node " + dom.inspectNode(rootNode));
+        }
+        var serialized = serializePosition(range.startContainer, range.startOffset, rootNode) + "," +
+            serializePosition(range.endContainer, range.endOffset, rootNode);
+        if (!omitChecksum) {
+            serialized += "{" + getElementChecksum(rootNode) + "}";
+        }
+        return serialized;
+    }
+
+    var deserializeRegex = /^([^,]+),([^,\{]+)(\{([^}]+)\})?$/;
+    
+    function deserializeRange(serialized, rootNode, doc) {
+        if (rootNode) {
+            doc = doc || dom.getDocument(rootNode);
+        } else {
+            doc = doc || document;
+            rootNode = doc.documentElement;
+        }
+        var result = deserializeRegex.exec(serialized);
+        var checksum = result[4];
+        if (checksum) {
+            var rootNodeChecksum = getElementChecksum(rootNode);
+            if (checksum !== rootNodeChecksum) {
+                throw module.createError("deserializeRange(): checksums of serialized range root node (" + checksum +
+                    ") and target root node (" + rootNodeChecksum + ") do not match");
+            }
+        }
+        var start = deserializePosition(result[1], rootNode, doc), end = deserializePosition(result[2], rootNode, doc);
+        var range = api.createRange(doc);
+        range.setStartAndEnd(start.node, start.offset, end.node, end.offset);
+        return range;
+    }
+
+    function canDeserializeRange(serialized, rootNode, doc) {
+        if (!rootNode) {
+            rootNode = (doc || document).documentElement;
+        }
+        var result = deserializeRegex.exec(serialized);
+        var checksum = result[3];
+        return !checksum || checksum === getElementChecksum(rootNode);
+    }
+
+    function serializeSelection(selection, omitChecksum, rootNode) {
+        selection = api.getSelection(selection);
+        var ranges = selection.getAllRanges(), serializedRanges = [];
+        for (var i = 0, len = ranges.length; i < len; ++i) {
+            serializedRanges[i] = serializeRange(ranges[i], omitChecksum, rootNode);
+        }
+        return serializedRanges.join("|");
+    }
+
+    function deserializeSelection(serialized, rootNode, win) {
+        if (rootNode) {
+            win = win || dom.getWindow(rootNode);
+        } else {
+            win = win || window;
+            rootNode = win.document.documentElement;
+        }
+        var serializedRanges = serialized.split("|");
+        var sel = api.getSelection(win);
+        var ranges = [];
+
+        for (var i = 0, len = serializedRanges.length; i < len; ++i) {
+            ranges[i] = deserializeRange(serializedRanges[i], rootNode, win.document);
+        }
+        sel.setRanges(ranges);
+
+        return sel;
+    }
+
+    function canDeserializeSelection(serialized, rootNode, win) {
+        var doc;
+        if (rootNode) {
+            doc = win ? win.document : dom.getDocument(rootNode);
+        } else {
+            win = win || window;
+            rootNode = win.document.documentElement;
+        }
+        var serializedRanges = serialized.split("|");
+
+        for (var i = 0, len = serializedRanges.length; i < len; ++i) {
+            if (!canDeserializeRange(serializedRanges[i], rootNode, doc)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    var cookieName = "rangySerializedSelection";
+
+    function getSerializedSelectionFromCookie(cookie) {
+        var parts = cookie.split(/[;,]/);
+        for (var i = 0, len = parts.length, nameVal, val; i < len; ++i) {
+            nameVal = parts[i].split("=");
+            if (nameVal[0].replace(/^\s+/, "") == cookieName) {
+                val = nameVal[1];
+                if (val) {
+                    return decodeURIComponent(val.replace(/\s+$/, ""));
+                }
+            }
+        }
+        return null;
+    }
+
+    function restoreSelectionFromCookie(win) {
+        win = win || window;
+        var serialized = getSerializedSelectionFromCookie(win.document.cookie);
+        if (serialized) {
+            deserializeSelection(serialized, win.doc);
+        }
+    }
+
+    function saveSelectionCookie(win, props) {
+        win = win || window;
+        props = (typeof props == "object") ? props : {};
+        var expires = props.expires ? ";expires=" + props.expires.toUTCString() : "";
+        var path = props.path ? ";path=" + props.path : "";
+        var domain = props.domain ? ";domain=" + props.domain : "";
+        var secure = props.secure ? ";secure" : "";
+        var serialized = serializeSelection(api.getSelection(win));
+        win.document.cookie = encodeURIComponent(cookieName) + "=" + encodeURIComponent(serialized) + expires + path + domain + secure;
+    }
+
+    api.serializePosition = serializePosition;
+    api.deserializePosition = deserializePosition;
+
+    api.serializeRange = serializeRange;
+    api.deserializeRange = deserializeRange;
+    api.canDeserializeRange = canDeserializeRange;
+
+    api.serializeSelection = serializeSelection;
+    api.deserializeSelection = deserializeSelection;
+    api.canDeserializeSelection = canDeserializeSelection;
+
+    api.restoreSelectionFromCookie = restoreSelectionFromCookie;
+    api.saveSelectionCookie = saveSelectionCookie;
+
+    api.getElementChecksum = getElementChecksum;
+    api.nodeToInfoString = nodeToInfoString;
+});
 /* build:modularizeEnd */
\ No newline at end of file
diff --git a/src/js/modules/rangy-textcommands.js b/src/modules/rangy-textcommands.js
similarity index 97%
rename from src/js/modules/rangy-textcommands.js
rename to src/modules/rangy-textcommands.js
index 30372f3f..09d515f2 100644
--- a/src/js/modules/rangy-textcommands.js
+++ b/src/modules/rangy-textcommands.js
@@ -1,574 +1,574 @@
-/**
- * Text Commands module for Rangy.
- * A generic framework for creating text mutation commands for Ranges and Selections
- *
- * Part of Rangy, a cross-browser JavaScript range and selection library
- * http://code.google.com/p/rangy/
- *
- * Depends on Rangy core.
- *
- * Copyright %%build:year%%, Tim Down
- * Licensed under the MIT license.
- * Version: %%build:version%%
- * Build date: %%build:date%%
- */
-rangy.createModule("TextCommands", ["WrappedSelection"], function(api, module) {
-    var dom = api.dom;
-
-    var log = log4javascript.getLogger("rangy.textcommands");
-
-    var tagName = "span", BOOLEAN = "boolean", UNDEF = "undefined";
-
-    function trim(str) {
-        return str.replace(/^\s\s*/, "").replace(/\s\s*$/, "");
-    }
-
-    function hasClass(el, cssClass) {
-        return el.className && new RegExp("(?:^|\\s)" + cssClass + "(?:\\s|$)").test(el.className);
-    }
-
-    function addClass(el, cssClass) {
-        if (el.className) {
-            if (!hasClass(el, cssClass)) {
-                el.className += " " + cssClass;
-            }
-        } else {
-            el.className = cssClass;
-        }
-    }
-
-    var removeClass = (function() {
-        function replacer(matched, whitespaceBefore, whitespaceAfter) {
-            return (whitespaceBefore && whitespaceAfter) ? " " : "";
-        }
-
-        return function(el, cssClass) {
-            if (el.className) {
-                el.className = el.className.replace(new RegExp("(?:^|\\s)" + cssClass + "(?:\\s|$)"), replacer);
-            }
-        };
-    })();
-
-    function getSortedClassName(el) {
-        return el.className.split(/\s+/).sort().join(" ");
-    }
-
-    function hasSameClasses(el1, el2) {
-        return getSortedClassName(el1) == getSortedClassName(el2);
-    }
-
-    function replaceWithOwnChildren(el) {
-        var parent = el.parentNode;
-        while (el.hasChildNodes()) {
-            parent.insertBefore(el.firstChild, el);
-        }
-        parent.removeChild(el);
-    }
-
-/*
-    function normalize(node) {
-        var child = node.firstChild, nextChild;
-        while (child) {
-            if (child.nodeType == 3) {
-                while ((nextChild = child.nextSibling) && nextChild.nodeType == 3) {
-                    child.appendData(nextChild.data);
-                    node.removeChild(nextChild);
-                }
-            } else {
-                normalize(child);
-            }
-            child = child.nextSibling;
-        }
-    }
-*/
-
-    function elementsHaveSameNonClassAttributes(el1, el2) {
-        if (el1.attributes.length != el2.attributes.length) return false;
-        for (var i = 0, len = el1.attributes.length, attr1, attr2, name; i < len; ++i) {
-            attr1 = el1.attributes[i];
-            name = attr1.name;
-            if (name != "class") {
-                attr2 = el2.attributes.getNamedItem(name);
-                if (attr1.specified != attr2.specified) return false;
-                if (attr1.specified && attr1.nodeValue !== attr2.nodeValue) return false;
-            }
-        }
-        return true;
-    }
-
-    function elementHasNonClassAttributes(el) {
-        for (var i = 0, len = el.attributes.length; i < len; ++i) {
-            if (el.attributes[i].specified && el.attributes[i].name != "class") {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    function isSplitPoint(node, offset) {
-        if (dom.isCharacterDataNode(node)) {
-            if (offset == 0) {
-                return !!node.previousSibling;
-            } else if (offset == node.length) {
-                return !!node.nextSibling;
-            } else {
-                return true;
-            }
-        }
-
-        return offset > 0 && offset < node.childNodes.length;
-    }
-
-    function splitNodeAt(node, descendantNode, descendantOffset) {
-        log.debug("splitNodeAt", dom.inspectNode(node), dom.inspectNode(descendantNode), descendantOffset);
-        var newNode;
-        if (dom.isCharacterDataNode(descendantNode)) {
-            if (descendantOffset == 0) {
-                descendantOffset = dom.getNodeIndex(descendantNode);
-                descendantNode = descendantNode.parentNode;
-            } else if (descendantOffset == descendantNode.length) {
-                descendantOffset = dom.getNodeIndex(descendantNode) + 1;
-                descendantNode = descendantNode.parentNode;
-            } else {
-                newNode = dom.splitDataNode(descendantNode, descendantOffset);
-            }
-        }
-        if (!newNode) {
-            newNode = descendantNode.cloneNode(false);
-            if (newNode.id) {
-                newNode.removeAttribute("id");
-            }
-            var child;
-            while ((child = descendantNode.childNodes[descendantOffset])) {
-                log.debug("Moving node " + dom.inspectNode(child) + " into " + dom.inspectNode(newNode));
-                newNode.appendChild(child);
-            }
-            dom.insertAfter(newNode, descendantNode);
-        }
-        return (descendantNode == node) ? newNode : splitNodeAt(node, newNode.parentNode, dom.getNodeIndex(newNode));
-    }
-
-    function areElementsMergeable(el1, el2) {
-        return el1.tagName == el2.tagName && hasSameClasses(el1, el2) && elementsHaveSameNonClassAttributes(el1, el2);
-    }
-
-    function getAdjacentMergeableTextNode(node, forward) {
-        var isTextNode = (node.nodeType == 3);
-        var el = isTextNode ? node.parentNode : node;
-        var adjacentNode;
-        var propName = forward ? "nextSibling" : "previousSibling";
-        if (isTextNode) {
-            // Can merge if the node's previous/next sibling is a text node
-            adjacentNode = node[propName];
-            if (adjacentNode && adjacentNode.nodeType == 3) {
-                return adjacentNode;
-            }
-        } else {
-            // Compare element with its sibling
-            adjacentNode = el[propName];
-            if (adjacentNode && areElementsMergeable(node, adjacentNode)) {
-                return adjacentNode[forward ? "firstChild" : "lastChild"];
-            }
-        }
-        return null;
-    }
-
-    function Merge(firstNode) {
-        this.isElementMerge = (firstNode.nodeType == 1);
-        this.firstTextNode = this.isElementMerge ? firstNode.lastChild : firstNode;
-        if (this.isElementMerge) {
-            this.sortedCssClasses = getSortedClassName(firstNode);
-        }
-        this.textNodes = [this.firstTextNode];
-    }
-
-    Merge.prototype = {
-        doMerge: function() {
-            var textParts = [], textNode, parent, text;
-            for (var i = 0, len = this.textNodes.length; i < len; ++i) {
-                textNode = this.textNodes[i];
-                parent = textNode.parentNode;
-                textParts[i] = textNode.data;
-                if (i) {
-                    parent.removeChild(textNode);
-                    if (!parent.hasChildNodes()) {
-                        parent.parentNode.removeChild(parent);
-                    }
-                }
-            }
-            this.firstTextNode.data = text = textParts.join("");
-            return text;
-        },
-
-        getLength: function() {
-            var i = this.textNodes.length, len = 0;
-            while (i--) {
-                len += this.textNodes[i].length;
-            }
-            return len;
-        },
-
-        toString: function() {
-            var textParts = [];
-            for (var i = 0, len = this.textNodes.length; i < len; ++i) {
-                textParts[i] = "'" + this.textNodes[i].data + "'";
-            }
-            return "[Merge(" + textParts.join(",") + ")]";
-        }
-    };
-
-    function TextCommand(name, options) {
-        this.name = name;
-        if (typeof options == "object") {
-            for (var i in options) {
-                if (options.hasOwnProperty(i)) {
-                    this[i] = options[i];
-                }
-            }
-        }
-    }
-
-    TextCommand.prototype = {
-        type: BOOLEAN,
-        normalize: true,
-        applyToAnyTagName: true,
-        tagNames: ["span"],
-
-        // Normalizes nodes after applying a CSS class to a Range.
-        postApply: function(textNodes, range) {
-            log.group("postApply");
-            var firstNode = textNodes[0], lastNode = textNodes[textNodes.length - 1];
-
-            var merges = [], currentMerge;
-
-            var rangeStartNode = firstNode, rangeEndNode = lastNode;
-            var rangeStartOffset = 0, rangeEndOffset = lastNode.length;
-
-            var textNode, precedingTextNode;
-
-            for (var i = 0, len = textNodes.length; i < len; ++i) {
-                textNode = textNodes[i];
-                precedingTextNode = getAdjacentMergeableTextNode(textNode, false);
-                log.debug("Checking for merge. text node: " + textNode.data + ", preceding: " + (precedingTextNode ? precedingTextNode.data : null));
-                if (precedingTextNode) {
-                    if (!currentMerge) {
-                        currentMerge = new Merge(precedingTextNode);
-                        merges.push(currentMerge);
-                    }
-                    currentMerge.textNodes.push(textNode);
-                    if (textNode === firstNode) {
-                        rangeStartNode = currentMerge.firstTextNode;
-                        rangeStartOffset = rangeStartNode.length;
-                    }
-                    if (textNode === lastNode) {
-                        rangeEndNode = currentMerge.firstTextNode;
-                        rangeEndOffset = currentMerge.getLength();
-                    }
-                } else {
-                    currentMerge = null;
-                }
-            }
-
-            // Test whether the first node after the range needs merging
-            var nextTextNode = getAdjacentMergeableTextNode(lastNode, true);
-
-            if (nextTextNode) {
-                if (!currentMerge) {
-                    currentMerge = new Merge(lastNode);
-                    merges.push(currentMerge);
-                }
-                currentMerge.textNodes.push(nextTextNode);
-            }
-
-            // Do the merges
-            if (merges.length) {
-                log.info("Merging. Merges:", merges);
-                for (i = 0, len = merges.length; i < len; ++i) {
-                    merges[i].doMerge();
-                }
-                log.info(rangeStartNode.nodeValue, rangeStartOffset, rangeEndNode.nodeValue, rangeEndOffset);
-
-                // Set the range boundaries
-                range.setStart(rangeStartNode, rangeStartOffset);
-                range.setEnd(rangeEndNode, rangeEndOffset);
-            }
-            log.groupEnd();
-        },
-
-        getAppliedAncestor: function(textNode) {
-            var node = textNode.parentNode;
-            while (node) {
-                if (node.nodeType == 1 && dom.arrayContains(this.tagNames, node.tagName.toLowerCase()) && this.isAppliedToElement(node)) {
-                    return node;
-                }
-                node = node.parentNode;
-            }
-            return false;
-        },
-
-        applyToElement: function(el) {
-        },
-
-        unapplyToElement: function(el) {
-        },
-
-        createContainer: function(doc) {
-            var el = doc.createElement(tagName);
-            this.applyToElement(el);
-            return el;
-        },
-
-        applyToTextNode: function(textNode) {
-            var parent = textNode.parentNode;
-            if (parent.childNodes.length == 1 && dom.arrayContains(this.tagNames, parent.tagName.toLowerCase())) {
-                this.applyToElement(parent);
-            } else {
-                var el = this.createContainer(dom.getDocument(textNode));
-                if (el) {
-                    textNode.parentNode.insertBefore(el, textNode);
-                    el.appendChild(textNode);
-                }
-            }
-        },
-
-        isRemovable: function(el) {
-            return el.tagName.toLowerCase() == tagName && trim(el.className) == this.cssClass && !elementHasNonClassAttributes(el);
-        },
-
-        undoToTextNode: function(textNode, range, appliedAncestor) {
-            log.info("undoToTextNode", dom.inspectNode(textNode), range.inspect(), dom.inspectNode(appliedAncestor), range.containsNode(appliedAncestor));
-            if (!range.containsNode(appliedAncestor)) {
-                // Split out the portion of the ancestor from which we can remove the CSS class
-                var ancestorRange = range.cloneRange();
-                ancestorRange.selectNode(appliedAncestor);
-                log.info("range end in ancestor " + ancestorRange.isPointInRange(range.endContainer, range.endOffset) + ", isSplitPoint " + isSplitPoint(range.endContainer, range.endOffset));
-                if (ancestorRange.isPointInRange(range.endContainer, range.endOffset) && isSplitPoint(range.endContainer, range.endOffset)) {
-                    splitNodeAt(appliedAncestor, range.endContainer, range.endOffset);
-                    range.setEndAfter(appliedAncestor);
-                }
-                if (ancestorRange.isPointInRange(range.startContainer, range.startOffset) && isSplitPoint(range.startContainer, range.startOffset)) {
-                    appliedAncestor = splitNodeAt(appliedAncestor, range.startContainer, range.startOffset);
-                }
-            }
-            log.info("isRemovable", this.isRemovable(appliedAncestor), dom.inspectNode(appliedAncestor), appliedAncestor.innerHTML, appliedAncestor.parentNode.innerHTML);
-            if (this.isRemovable(appliedAncestor)) {
-                replaceWithOwnChildren(appliedAncestor);
-            } else {
-                this.unapplyToElement(appliedAncestor);
-            }
-        },
-
-        applyToRange: function(range) {
-            range.splitBoundaries();
-            log.info("applyToRange split boundaries ");
-            var textNodes = range.getNodes([3]);
-            log.info("applyToRange got text nodes " + textNodes);
-
-            if (textNodes.length) {
-                var textNode;
-
-                for (var i = 0, len = textNodes.length; i < len; ++i) {
-                    textNode = textNodes[i];
-                    if (!this.getAppliedAncestor(textNode)) {
-                        this.applyToTextNode(textNode);
-                    }
-                }
-                range.setStart(textNodes[0], 0);
-                textNode = textNodes[textNodes.length - 1];
-                range.setEnd(textNode, textNode.length);
-                log.info("Apply set range to '" + textNodes[0].data + "', '" + textNode.data + "'");
-                if (this.normalize) {
-                    this.postApply(textNodes, range);
-                }
-            }
-        },
-
-        applyToSelection: function(win) {
-            log.group("applyToSelection");
-            win = win || window;
-            var sel = api.getSelection(win);
-            log.info("applyToSelection " + sel.inspect());
-            var range, ranges = sel.getAllRanges();
-            sel.removeAllRanges();
-            var i = ranges.length;
-            while (i--) {
-                range = ranges[i];
-                this.applyToRange(range);
-                sel.addRange(range);
-            }
-            log.groupEnd();
-        },
-
-        undoToRange: function(range) {
-            log.info("undoToRange " + range.inspect());
-            range.splitBoundaries();
-            var textNodes = range.getNodes( [3] ), textNode, appliedAncestor;
-
-            if (textNodes.length) {
-                for (var i = 0, len = textNodes.length; i < len; ++i) {
-                    textNode = textNodes[i];
-                    appliedAncestor = this.getAppliedAncestor(textNode);
-                    if (appliedAncestor) {
-                        this.undoToTextNode(textNode, range, appliedAncestor);
-                    }
-                }
-
-                range.setStart(textNodes[0], 0);
-                textNode = textNodes[textNodes.length - 1];
-                range.setEnd(textNode, textNode.length);
-                log.info("Undo set range to '" + textNodes[0].data + "', '" + textNode.data + "'");
-
-                if (this.normalize) {
-                    this.postApply(textNodes, range);
-                }
-            }
-        },
-
-        undoToSelection: function(win) {
-            win = win || window;
-            var sel = api.getSelection(win);
-            var ranges = sel.getAllRanges(), range;
-            sel.removeAllRanges();
-            for (var i = 0, len = ranges.length; i < len; ++i) {
-                range = ranges[i];
-                this.undoToRange(range);
-                sel.addRange(range);
-            }
-        },
-
-        getTextSelectedByRange: function(textNode, range) {
-            var textRange = range.cloneRange();
-            textRange.selectNodeContents(textNode);
-
-            var intersectionRange = textRange.intersection(range);
-            return intersectionRange ? intersectionRange.toString() : "";
-        },
-
-        isAppliedToElement: function(el) {
-            return false;
-        },
-
-        isAppliedToRange: function(range) {
-            var textNodes = range.getNodes( [3] );
-            for (var i = 0, len = textNodes.length, selectedText; i < len; ++i) {
-                selectedText = this.getTextSelectedByRange(textNodes[i], range);
-                log.debug("text node: '" + textNodes[i].data + "', selectedText: '" + selectedText + "'", this.isAppliedToElement(textNodes[i].parentNode));
-                if (selectedText != "" && !this.isAppliedToElement(textNodes[i].parentNode)) {
-                    return false;
-                }
-            }
-            return true;
-        },
-
-        isAppliedToSelection: function(win) {
-            win = win || window;
-            var sel = api.getSelection(win);
-            var ranges = sel.getAllRanges();
-            var i = ranges.length;
-            while (i--) {
-                if (!this.isAppliedToRange(ranges[i])) {
-                    return false;
-                }
-            }
-            log.groupEnd();
-            return true;
-        },
-
-        toggleRange: function(range) {
-            if (this.isAppliedToRange(range)) {
-                this.undoToRange(range);
-            } else {
-                this.applyToRange(range);
-            }
-        },
-
-        toggleSelection: function(win) {
-            if (this.isAppliedToSelection(win)) {
-                this.undoToSelection(win);
-            } else {
-                this.applyToSelection(win);
-            }
-        },
-
-        execSelection: function(win, value, options) {
-            if (this.type == BOOLEAN) {
-                this.toggleSelection(win);
-            }
-        },
-
-        querySelectionValue: function(win) {
-            if (this.type == BOOLEAN) {
-                return this.isAppliedToSelection(win);
-            }
-        }
-    };
-
-    var textCommands = {};
-
-    api.registerTextCommand = function(name, options) {
-        var cmd = new TextCommand(name, options);
-        textCommands[name.toLowerCase()] = cmd;
-        return cmd;
-    };
-
-    api.execSelectionCommand = function(name, win, value, options) {
-        var cmd = textCommands[name.toLowerCase()];
-        if (cmd && cmd instanceof TextCommand) {
-            cmd.execSelection(win, value, options);
-        }
-    };
-
-    api.querySelectionCommandValue = function(name, win) {
-        var cmd = textCommands[name.toLowerCase()];
-        if (cmd && cmd instanceof TextCommand) {
-            return cmd.querySelectionValue(win);
-        }
-    };
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-    // Register core commands
-
-    var getComputedStyleProperty;
-    if (typeof window.getComputedStyle != UNDEF) {
-        getComputedStyleProperty = function(el, propName) {
-            return dom.getWindow(el).getComputedStyle(el, null)[propName];
-        };
-    } else if (typeof dom.getBody(document).currentStyle != UNDEF) {
-        getComputedStyleProperty = function(el, propName) {
-            return el.currentStyle[propName];
-        };
-    } else {
-        module.fail("No means of obtaining computed style properties found");
-    }
-
-    api.registerTextCommand("bold", {
-        type: BOOLEAN,
-        tagNames: ["b", "span", "strong"],
-
-        isAppliedToElement: function(el) {
-            var fontWeight = getComputedStyleProperty(el, "fontWeight");
-            var isBold = false;
-            if (fontWeight == "bold" || fontWeight == "bolder") {
-                isBold = true;
-            } else if (fontWeight == "normal" || fontWeight == "lighter") {
-                isBold = false;
-            } else {
-                var weightNum = parseInt("" + fontWeight);
-                if (!isNaN(weightNum)) {
-                    isBold = weightNum > 400;
-                }
-            }
-            return isBold;
-        },
-
-        applyToElement: function(el) {
-            el.style.fontWeight = "bold";
-        },
-
-        unapplyToElement: function(el) {
-            el.style.fontWeight = "normal";
-        }
-    });
-});
-
-
+/**
+ * Text Commands module for Rangy.
+ * A generic framework for creating text mutation commands for Ranges and Selections
+ *
+ * Part of Rangy, a cross-browser JavaScript range and selection library
+ * http://code.google.com/p/rangy/
+ *
+ * Depends on Rangy core.
+ *
+ * Copyright %%build:year%%, Tim Down
+ * Licensed under the MIT license.
+ * Version: %%build:version%%
+ * Build date: %%build:date%%
+ */
+rangy.createModule("TextCommands", ["WrappedSelection"], function(api, module) {
+    var dom = api.dom;
+
+    var log = log4javascript.getLogger("rangy.textcommands");
+
+    var tagName = "span", BOOLEAN = "boolean", UNDEF = "undefined";
+
+    function trim(str) {
+        return str.replace(/^\s\s*/, "").replace(/\s\s*$/, "");
+    }
+
+    function hasClass(el, cssClass) {
+        return el.className && new RegExp("(?:^|\\s)" + cssClass + "(?:\\s|$)").test(el.className);
+    }
+
+    function addClass(el, cssClass) {
+        if (el.className) {
+            if (!hasClass(el, cssClass)) {
+                el.className += " " + cssClass;
+            }
+        } else {
+            el.className = cssClass;
+        }
+    }
+
+    var removeClass = (function() {
+        function replacer(matched, whitespaceBefore, whitespaceAfter) {
+            return (whitespaceBefore && whitespaceAfter) ? " " : "";
+        }
+
+        return function(el, cssClass) {
+            if (el.className) {
+                el.className = el.className.replace(new RegExp("(?:^|\\s)" + cssClass + "(?:\\s|$)"), replacer);
+            }
+        };
+    })();
+
+    function getSortedClassName(el) {
+        return el.className.split(/\s+/).sort().join(" ");
+    }
+
+    function hasSameClasses(el1, el2) {
+        return getSortedClassName(el1) == getSortedClassName(el2);
+    }
+
+    function replaceWithOwnChildren(el) {
+        var parent = el.parentNode;
+        while (el.hasChildNodes()) {
+            parent.insertBefore(el.firstChild, el);
+        }
+        parent.removeChild(el);
+    }
+
+/*
+    function normalize(node) {
+        var child = node.firstChild, nextChild;
+        while (child) {
+            if (child.nodeType == 3) {
+                while ((nextChild = child.nextSibling) && nextChild.nodeType == 3) {
+                    child.appendData(nextChild.data);
+                    node.removeChild(nextChild);
+                }
+            } else {
+                normalize(child);
+            }
+            child = child.nextSibling;
+        }
+    }
+*/
+
+    function elementsHaveSameNonClassAttributes(el1, el2) {
+        if (el1.attributes.length != el2.attributes.length) return false;
+        for (var i = 0, len = el1.attributes.length, attr1, attr2, name; i < len; ++i) {
+            attr1 = el1.attributes[i];
+            name = attr1.name;
+            if (name != "class") {
+                attr2 = el2.attributes.getNamedItem(name);
+                if (attr1.specified != attr2.specified) return false;
+                if (attr1.specified && attr1.nodeValue !== attr2.nodeValue) return false;
+            }
+        }
+        return true;
+    }
+
+    function elementHasNonClassAttributes(el) {
+        for (var i = 0, len = el.attributes.length; i < len; ++i) {
+            if (el.attributes[i].specified && el.attributes[i].name != "class") {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    function isSplitPoint(node, offset) {
+        if (dom.isCharacterDataNode(node)) {
+            if (offset == 0) {
+                return !!node.previousSibling;
+            } else if (offset == node.length) {
+                return !!node.nextSibling;
+            } else {
+                return true;
+            }
+        }
+
+        return offset > 0 && offset < node.childNodes.length;
+    }
+
+    function splitNodeAt(node, descendantNode, descendantOffset) {
+        log.debug("splitNodeAt", dom.inspectNode(node), dom.inspectNode(descendantNode), descendantOffset);
+        var newNode;
+        if (dom.isCharacterDataNode(descendantNode)) {
+            if (descendantOffset == 0) {
+                descendantOffset = dom.getNodeIndex(descendantNode);
+                descendantNode = descendantNode.parentNode;
+            } else if (descendantOffset == descendantNode.length) {
+                descendantOffset = dom.getNodeIndex(descendantNode) + 1;
+                descendantNode = descendantNode.parentNode;
+            } else {
+                newNode = dom.splitDataNode(descendantNode, descendantOffset);
+            }
+        }
+        if (!newNode) {
+            newNode = descendantNode.cloneNode(false);
+            if (newNode.id) {
+                newNode.removeAttribute("id");
+            }
+            var child;
+            while ((child = descendantNode.childNodes[descendantOffset])) {
+                log.debug("Moving node " + dom.inspectNode(child) + " into " + dom.inspectNode(newNode));
+                newNode.appendChild(child);
+            }
+            dom.insertAfter(newNode, descendantNode);
+        }
+        return (descendantNode == node) ? newNode : splitNodeAt(node, newNode.parentNode, dom.getNodeIndex(newNode));
+    }
+
+    function areElementsMergeable(el1, el2) {
+        return el1.tagName == el2.tagName && hasSameClasses(el1, el2) && elementsHaveSameNonClassAttributes(el1, el2);
+    }
+
+    function getAdjacentMergeableTextNode(node, forward) {
+        var isTextNode = (node.nodeType == 3);
+        var el = isTextNode ? node.parentNode : node;
+        var adjacentNode;
+        var propName = forward ? "nextSibling" : "previousSibling";
+        if (isTextNode) {
+            // Can merge if the node's previous/next sibling is a text node
+            adjacentNode = node[propName];
+            if (adjacentNode && adjacentNode.nodeType == 3) {
+                return adjacentNode;
+            }
+        } else {
+            // Compare element with its sibling
+            adjacentNode = el[propName];
+            if (adjacentNode && areElementsMergeable(node, adjacentNode)) {
+                return adjacentNode[forward ? "firstChild" : "lastChild"];
+            }
+        }
+        return null;
+    }
+
+    function Merge(firstNode) {
+        this.isElementMerge = (firstNode.nodeType == 1);
+        this.firstTextNode = this.isElementMerge ? firstNode.lastChild : firstNode;
+        if (this.isElementMerge) {
+            this.sortedCssClasses = getSortedClassName(firstNode);
+        }
+        this.textNodes = [this.firstTextNode];
+    }
+
+    Merge.prototype = {
+        doMerge: function() {
+            var textParts = [], textNode, parent, text;
+            for (var i = 0, len = this.textNodes.length; i < len; ++i) {
+                textNode = this.textNodes[i];
+                parent = textNode.parentNode;
+                textParts[i] = textNode.data;
+                if (i) {
+                    parent.removeChild(textNode);
+                    if (!parent.hasChildNodes()) {
+                        parent.parentNode.removeChild(parent);
+                    }
+                }
+            }
+            this.firstTextNode.data = text = textParts.join("");
+            return text;
+        },
+
+        getLength: function() {
+            var i = this.textNodes.length, len = 0;
+            while (i--) {
+                len += this.textNodes[i].length;
+            }
+            return len;
+        },
+
+        toString: function() {
+            var textParts = [];
+            for (var i = 0, len = this.textNodes.length; i < len; ++i) {
+                textParts[i] = "'" + this.textNodes[i].data + "'";
+            }
+            return "[Merge(" + textParts.join(",") + ")]";
+        }
+    };
+
+    function TextCommand(name, options) {
+        this.name = name;
+        if (typeof options == "object") {
+            for (var i in options) {
+                if (options.hasOwnProperty(i)) {
+                    this[i] = options[i];
+                }
+            }
+        }
+    }
+
+    TextCommand.prototype = {
+        type: BOOLEAN,
+        normalize: true,
+        applyToAnyTagName: true,
+        tagNames: ["span"],
+
+        // Normalizes nodes after applying a CSS class to a Range.
+        postApply: function(textNodes, range) {
+            log.group("postApply");
+            var firstNode = textNodes[0], lastNode = textNodes[textNodes.length - 1];
+
+            var merges = [], currentMerge;
+
+            var rangeStartNode = firstNode, rangeEndNode = lastNode;
+            var rangeStartOffset = 0, rangeEndOffset = lastNode.length;
+
+            var textNode, precedingTextNode;
+
+            for (var i = 0, len = textNodes.length; i < len; ++i) {
+                textNode = textNodes[i];
+                precedingTextNode = getAdjacentMergeableTextNode(textNode, false);
+                log.debug("Checking for merge. text node: " + textNode.data + ", preceding: " + (precedingTextNode ? precedingTextNode.data : null));
+                if (precedingTextNode) {
+                    if (!currentMerge) {
+                        currentMerge = new Merge(precedingTextNode);
+                        merges.push(currentMerge);
+                    }
+                    currentMerge.textNodes.push(textNode);
+                    if (textNode === firstNode) {
+                        rangeStartNode = currentMerge.firstTextNode;
+                        rangeStartOffset = rangeStartNode.length;
+                    }
+                    if (textNode === lastNode) {
+                        rangeEndNode = currentMerge.firstTextNode;
+                        rangeEndOffset = currentMerge.getLength();
+                    }
+                } else {
+                    currentMerge = null;
+                }
+            }
+
+            // Test whether the first node after the range needs merging
+            var nextTextNode = getAdjacentMergeableTextNode(lastNode, true);
+
+            if (nextTextNode) {
+                if (!currentMerge) {
+                    currentMerge = new Merge(lastNode);
+                    merges.push(currentMerge);
+                }
+                currentMerge.textNodes.push(nextTextNode);
+            }
+
+            // Do the merges
+            if (merges.length) {
+                log.info("Merging. Merges:", merges);
+                for (i = 0, len = merges.length; i < len; ++i) {
+                    merges[i].doMerge();
+                }
+                log.info(rangeStartNode.nodeValue, rangeStartOffset, rangeEndNode.nodeValue, rangeEndOffset);
+
+                // Set the range boundaries
+                range.setStart(rangeStartNode, rangeStartOffset);
+                range.setEnd(rangeEndNode, rangeEndOffset);
+            }
+            log.groupEnd();
+        },
+
+        getAppliedAncestor: function(textNode) {
+            var node = textNode.parentNode;
+            while (node) {
+                if (node.nodeType == 1 && dom.arrayContains(this.tagNames, node.tagName.toLowerCase()) && this.isAppliedToElement(node)) {
+                    return node;
+                }
+                node = node.parentNode;
+            }
+            return false;
+        },
+
+        applyToElement: function(el) {
+        },
+
+        unapplyToElement: function(el) {
+        },
+
+        createContainer: function(doc) {
+            var el = doc.createElement(tagName);
+            this.applyToElement(el);
+            return el;
+        },
+
+        applyToTextNode: function(textNode) {
+            var parent = textNode.parentNode;
+            if (parent.childNodes.length == 1 && dom.arrayContains(this.tagNames, parent.tagName.toLowerCase())) {
+                this.applyToElement(parent);
+            } else {
+                var el = this.createContainer(dom.getDocument(textNode));
+                if (el) {
+                    textNode.parentNode.insertBefore(el, textNode);
+                    el.appendChild(textNode);
+                }
+            }
+        },
+
+        isRemovable: function(el) {
+            return el.tagName.toLowerCase() == tagName && trim(el.className) == this.cssClass && !elementHasNonClassAttributes(el);
+        },
+
+        undoToTextNode: function(textNode, range, appliedAncestor) {
+            log.info("undoToTextNode", dom.inspectNode(textNode), range.inspect(), dom.inspectNode(appliedAncestor), range.containsNode(appliedAncestor));
+            if (!range.containsNode(appliedAncestor)) {
+                // Split out the portion of the ancestor from which we can remove the CSS class
+                var ancestorRange = range.cloneRange();
+                ancestorRange.selectNode(appliedAncestor);
+                log.info("range end in ancestor " + ancestorRange.isPointInRange(range.endContainer, range.endOffset) + ", isSplitPoint " + isSplitPoint(range.endContainer, range.endOffset));
+                if (ancestorRange.isPointInRange(range.endContainer, range.endOffset) && isSplitPoint(range.endContainer, range.endOffset)) {
+                    splitNodeAt(appliedAncestor, range.endContainer, range.endOffset);
+                    range.setEndAfter(appliedAncestor);
+                }
+                if (ancestorRange.isPointInRange(range.startContainer, range.startOffset) && isSplitPoint(range.startContainer, range.startOffset)) {
+                    appliedAncestor = splitNodeAt(appliedAncestor, range.startContainer, range.startOffset);
+                }
+            }
+            log.info("isRemovable", this.isRemovable(appliedAncestor), dom.inspectNode(appliedAncestor), appliedAncestor.innerHTML, appliedAncestor.parentNode.innerHTML);
+            if (this.isRemovable(appliedAncestor)) {
+                replaceWithOwnChildren(appliedAncestor);
+            } else {
+                this.unapplyToElement(appliedAncestor);
+            }
+        },
+
+        applyToRange: function(range) {
+            range.splitBoundaries();
+            log.info("applyToRange split boundaries ");
+            var textNodes = range.getNodes([3]);
+            log.info("applyToRange got text nodes " + textNodes);
+
+            if (textNodes.length) {
+                var textNode;
+
+                for (var i = 0, len = textNodes.length; i < len; ++i) {
+                    textNode = textNodes[i];
+                    if (!this.getAppliedAncestor(textNode)) {
+                        this.applyToTextNode(textNode);
+                    }
+                }
+                range.setStart(textNodes[0], 0);
+                textNode = textNodes[textNodes.length - 1];
+                range.setEnd(textNode, textNode.length);
+                log.info("Apply set range to '" + textNodes[0].data + "', '" + textNode.data + "'");
+                if (this.normalize) {
+                    this.postApply(textNodes, range);
+                }
+            }
+        },
+
+        applyToSelection: function(win) {
+            log.group("applyToSelection");
+            win = win || window;
+            var sel = api.getSelection(win);
+            log.info("applyToSelection " + sel.inspect());
+            var range, ranges = sel.getAllRanges();
+            sel.removeAllRanges();
+            var i = ranges.length;
+            while (i--) {
+                range = ranges[i];
+                this.applyToRange(range);
+                sel.addRange(range);
+            }
+            log.groupEnd();
+        },
+
+        undoToRange: function(range) {
+            log.info("undoToRange " + range.inspect());
+            range.splitBoundaries();
+            var textNodes = range.getNodes( [3] ), textNode, appliedAncestor;
+
+            if (textNodes.length) {
+                for (var i = 0, len = textNodes.length; i < len; ++i) {
+                    textNode = textNodes[i];
+                    appliedAncestor = this.getAppliedAncestor(textNode);
+                    if (appliedAncestor) {
+                        this.undoToTextNode(textNode, range, appliedAncestor);
+                    }
+                }
+
+                range.setStart(textNodes[0], 0);
+                textNode = textNodes[textNodes.length - 1];
+                range.setEnd(textNode, textNode.length);
+                log.info("Undo set range to '" + textNodes[0].data + "', '" + textNode.data + "'");
+
+                if (this.normalize) {
+                    this.postApply(textNodes, range);
+                }
+            }
+        },
+
+        undoToSelection: function(win) {
+            win = win || window;
+            var sel = api.getSelection(win);
+            var ranges = sel.getAllRanges(), range;
+            sel.removeAllRanges();
+            for (var i = 0, len = ranges.length; i < len; ++i) {
+                range = ranges[i];
+                this.undoToRange(range);
+                sel.addRange(range);
+            }
+        },
+
+        getTextSelectedByRange: function(textNode, range) {
+            var textRange = range.cloneRange();
+            textRange.selectNodeContents(textNode);
+
+            var intersectionRange = textRange.intersection(range);
+            return intersectionRange ? intersectionRange.toString() : "";
+        },
+
+        isAppliedToElement: function(el) {
+            return false;
+        },
+
+        isAppliedToRange: function(range) {
+            var textNodes = range.getNodes( [3] );
+            for (var i = 0, len = textNodes.length, selectedText; i < len; ++i) {
+                selectedText = this.getTextSelectedByRange(textNodes[i], range);
+                log.debug("text node: '" + textNodes[i].data + "', selectedText: '" + selectedText + "'", this.isAppliedToElement(textNodes[i].parentNode));
+                if (selectedText != "" && !this.isAppliedToElement(textNodes[i].parentNode)) {
+                    return false;
+                }
+            }
+            return true;
+        },
+
+        isAppliedToSelection: function(win) {
+            win = win || window;
+            var sel = api.getSelection(win);
+            var ranges = sel.getAllRanges();
+            var i = ranges.length;
+            while (i--) {
+                if (!this.isAppliedToRange(ranges[i])) {
+                    return false;
+                }
+            }
+            log.groupEnd();
+            return true;
+        },
+
+        toggleRange: function(range) {
+            if (this.isAppliedToRange(range)) {
+                this.undoToRange(range);
+            } else {
+                this.applyToRange(range);
+            }
+        },
+
+        toggleSelection: function(win) {
+            if (this.isAppliedToSelection(win)) {
+                this.undoToSelection(win);
+            } else {
+                this.applyToSelection(win);
+            }
+        },
+
+        execSelection: function(win, value, options) {
+            if (this.type == BOOLEAN) {
+                this.toggleSelection(win);
+            }
+        },
+
+        querySelectionValue: function(win) {
+            if (this.type == BOOLEAN) {
+                return this.isAppliedToSelection(win);
+            }
+        }
+    };
+
+    var textCommands = {};
+
+    api.registerTextCommand = function(name, options) {
+        var cmd = new TextCommand(name, options);
+        textCommands[name.toLowerCase()] = cmd;
+        return cmd;
+    };
+
+    api.execSelectionCommand = function(name, win, value, options) {
+        var cmd = textCommands[name.toLowerCase()];
+        if (cmd && cmd instanceof TextCommand) {
+            cmd.execSelection(win, value, options);
+        }
+    };
+
+    api.querySelectionCommandValue = function(name, win) {
+        var cmd = textCommands[name.toLowerCase()];
+        if (cmd && cmd instanceof TextCommand) {
+            return cmd.querySelectionValue(win);
+        }
+    };
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+    // Register core commands
+
+    var getComputedStyleProperty;
+    if (typeof window.getComputedStyle != UNDEF) {
+        getComputedStyleProperty = function(el, propName) {
+            return dom.getWindow(el).getComputedStyle(el, null)[propName];
+        };
+    } else if (typeof dom.getBody(document).currentStyle != UNDEF) {
+        getComputedStyleProperty = function(el, propName) {
+            return el.currentStyle[propName];
+        };
+    } else {
+        module.fail("No means of obtaining computed style properties found");
+    }
+
+    api.registerTextCommand("bold", {
+        type: BOOLEAN,
+        tagNames: ["b", "span", "strong"],
+
+        isAppliedToElement: function(el) {
+            var fontWeight = getComputedStyleProperty(el, "fontWeight");
+            var isBold = false;
+            if (fontWeight == "bold" || fontWeight == "bolder") {
+                isBold = true;
+            } else if (fontWeight == "normal" || fontWeight == "lighter") {
+                isBold = false;
+            } else {
+                var weightNum = parseInt("" + fontWeight);
+                if (!isNaN(weightNum)) {
+                    isBold = weightNum > 400;
+                }
+            }
+            return isBold;
+        },
+
+        applyToElement: function(el) {
+            el.style.fontWeight = "bold";
+        },
+
+        unapplyToElement: function(el) {
+            el.style.fontWeight = "normal";
+        }
+    });
+});
+
+
diff --git a/src/js/modules/rangy-textrange-old.js b/src/modules/rangy-textrange-old.js
similarity index 97%
rename from src/js/modules/rangy-textrange-old.js
rename to src/modules/rangy-textrange-old.js
index 039f0f0e..a9eed7ed 100644
--- a/src/js/modules/rangy-textrange-old.js
+++ b/src/modules/rangy-textrange-old.js
@@ -1,1605 +1,1605 @@
-/**
- * Text range module for Rangy.
- * Text-based manipulation and searching of ranges and selections.
- *
- * Features
- *
- * - Ability to move range boundaries by character or word offsets
- * - Customizable word tokenizer
- * - Ignores text nodes inside <script> or <style> elements or those hidden by CSS display and visibility properties
- * - Range findText method to search for text or regex within the page or within a range. Flags for whole words and case
- *   sensitivity
- * - Selection and range save/restore as text offsets within a node
- * - Methods to return visible text within a range or selection
- * - innerText method for elements
- *
- * References
- *
- * https://www.w3.org/Bugs/Public/show_bug.cgi?id=13145
- * http://aryeh.name/spec/innertext/innertext.html
- * http://dvcs.w3.org/hg/editing/raw-file/tip/editing.html
- *
- * Part of Rangy, a cross-browser JavaScript range and selection library
- * http://code.google.com/p/rangy/
- *
- * Depends on Rangy core.
- *
- * Copyright %%build:year%%, Tim Down
- * Licensed under the MIT license.
- * Version: %%build:version%%
- * Build date: %%build:date%%
- */
-
-/**
- * Problem: handling of trailing spaces before line breaks is handled inconsistently between browsers.
- *
- * First, a <br>: this is relatively simple. For the following HTML:
- *
- * 1 <br>2
- *
- * - IE and WebKit render the space, include it in the selection (i.e. when the content is selected and pasted into a
- *   textarea, the space is present) and allow the caret to be placed after it.
- * - Firefox does not acknowledge the space in the selection but it is possible to place the caret after it.
- * - Opera does not render the space but has two separate caret positions on either side of the space (left and right
- *   arrow keys show this) and includes the space in the selection.
- *
- * The other case is the line break or breaks implied by block elements. For the following HTML:
- *
- * <p>1 </p><p>2<p>
- *
- * - WebKit does not acknowledge the space in any way
- * - Firefox, IE and Opera as per <br>
- *
- * One more case is trailing spaces before line breaks in elements with white-space: pre-line. For the following HTML:
- *
- * <p style="white-space: pre-line">1 
- * 2</p>
- *
- * - Firefox and WebKit include the space in caret positions
- * - IE does not support pre-line up to and including version 9
- * - Opera ignores the space
- * - Trailing space only renders if there is a non-collapsed character in the line 
- *
- * Problem is whether Rangy should ever acknowledge the space and if so, when. Another problem is whether this can be
- * feature-tested
- */
-rangy.createModule("TextRange", ["WrappedSelection"], function(api, module) {
-    var UNDEF = "undefined";
-    var CHARACTER = "character", WORD = "word";
-    var dom = api.dom, util = api.util, DomPosition = dom.DomPosition;
-    var extend = util.extend;
-
-    var log = log4javascript.getLogger("rangy.textrange");
-
-    var spacesRegex = /^[ \t\f\r\n]+$/;
-    var spacesMinusLineBreaksRegex = /^[ \t\f\r]+$/;
-    var allWhiteSpaceRegex = /^[\t-\r \u0085\u00A0\u1680\u180E\u2000-\u200B\u2028\u2029\u202F\u205F\u3000]+$/;
-    var nonLineBreakWhiteSpaceRegex = /^[\t \u00A0\u1680\u180E\u2000-\u200B\u202F\u205F\u3000]+$/;
-    var lineBreakRegex = /^[\n-\r\u0085\u2028\u2029]$/;
-
-    var defaultLanguage = "en";
-
-    var isDirectionBackward = api.Selection.isDirectionBackward;
-
-    // Test whether trailing spaces inside blocks are completely collapsed (as they are in WebKit, but not other
-    // browsers). Also test whether trailing spaces before <br> elements are collapsed
-    var trailingSpaceInBlockCollapses = true;
-    var trailingSpaceBeforeBrCollapses = true;
-    var trailingSpaceBeforeLineBreakInPreLineCollapses = true;
-    
-    var el = document.createElement("div");
-/*
-    if (util.isHostProperty(el, "innerText")) {
-        el.innerHTML = "<p>&nbsp; </p><p></p>";
-        document.body.appendChild(el);
-        trailingSpaceInBlockCollapses = (!/ /.test(el.innerText));
-        document.body.removeChild(el);
-
-        el.innerHTML = "&nbsp; <br>";
-        document.body.appendChild(el);
-        trailingSpaceBeforeBrCollapses = (!/ /.test(el.innerText));
-        document.body.removeChild(el);
-    }
-*/
-    
-    util.extend(api.features, {
-        trailingSpaceInBlockCollapses: trailingSpaceInBlockCollapses,
-        trailingSpaceBeforeBrCollapses: trailingSpaceBeforeBrCollapses
-    });
-    //alert([trailingSpaceBeforeBrCollapses, trailingSpaceInBlockCollapses])
-
-
-    var getComputedStyleProperty;
-    if (typeof window.getComputedStyle != UNDEF) {
-        getComputedStyleProperty = function(el, propName, win) {
-            return (win || dom.getWindow(el)).getComputedStyle(el, null)[propName];
-        };
-    } else if (typeof document.documentElement.currentStyle != UNDEF) {
-        getComputedStyleProperty = function(el, propName) {
-            return el.currentStyle[propName];
-        };
-    } else {
-        module.fail("No means of obtaining computed style properties found");
-    }
-
-    // "A block node is either an Element whose "display" property does not have
-    // resolved value "inline" or "inline-block" or "inline-table" or "none", or a
-    // Document, or a DocumentFragment."
-    function isBlockNode(node) {
-        return node &&
-            ((node.nodeType == 1 && !/^(inline(-block|-table)?|none)$/.test(getComputedDisplay(node))) ||
-            node.nodeType == 9 || node.nodeType == 11);
-    }
-
-    function getLastDescendantOrSelf(node) {
-        var lastChild = node.lastChild;
-        return lastChild ? getLastDescendantOrSelf(lastChild) : node;
-    }
-
-    function containsPositions(node) {
-        return dom.isCharacterDataNode(node) ||
-            !/^(area|base|basefont|br|col|frame|hr|img|input|isindex|link|meta|param)$/i.test(node.nodeName);
-    }
-
-    function getAncestors(node) {
-        var ancestors = [];
-        while (node.parentNode) {
-            ancestors.unshift(node.parentNode);
-            node = node.parentNode;
-        }
-        return ancestors;
-    }
-
-    function getAncestorsAndSelf(node) {
-        return getAncestors(node).concat([node]);
-    }
-
-    // Opera 11 puts HTML elements in the null namespace, it seems, and IE 7 has undefined namespaceURI
-    function isHtmlNode(node) {
-        var ns;
-        return typeof (ns = node.namespaceURI) == UNDEF || (ns === null || ns == "http://www.w3.org/1999/xhtml");
-    }
-
-    function isHtmlElement(node, tagNames) {
-        if (!node || node.nodeType != 1 || !isHtmlNode(node)) {
-            return false;
-        }
-        switch (typeof tagNames) {
-            case "string":
-                return node.tagName.toLowerCase() == tagNames.toLowerCase();
-            case "object":
-                return new RegExp("^(" + tagNames.join("|S") + ")$", "i").test(node.tagName);
-            default:
-                return true;
-        }
-    }
-
-    function nextNodeDescendants(node) {
-        while (node && !node.nextSibling) {
-            node = node.parentNode;
-        }
-        if (!node) {
-            return null;
-        }
-        return node.nextSibling;
-    }
-
-    function nextNode(node, excludeChildren) {
-        if (!excludeChildren && node.hasChildNodes()) {
-            return node.firstChild;
-        }
-        return nextNodeDescendants(node);
-    }
-
-    function previousNode(node) {
-        var previous = node.previousSibling;
-        if (previous) {
-            node = previous;
-            while (node.hasChildNodes()) {
-                node = node.lastChild;
-            }
-            return node;
-        }
-        var parent = node.parentNode;
-        if (parent && parent.nodeType == 1) {
-            return parent;
-        }
-        return null;
-    }
-
-    function isHidden(node) {
-        var ancestors = getAncestorsAndSelf(node);
-        for (var i = 0, len = ancestors.length; i < len; ++i) {
-            if (ancestors[i].nodeType == 1 && getComputedDisplay(ancestors[i]) == "none") {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    function isVisibilityHiddenTextNode(textNode) {
-        var el;
-        return textNode.nodeType == 3 &&
-            (el = textNode.parentNode) &&
-            getComputedStyleProperty(el, "visibility") == "hidden";
-    }
-
-    // Adpated from Aryeh's code.
-    // "A whitespace node is either a Text node whose data is the empty string; or
-    // a Text node whose data consists only of one or more tabs (0x0009), line
-    // feeds (0x000A), carriage returns (0x000D), and/or spaces (0x0020), and whose
-    // parent is an Element whose resolved value for "white-space" is "normal" or
-    // "nowrap"; or a Text node whose data consists only of one or more tabs
-    // (0x0009), carriage returns (0x000D), and/or spaces (0x0020), and whose
-    // parent is an Element whose resolved value for "white-space" is "pre-line"."
-    function isWhitespaceNode(node) {
-        if (!node || node.nodeType != 3) {
-            return false;
-        }
-        var text = node.data;
-        if (text === "") {
-            return true;
-        }
-        var parent = node.parentNode;
-        if (!parent || parent.nodeType != 1) {
-            return false;
-        }
-        var computedWhiteSpace = getComputedStyleProperty(node.parentNode, "whiteSpace");
-
-        return (/^[\t\n\r ]+$/.test(text) && /^(normal|nowrap)$/.test(computedWhiteSpace)) ||
-            (/^[\t\r ]+$/.test(text) && computedWhiteSpace == "pre-line");
-    }
-
-    // Adpated from Aryeh's code.
-    // "node is a collapsed whitespace node if the following algorithm returns
-    // true:"
-    function isCollapsedWhitespaceNode(node) {
-        // "If node's data is the empty string, return true."
-        if (node.data == "") {
-            return true;
-        }
-
-        // "If node is not a whitespace node, return false."
-        if (!isWhitespaceNode(node)) {
-            return false;
-        }
-
-        // "Let ancestor be node's parent."
-        var ancestor = node.parentNode;
-
-        // "If ancestor is null, return true."
-        if (!ancestor) {
-            return true;
-        }
-
-        // "If the "display" property of some ancestor of node has resolved value "none", return true."
-        if (isHidden(node)) {
-            return true;
-        }
-
-        // Algorithms further down the line decide whether the white space node is collapsed or not
-        //return false;
-
-        // "While ancestor is not a block node and its parent is not null, set
-        // ancestor to its parent."
-        while (!isBlockNode(ancestor) && ancestor.parentNode) {
-            ancestor = ancestor.parentNode;
-        }
-
-        // "Let reference be node."
-        var reference = node;
-
-        // "While reference is a descendant of ancestor:"
-        while (reference != ancestor) {
-            // "Let reference be the node before it in tree order."
-            reference = previousNode(reference);
-
-            log.info("reference is " + dom.inspectNode(reference), isWhitespaceNode(reference));
-
-            // "If reference is a block node or a br, return true."
-            if (isBlockNode(reference) || isHtmlElement(reference, "br")) {
-                return true;
-            }
-
-            // "If reference is a Text node that is not a whitespace node, or is an
-            // img, break from this loop."
-            if ((reference.nodeType == 3 && !isWhitespaceNode(reference)) || isHtmlElement(reference, "img")) {
-                break;
-            }
-        }
-
-        // "Let reference be node."
-        reference = node;
-
-        // "While reference is a descendant of ancestor:"
-        var stop = nextNodeDescendants(ancestor);
-        while (reference != stop) {
-            // "Let reference be the node after it in tree order, or null if there
-            // is no such node."
-            reference = nextNode(reference);
-
-            log.info("reference is " + dom.inspectNode(reference), isWhitespaceNode(reference));
-
-            // "If reference is a block node or a br, return true."
-            if (isBlockNode(reference) || isHtmlElement(reference, "br")) {
-                return true;
-            }
-
-            // "If reference is a Text node that is not a whitespace node, or is an
-            // img, break from this loop."
-            if ((reference && reference.nodeType == 3 && !isWhitespaceNode(reference)) || isHtmlElement(reference, "img")) {
-                break;
-            }
-        }
-
-        // "Return false."
-        return false;
-    }
-
-    // Test for old IE's incorrect display properties
-    var tableCssDisplayBlock;
-    (function() {
-        var table = document.createElement("table");
-        document.body.appendChild(table);
-        tableCssDisplayBlock = (getComputedStyleProperty(table, "display") == "block");
-        document.body.removeChild(table);
-    })();
-
-    api.features.tableCssDisplayBlock = tableCssDisplayBlock;
-
-    var defaultDisplayValueForTag = {
-        table: "table",
-        caption: "table-caption",
-        colgroup: "table-column-group",
-        col: "table-column",
-        thead: "table-header-group",
-        tbody: "table-row-group",
-        tfoot: "table-footer-group",
-        tr: "table-row",
-        td: "table-cell",
-        th: "table-cell"
-    };
-
-    // Corrects IE's "block" value for table-related elements
-    function getComputedDisplay(el, win) {
-        var display = getComputedStyleProperty(el, "display", win);
-        var tagName = el.tagName.toLowerCase();
-        return (display == "block" &&
-                tableCssDisplayBlock &&
-                defaultDisplayValueForTag.hasOwnProperty(tagName)) ?
-            defaultDisplayValueForTag[tagName] : display;
-    }
-
-    function isCollapsedNode(node) {
-        var type = node.nodeType;
-        //log.debug("isCollapsedNode", isHidden(node), /^(script|style)$/i.test(node.nodeName), isCollapsedWhitespaceNode(node));
-        return type == 7 /* PROCESSING_INSTRUCTION */  ||
-            type == 8 /* COMMENT */ ||
-            isHidden(node) ||
-            /^(script|style)$/i.test(node.nodeName) ||
-            isVisibilityHiddenTextNode(node) ||
-            isCollapsedWhitespaceNode(node);
-    }
-
-    function isIgnoredNode(node, win) {
-        var type = node.nodeType;
-        return type == 7 /* PROCESSING_INSTRUCTION */ ||
-            type == 8 /* COMMENT */ ||
-            (type == 1 && getComputedDisplay(node, win) == "none");
-    }
-
-    function hasInnerText(node) {
-        if (!isCollapsedNode(node)) {
-            if (node.nodeType == 3) {
-                return true;
-            } else {
-                for (var child = node.firstChild; child; child = child.nextSibling) {
-                    if (hasInnerText(child)) {
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    function getRangeStartPosition(range) {
-        return new DomPosition(range.startContainer, range.startOffset);
-    }
-
-    function getRangeEndPosition(range) {
-        return new DomPosition(range.endContainer, range.endOffset);
-    }
-
-    function TextPosition(character, position, isLeadingSpace, isTrailingSpace, isBr, collapsible) {
-        this.character = character;
-        this.position = position;
-        this.isLeadingSpace = isLeadingSpace;
-        this.isTrailingSpace = isTrailingSpace;
-        this.isBr = isBr;
-        this.collapsible = collapsible;
-    }
-
-    TextPosition.prototype.toString = function() {
-        return this.character;
-    };
-
-    TextPosition.prototype.collapsesPrecedingSpace = function() {
-        return (this.character == "\n") &&
-            ( (this.isBr && trailingSpaceBeforeBrCollapses) || (this.isTrailingSpace && trailingSpaceInBlockCollapses) );
-    };
-
-    function getTrailingSpace(el) {
-        if (el.tagName.toLowerCase() == "br") {
-            return "";
-        } else {
-            switch (getComputedDisplay(el)) {
-                case "inline":
-                    var child = el.lastChild;
-                    while (child) {
-                        if (!isIgnoredNode(child)) {
-                            return (child.nodeType == 1) ? getTrailingSpace(child) : "";
-                        }
-                        child = child.previousSibling;
-                    }
-                    break;
-                case "inline-block":
-                case "inline-table":
-                case "none":
-                case "table-column":
-                case "table-column-group":
-                    break;
-                case "table-cell":
-                    return "\t";
-                default:
-                    return hasInnerText(el) ? "\n" : "";
-            }
-        }
-        return "";
-    }
-
-    function getLeadingSpace(el) {
-        switch (getComputedDisplay(el)) {
-            case "inline":
-            case "inline-block":
-            case "inline-table":
-            case "none":
-            case "table-column":
-            case "table-column-group":
-            case "table-cell":
-                break;
-            default:
-                return hasInnerText(el) ? "\n" : "";
-        }
-        return "";
-    }
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    /*
-    Next and previous position moving functions that move between all possible positions in the document
-     */
-    function nextPosition(pos) {
-        var node = pos.node, offset = pos.offset;
-        if (!node) {
-            return null;
-        }
-        var nextNode, nextOffset, child;
-        if (offset == dom.getNodeLength(node)) {
-            // Move onto the next node
-            nextNode = node.parentNode;
-            nextOffset = nextNode ? dom.getNodeIndex(node) + 1 : 0;
-        } else {
-            if (dom.isCharacterDataNode(node)) {
-                nextNode = node;
-                nextOffset = offset + 1;
-            } else {
-                child = node.childNodes[offset];
-                // Go into the children next, if children there are
-                if (containsPositions(child)) {
-                    nextNode = child;
-                    nextOffset = 0;
-                } else {
-                    nextNode = node;
-                    nextOffset = offset + 1;
-                }
-            }
-        }
-        return nextNode ? new DomPosition(nextNode, nextOffset) : null;
-    }
-
-    function previousPosition(pos) {
-        if (!pos) {
-            return null;
-        }
-        var node = pos.node, offset = pos.offset;
-        var previousNode, previousOffset, child;
-        if (offset == 0) {
-            previousNode = node.parentNode;
-            previousOffset = previousNode ? dom.getNodeIndex(node) : 0;
-        } else {
-            if (dom.isCharacterDataNode(node)) {
-                previousNode = node;
-                previousOffset = offset - 1;
-            } else {
-                child = node.childNodes[offset - 1];
-                // Go into the children next, if children there are
-                if (containsPositions(child)) {
-                    previousNode = child;
-                    previousOffset = dom.getNodeLength(child);
-                } else {
-                    previousNode = node;
-                    previousOffset = offset - 1;
-                }
-            }
-        }
-        return previousNode ? new DomPosition(previousNode, previousOffset) : null;
-    }
-
-    /*
-    Next and previous position moving functions that filter out
-
-    - Whole whitespace nodes that do not affect rendering
-    - Hidden (CSS visibility/display) elements
-    - Script and style elements
-    - collapsed whitespace characters
-     */
-    function nextVisiblePosition(pos) {
-        var next = nextPosition(pos);
-        if (!next) {
-            return null;
-        }
-        var node = next.node;
-        var newPos = next;
-        if (isCollapsedNode(node)) {
-            // We're skipping this node and all its descendants
-            newPos = new DomPosition(node.parentNode, dom.getNodeIndex(node) + 1);
-        }
-        return newPos;
-    }
-
-    function previousVisiblePosition(pos) {
-        var previous = previousPosition(pos);
-        if (!previous) {
-            return null;
-        }
-        var node = previous.node;
-        var newPos = previous;
-        if (isCollapsedNode(node)) {
-            // We're skipping this node and all its descendants
-            newPos = new DomPosition(node.parentNode, dom.getNodeIndex(node));
-        }
-        return newPos;
-    }
-
-    function createTransaction(win, characterOptions) {
-        return {
-            characterOptions: characterOptions
-        };
-    }
-
-    function getTextNodeProperties(textNode) {
-        log.debug("getTextNodeProperties for " + textNode.data);
-        var spaceRegex = null, collapseSpaces = false;
-        var cssWhitespace = getComputedStyleProperty(textNode.parentNode, "whiteSpace");
-        var preLine = (cssWhitespace == "pre-line");
-        if (preLine) {
-            spaceRegex = spacesMinusLineBreaksRegex;
-            collapseSpaces = true;
-        } else if (cssWhitespace == "normal" || cssWhitespace == "nowrap") {
-            spaceRegex = spacesRegex;
-            collapseSpaces = true;
-        }
-
-        return {
-            node: textNode,
-            text: textNode.data,
-            spaceRegex: spaceRegex,
-            collapseSpaces: collapseSpaces,
-            preLine: preLine
-        };
-    }
-
-    function getPossibleCharacterAt(pos, transaction, options) {
-        var node = pos.node, offset = pos.offset;
-        log.debug("getPossibleCharacterAt " + pos);
-        var visibleChar = "", isLeadingSpace = false, isTrailingSpace = false, isBr = false, collapsible = false;
-        if (offset > 0) {
-            if (node.nodeType == 3) {
-                var text = node.data;
-                var textChar = text.charAt(offset - 1);
-                log.debug("Got char '" + textChar + "' in data '" + text + "'");
-                var nodeInfo = transaction.nodeInfo;
-                if (!nodeInfo || nodeInfo.node !== node) {
-                    transaction.nodeInfo = nodeInfo = getTextNodeProperties(node);
-                }
-                var spaceRegex = nodeInfo.spaceRegex;
-                if (nodeInfo.collapseSpaces) {
-                    if (spaceRegex.test(textChar)) {
-                        collapsible = true;
-                        // "If the character at position is from set, append a single space (U+0020) to newdata and advance
-                        // position until the character at position is not from set."
-
-                        // We also need to check for the case where we're in a pre-line and we have a space preceding a
-                        // line break, because such spaces are collapsed in some browsers
-                        if (offset > 1 && spaceRegex.test(text.charAt(offset - 2))) {
-                            log.debug("Character is a collapsible space preceded by another collapsible space, skipping");
-                        } else if (nodeInfo.preLine && text.charAt(offset) === "\n" && trailingSpaceBeforeBrCollapses && options.collapseSpaces) {
-                            log.debug("Character is a collapsible space which is followed by a line break in a pre-line element, skipping");
-                        } else {
-                            log.debug("Character is a collapsible space not preceded by another collapsible space, adding");
-                            visibleChar = " ";
-                        }
-                    } else {
-                        log.debug("Character is not a space, adding");
-                        visibleChar = textChar;
-                    }
-                } else {
-                    log.debug("Spaces are not collapsible, so adding");
-                    visibleChar = textChar;
-                }
-            } else {
-                var nodePassed = node.childNodes[offset - 1];
-                if (nodePassed && nodePassed.nodeType == 1 && !isCollapsedNode(nodePassed)) {
-                    if (nodePassed.tagName.toLowerCase() == "br") {
-                        log.debug("Node is br");
-                        visibleChar = "\n";
-                        isBr = true;
-                    } else {
-                        log.debug("Getting trailing space for node " + dom.inspectNode(nodePassed));
-                        visibleChar = getTrailingSpace(nodePassed);
-                        if (visibleChar) {
-                            isTrailingSpace = collapsible = true;
-                        }
-                    }
-                }
-
-                // Check the leading space of the next node for the case when a block element follows an inline
-                // element or text node. In that case, there is an implied line break between the two nodes.
-                if (!visibleChar) {
-                    var nextNode = node.childNodes[offset];
-                    if (nextNode && nextNode.nodeType == 1 && !isCollapsedNode(nextNode)) {
-                        log.debug("Getting leading space for node " + dom.inspectNode(nextNode) + " at position " + pos.inspect());
-                        visibleChar = getLeadingSpace(nextNode);
-                        if (visibleChar) {
-                            log.debug("GOT LEADING SPACE AND USING IT");
-                            isLeadingSpace = true;
-                        }
-                    }
-                }
-            }
-        }
-        return new TextPosition(visibleChar, pos, isLeadingSpace, isTrailingSpace, isBr, collapsible);
-    }
-
-/*
-    function getPreviousPossibleCharacter(pos, transaction) {
-        var previousPos = pos, previous;
-        while ( (previousPos = previousVisiblePosition(previousPos)) ) {
-            previous = getPossibleCharacterAt(previousPos, transaction);
-            if (previous.character !== "") {
-                return previous;
-            }
-        }
-        return null;
-    }
-*/
-
-    function getNextPossibleCharacter(pos, transaction) {
-        var nextPos = pos, next;
-        while ( (nextPos = nextVisiblePosition(nextPos)) ) {
-            next = getPossibleCharacterAt(nextPos, transaction);
-            if (next.character !== "") {
-                return next;
-            }
-        }
-        return null;
-    }
-
-    function getCharacterAt(pos, transaction, precedingChars, options) {
-        var possible = getPossibleCharacterAt(pos, transaction);
-        var possibleChar = possible.character;
-        var next, preceding;
-        log.group("*** getCharacterAt got possible char '" + possibleChar + "' at position " + pos);
-        if (possibleChar) {
-            if (spacesRegex.test(possibleChar)) {
-                if (!precedingChars) {
-                    // Work backwards until we have a non-space character
-                    var previousPos = pos, previous, previousPossibleChar;
-                    precedingChars = [];
-                    while ( (previousPos = previousVisiblePosition(previousPos)) ) {
-                        previous = getPossibleCharacterAt(previousPos, transaction);
-                        previousPossibleChar = previous.character;
-                        if (previousPossibleChar !== "") {
-                            log.debug("Found preceding character '" + previousPossibleChar + "' at position " + previousPos);
-                            precedingChars.unshift(previous);
-                            if (previousPossibleChar != " " && previousPossibleChar != "\n") {
-                                break;
-                            }
-                        }
-                    }
-                }
-                preceding = precedingChars[precedingChars.length - 1];
-    
-                log.info("possible.collapsible: " + possible.collapsible + ", leading space: " + possible.isLeadingSpace + ", trailing space: " + possible.isTrailingSpace);
-                if (preceding) {
-                    log.info("preceding: '" + preceding + "' (" + preceding.position + "), possible: " + possible.position);
-                    log.info([possible.isLeadingSpace, possibleChar == "\n", [!preceding, preceding.isLeadingSpace, !dom.isOrIsAncestorOf(possible.position.node.parentNode, preceding.position.node), dom.inspectNode(possible.position.node.parentNode), dom.inspectNode(preceding.position.node)]]);
-                }
-    
-                // Disallow a collapsible space that follows a trailing space or line break, or is the first character
-                if (possibleChar === " " && possible.collapsible &&
-                        (!preceding || preceding.isTrailingSpace || preceding.character == "\n")) {
-                    log.info("Preceding character is a trailing space or non-existent or follows a line break and current possible character is a collapsible space, so space is collapsed");
-                    possible.character = "";
-                }
-    
-                // Disallow a collapsible space that is followed by a line break or is the last character
-                else if (possible.collapsible &&
-                        (!(next = getNextPossibleCharacter(pos, transaction))
-                            || (next.character == "\n" && options.collapseSpaceBeforeLineBreak && next.collapsesPrecedingSpace()))) {
-                    log.debug("Character is a space which is followed by a line break that collapses preceding spaces, or nothing, so collapsing");
-                    possible.character = "";
-                }
-    
-                // Collapse a br element that is followed by a trailing space
-                else if (possibleChar === "\n" && !possible.collapsible && (!(next = getNextPossibleCharacter(pos, transaction)) || next.isTrailingSpace)) {
-                    log.debug("Character is a br which is followed by a trailing space or nothing, collapsing");
-                    possible.character = "";
-                }
-            }
-        }
-        log.groupEnd();
-        return possible;
-    }
-
-
-    function createCharacterIterator(startPos, backward, endPos, characterOptions) {
-        log.info("createCharacterIterator called backwards " + backward + " and with endPos " + (endPos ? endPos.inspect() : ""));
-        var transaction = createTransaction(dom.getWindow(startPos.node), characterOptions);
-
-        // Adjust the end position to ensure that it is actually reached
-        if (endPos) {
-            if (backward) {
-                if (isCollapsedNode(endPos.node)) {
-                    endPos = previousVisiblePosition(endPos);
-                }
-            } else {
-                if (isCollapsedNode(endPos.node)) {
-                    endPos = nextVisiblePosition(endPos);
-                }
-            }
-        }
-        log.info("endPos now " + (endPos ? endPos.inspect() : "") + ", startPos " + startPos.inspect());
-
-        var pos = startPos, finished = false;
-
-        function next() {
-            var textPos = null;
-            if (!finished) {
-                if (!backward) {
-                    pos = nextVisiblePosition(pos);
-                }
-                if (pos) {
-                    textPos = getCharacterAt(pos, transaction, null, characterOptions);
-                    //log.debug("pos is " + pos.inspect() + ", endPos is " + (endPos ? endPos.inspect() : null) + ", equal is " + pos.equals(endPos));
-                    if (endPos && pos.equals(endPos)) {
-                        finished = true;
-                    }
-                } else {
-                    finished = true;
-                }
-                if (backward) {
-                    pos = previousVisiblePosition(pos);
-                }
-            }
-            return textPos;
-        }
-
-        var previousTextPos, returnPreviousTextPos = false;
-
-        return {
-            next: function() {
-                if (returnPreviousTextPos) {
-                    returnPreviousTextPos = false;
-                    return previousTextPos;
-                } else {
-                    var textPos;
-                    while ( (textPos = next()) ) {
-                        if (textPos.character) {
-                            previousTextPos = textPos;
-                            return textPos;
-                        }
-                    }
-                }
-            },
-
-            rewind: function() {
-                if (previousTextPos) {
-                    returnPreviousTextPos = true;
-                } else {
-                    throw module.createError("createCharacterIterator: cannot rewind. Only one position can be rewound.");
-                }
-            },
-
-            dispose: function() {
-                startPos = endPos = transaction = null;
-            }
-        };
-    }
-
-    // This function must create word and non-word tokens for the whole of the text supplied to it
-    function defaultTokenizer(chars, wordOptions) {
-        var word = chars.join(""), result, tokens = [];
-
-        function createTokenFromRange(start, end, isWord) {
-            var tokenChars = chars.slice(start, end);
-            var token = {
-                isWord: isWord,
-                chars: tokenChars,
-                toString: function() { return tokenChars.join(""); }
-            };
-            for (var i = 0, len = tokenChars.length; i < len; ++i) {
-                tokenChars[i].token = token;
-            }
-            tokens.push(token);
-        }
-
-        // Match words and mark characters
-        var lastWordEnd = 0, wordStart, wordEnd;
-        while ( (result = wordOptions.wordRegex.exec(word)) ) {
-            wordStart = result.index;
-            wordEnd = wordStart + result[0].length;
-
-            // Create token for non-word characters preceding this word
-            if (wordStart > lastWordEnd) {
-                createTokenFromRange(lastWordEnd, wordStart, false);
-            }
-
-            // Get trailing space characters for word
-            if (wordOptions.includeTrailingSpace) {
-                while (nonLineBreakWhiteSpaceRegex.test(chars[wordEnd])) {
-                    ++wordEnd;
-                }
-            }
-            createTokenFromRange(wordStart, wordEnd, true);
-            lastWordEnd = wordEnd;
-        }
-
-        // Create token for trailing non-word characters, if any exist
-        if (lastWordEnd < chars.length) {
-            createTokenFromRange(lastWordEnd, chars.length, false);
-        }
-
-        return tokens;
-    }
-
-    var arrayIndexOf = Array.prototype.indexOf ?
-        function(arr, val) {
-            return arr.indexOf(val);
-        } :
-        function(arr, val) {
-            for (var i = 0, len = arr.length; i < len; ++i) {
-                if (arr[i] === val) {
-                    return i;
-                }
-            }
-            return -1;
-        };
-
-    // Provides a pair of iterators over text positions, tokenized. Transparently requests more text when next()
-    // is called and there is no more tokenized text
-    function createTokenizedTextProvider(pos, characterOptions, wordOptions) {
-        var forwardIterator = createCharacterIterator(pos, false, null, characterOptions);
-        var backwardIterator = createCharacterIterator(pos, true, null, characterOptions);
-        var tokenizer = wordOptions.tokenizer;
-
-        // Consumes a word and the whitespace beyond it
-        function consumeWord(forward) {
-            log.debug("consumeWord called, forward is " + forward);
-            var textPos, textChar;
-            var newChars = [], it = forward ? forwardIterator : backwardIterator;
-
-            var passedWordBoundary = false, insideWord = false;
-
-            while ( (textPos = it.next()) ) {
-                textChar = textPos.character;
-
-                if (allWhiteSpaceRegex.test(textChar)) {
-                    if (insideWord) {
-                        insideWord = false;
-                        passedWordBoundary = true;
-                    }
-                } else {
-                    if (passedWordBoundary) {
-                        it.rewind();
-                        break;
-                    } else {
-                        insideWord = true;
-                    }
-                }
-                newChars.push(textPos);
-            }
-
-            log.debug("consumeWord got new chars " + newChars.join(""));
-            return newChars;
-        }
-
-        // Get initial word surrounding initial position and tokenize it
-        var forwardChars = consumeWord(true);
-        var backwardChars = consumeWord(false).reverse();
-        var tokens = tokenizer(backwardChars.concat(forwardChars), wordOptions);
-
-        // Create initial token buffers
-        var forwardTokensBuffer = forwardChars.length ?
-            tokens.slice(arrayIndexOf(tokens, forwardChars[0].token)) : [];
-
-        var backwardTokensBuffer = backwardChars.length ?
-            tokens.slice(0, arrayIndexOf(tokens, backwardChars.pop().token) + 1) : [];
-
-        function inspectBuffer(buffer) {
-            var textPositions = ["[" + buffer.length + "]"];
-            for (var i = 0; i < buffer.length; ++i) {
-                textPositions.push("(word: " + buffer[i] + ", is word: " + buffer[i].isWord + ")");
-            }
-            return textPositions;
-        }
-
-        log.info("Initial word: ", inspectBuffer(forwardTokensBuffer) + "", " and ", inspectBuffer(backwardTokensBuffer) + "", forwardChars, backwardChars);
-
-        return {
-            nextEndToken: function() {
-                var lastToken, forwardChars;
-
-                // If we're down to the last token, consume character chunks until we have a word or run out of
-                // characters to consume
-                while ( forwardTokensBuffer.length == 1 &&
-                        !(lastToken = forwardTokensBuffer[0]).isWord &&
-                        (forwardChars = consumeWord(true)).length > 0) {
-
-                    // Merge trailing non-word into next word and tokenize
-                    forwardTokensBuffer = tokenizer(lastToken.chars.concat(forwardChars), wordOptions);
-                }
-
-                return forwardTokensBuffer.shift();
-            },
-
-            previousStartToken: function() {
-                var lastToken, backwardChars;
-
-                // If we're down to the last token, consume character chunks until we have a word or run out of
-                // characters to consume
-                while ( backwardTokensBuffer.length == 1 &&
-                        !(lastToken = backwardTokensBuffer[0]).isWord &&
-                        (backwardChars = consumeWord(false)).length > 0) {
-
-                    // Merge leading non-word into next word and tokenize
-                    backwardTokensBuffer = tokenizer(backwardChars.reverse().concat(lastToken.chars), options);
-                }
-
-                return backwardTokensBuffer.pop();
-            },
-
-            dispose: function() {
-                forwardIterator.dispose();
-                backwardIterator.dispose();
-                forwardTokensBuffer = backwardTokensBuffer = null;
-            }
-        };
-    }
-
-    var defaultCharacterOptions = {
-        collapseSpaceBeforeLineBreak: true
-    };
-
-    function createOptions(optionsParam, defaults) {
-        if (!optionsParam) {
-            return defaults;
-        } else {
-            var options = {};
-            extend(options, defaults);
-            extend(options, optionsParam);
-            return options;
-        }
-    }
-    
-    var defaultWordOptions = {
-        "en": {
-            wordRegex: /[a-z0-9]+('[a-z0-9]+)*/gi,
-            includeTrailingSpace: false,
-            tokenizer: defaultTokenizer
-        }
-    };
-
-    function createWordOptions(options) {
-        var lang, defaults;
-        if (!options) {
-            return defaultWordOptions[defaultLanguage];
-        } else {
-            lang = options.language || defaultLanguage;
-            defaults = {};
-            extend(defaults, defaultWordOptions[lang] || defaultWordOptions[defaultLanguage]);
-            extend(defaults, options);
-            return defaults;
-        }
-    }
-
-    var defaultFindOptions = {
-        caseSensitive: false,
-        withinRange: null,
-        wholeWordsOnly: false,
-        wrap: false,
-        direction: "forward",
-        wordOptions: null,
-        characterOptions: null
-    };
-
-    var defaultMoveOptions = {
-        wordOptions: null,
-        characterOptions: null
-    };
-
-    var defaultExpandOptions = {
-        wordOptions: null,
-        characterOptions: null,
-        trim: false,
-        trimStart: true,
-        trimEnd: true
-    };
-
-    var defaultWordIteratorOptions = {
-        wordOptions: null,
-        characterOptions: null,
-        direction: "forward"
-    };
-
-    function movePositionBy(pos, unit, count, characterOptions, wordOptions) {
-        log.info("movePositionBy called " + count + ", pos " + pos.inspect());
-        var unitsMoved = 0, newPos = pos, textPos, charIterator, nextTextPos, newTextPos, absCount = Math.abs(count), token;
-        if (count !== 0) {
-            var backward = (count < 0);
-
-            switch (unit) {
-                case CHARACTER:
-                    charIterator = createCharacterIterator(pos, backward, null, characterOptions);
-                    while ( (textPos = charIterator.next()) && unitsMoved < absCount ) {
-                        log.info("*** movePositionBy GOT CHAR " + textPos.character + "[" + textPos.character.charCodeAt(0) + "]");
-                        ++unitsMoved;
-                        newTextPos = textPos;
-                    }
-                    nextTextPos = textPos;
-                    charIterator.dispose();
-                    break;
-                case WORD:
-                    var tokenizedTextProvider = createTokenizedTextProvider(pos, characterOptions, wordOptions);
-                    var next = backward ? tokenizedTextProvider.previousStartToken : tokenizedTextProvider.nextEndToken;
-
-                    while ( (token = next()) && unitsMoved < absCount ) {
-                        log.debug("token: " + token.chars.join(""), token.isWord);
-                        if (token.isWord) {
-                            ++unitsMoved;
-                            log.info("**** FOUND END OF WORD. unitsMoved NOW " + unitsMoved);
-                            newTextPos = backward ? token.chars[0] : token.chars[token.chars.length - 1];
-                        }
-                    }
-                    break;
-                default:
-                    throw new Error("movePositionBy: unit '" + unit + "' not implemented");
-            }
-
-            // Perform any necessary position tweaks
-            if (newTextPos) {
-                newPos = newTextPos.position;
-            }
-            if (backward) {
-                log.debug("Adjusting position. Current newPos: " + newPos);
-                newPos = previousVisiblePosition(newPos);
-                log.debug("newPos now: " + newPos);
-                unitsMoved = -unitsMoved;
-            } else if (newTextPos && newTextPos.isLeadingSpace) {
-                // Tweak the position for the case of a leading space. The problem is that an uncollapsed leading space
-                // before a block element (for example, the line break between "1" and "2" in the following HTML:
-                // "1<p>2</p>") is considered to be attached to the position immediately before the block element, which
-                // corresponds with a different selection position in most browsers from the one we want (i.e. at the
-                // start of the contents of the block element). We get round this by advancing the position returned to
-                // the last possible equivalent visible position.
-                log.info("movePositionBy ended immediately after a leading space at " + newPos);
-                if (unit == WORD) {
-                    charIterator = createCharacterIterator(pos, false, null, characterOptions);
-                    nextTextPos = charIterator.next();
-                    charIterator.dispose();
-                }
-                if (nextTextPos) {
-                    newPos = previousVisiblePosition(nextTextPos.position);
-                    log.info("movePositionBy adjusted leading space position to " + newPos);
-                }
-            }
-        }
-
-        return {
-            position: newPos,
-            unitsMoved: unitsMoved
-        };
-    }
-
-    function createRangeCharacterIterator(range, characterOptions, backward) {
-        var rangeStart = getRangeStartPosition(range), rangeEnd = getRangeEndPosition(range);
-        var itStart = backward ? rangeEnd : rangeStart, itEnd = backward ? rangeStart : rangeEnd;
-        return createCharacterIterator(itStart, !!backward, itEnd, characterOptions);
-    }
-
-    function getRangeCharacters(range, characterOptions) {
-        log.info("getRangeCharacters called on range " + range.inspect());
-
-        var chars = [], it = createRangeCharacterIterator(range, characterOptions), textPos;
-        while ( (textPos = it.next()) ) {
-            log.info("*** GOT CHAR " + textPos.character + "[" + textPos.character.charCodeAt(0) + "]");
-            chars.push(textPos);
-        }
-
-        it.dispose();
-        return chars;
-    }
-
-    function isWholeWord(startPos, endPos, wordOptions) {
-        var range = api.createRange(startPos.node);
-        range.setStart(startPos.node, startPos.offset);
-        range.setEnd(endPos.node, endPos.offset);
-        var returnVal = !range.expand("word", wordOptions);
-        return returnVal;
-    }
-
-    function findTextFromPosition(initialPos, searchTerm, isRegex, searchScopeRange, findOptions) {
-        log.debug("findTextFromPosition called with search term " + searchTerm + ", initialPos " + initialPos.inspect() + " within range " + searchScopeRange.inspect());
-        var backward = isDirectionBackward(findOptions.direction);
-        var it = createCharacterIterator(
-            initialPos,
-            backward,
-            backward ? getRangeStartPosition(searchScopeRange) : getRangeEndPosition(searchScopeRange),
-            findOptions
-        );
-        var text = "", chars = [], textPos, currentChar, matchStartIndex, matchEndIndex;
-        var result, insideRegexMatch;
-        var returnValue = null;
-
-        function handleMatch(startIndex, endIndex) {
-            var startPos = previousVisiblePosition(chars[startIndex].position);
-            var endPos = chars[endIndex - 1].position;
-            var valid = (!findOptions.wholeWordsOnly || isWholeWord(startPos, endPos, findOptions.wordOptions));
-
-            return {
-                startPos: startPos,
-                endPos: endPos,
-                valid: valid
-            };
-        }
-
-        while ( (textPos = it.next()) ) {
-            currentChar = textPos.character;
-            currentChar = textPos.character;
-            if (!isRegex && !findOptions.caseSensitive) {
-                currentChar = currentChar.toLowerCase();
-            }
-
-            if (backward) {
-                chars.unshift(textPos);
-                text = currentChar + text;
-            } else {
-                chars.push(textPos);
-                text += currentChar;
-            }
-
-            if (isRegex) {
-                result = searchTerm.exec(text);
-                if (result) {
-                    if (insideRegexMatch) {
-                        // Check whether the match is now over
-                        matchStartIndex = result.index;
-                        matchEndIndex = matchStartIndex + result[0].length;
-                        if ((!backward && matchEndIndex < text.length) || (backward && matchStartIndex > 0)) {
-                            returnValue = handleMatch(matchStartIndex, matchEndIndex);
-                            break;
-                        }
-                    } else {
-                        insideRegexMatch = true;
-                    }
-                }
-            } else if ( (matchStartIndex = text.indexOf(searchTerm)) != -1 ) {
-                returnValue = handleMatch(matchStartIndex, matchStartIndex + searchTerm.length);
-                break;
-            }
-        }
-
-        // Check whether regex match extends to the end of the range
-        if (insideRegexMatch) {
-            returnValue = handleMatch(matchStartIndex, matchEndIndex);
-        }
-        it.dispose();
-
-        return returnValue;
-    }
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    // Extensions to the rangy.dom utility object
-
-    extend(dom, {
-        nextNode: nextNode,
-        previousNode: previousNode,
-        hasInnerText: hasInnerText
-    });
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    // Extensions to the Rangy Range object
-
-    function createRangeBoundaryMover(isStart, collapse) {
-        /*
-        Unit can be "character" or "word"
-        Options:
-
-        - includeTrailingSpace
-        - wordRegex
-        - tokenizer
-        - collapseSpaceBeforeLineBreak
-        */
-        return function(unit, count, moveOptions) {
-            if (typeof count == "undefined") {
-                count = unit;
-                unit = CHARACTER;
-            }
-            moveOptions = createOptions(moveOptions, defaultMoveOptions);
-            var characterOptions = createOptions(moveOptions.characterOptions, defaultCharacterOptions);
-            var wordOptions = createWordOptions(moveOptions.wordOptions);
-            log.debug("** moving boundary. start: " + isStart + ", unit: " + unit + ", count: " + count);
-
-            var boundaryIsStart = isStart;
-            if (collapse) {
-                boundaryIsStart = (count >= 0);
-                this.collapse(!boundaryIsStart);
-            }
-            var rangePositionGetter = boundaryIsStart ? getRangeStartPosition : getRangeEndPosition;
-            var moveResult = movePositionBy(rangePositionGetter(this), unit, count, characterOptions, wordOptions);
-            var newPos = moveResult.position;
-            this[boundaryIsStart ? "setStart" : "setEnd"](newPos.node, newPos.offset);
-            return moveResult.unitsMoved;
-        };
-    }
-
-    function createRangeTrimmer(isStart) {
-        return function(characterOptions) {
-            characterOptions = createOptions(characterOptions, defaultCharacterOptions);
-            var textPos;
-            var it = createRangeCharacterIterator(this, characterOptions, !isStart);
-            var trimCharCount = 0;
-            while ( (textPos = it.next()) && allWhiteSpaceRegex.test(textPos.character) ) {
-                ++trimCharCount;
-            }
-            it.dispose();
-            var trimmed = (trimCharCount > 0);
-            if (trimmed) {
-                this[isStart ? "moveStart" : "moveEnd"](
-                    "character",
-                    isStart ? trimCharCount : -trimCharCount,
-                    { characterOptions: characterOptions }
-                );
-            }
-            return trimmed;
-        };
-    }
-    
-    extend(api.rangePrototype, {
-        moveStart: createRangeBoundaryMover(true, false),
-
-        moveEnd: createRangeBoundaryMover(false, false),
-
-        move: createRangeBoundaryMover(true, true),
-        
-        trimStart: createRangeTrimmer(true),
-
-        trimEnd: createRangeTrimmer(false),
-        
-        trim: function(characterOptions) {
-            var startTrimmed = this.trimStart(characterOptions), endTrimmed = this.trimEnd(characterOptions);
-            return startTrimmed || endTrimmed;
-        },
-
-        expand: function(unit, expandOptions) {
-            var moved = false;
-            expandOptions = createOptions(expandOptions, defaultExpandOptions);
-            var characterOptions = createOptions(expandOptions.characterOptions, defaultCharacterOptions);
-            if (!unit) {
-                unit = CHARACTER;
-            }
-            if (unit == WORD) {
-                var wordOptions = createWordOptions(expandOptions.wordOptions);
-                var startPos = getRangeStartPosition(this);
-                var endPos = getRangeEndPosition(this);
-
-                var startTokenizedTextProvider = createTokenizedTextProvider(startPos, characterOptions, wordOptions);
-                var startToken = startTokenizedTextProvider.nextEndToken();
-                var newStartPos = previousVisiblePosition(startToken.chars[0].position);
-                var endToken, newEndPos;
-
-                if (this.collapsed) {
-                    endToken = startToken;
-                } else {
-                    var endTokenizedTextProvider = createTokenizedTextProvider(endPos, characterOptions, wordOptions);
-                    endToken = endTokenizedTextProvider.previousStartToken();
-                }
-                newEndPos = endToken.chars[endToken.chars.length - 1].position;
-
-                if (!newStartPos.equals(startPos)) {
-                    this.setStart(newStartPos.node, newStartPos.offset);
-                    moved = true;
-                }
-                if (!newEndPos.equals(endPos)) {
-                    this.setEnd(newEndPos.node, newEndPos.offset);
-                    moved = true;
-                }
-
-                if (expandOptions.trim) {
-                    if (expandOptions.trimStart) {
-                        moved = this.trimStart(characterOptions) || moved;
-                    }
-                    if (expandOptions.trimEnd) {
-                        moved = this.trimEnd(characterOptions) || moved;
-                    }
-                }
-                
-                return moved;
-            } else {
-                return this.moveEnd(CHARACTER, 1, expandOptions);
-            }
-        },
-
-        text: function(characterOptions) {
-            return this.collapsed ?
-                "" : getRangeCharacters(this, createOptions(characterOptions, defaultCharacterOptions)).join("");
-        },
-
-        selectCharacters: function(containerNode, startIndex, endIndex, characterOptions) {
-            var moveOptions = { characterOptions: characterOptions };
-            this.selectNodeContents(containerNode);
-            this.collapse(true);
-            this.moveStart("character", startIndex, moveOptions);
-            this.collapse(true);
-            this.moveEnd("character", endIndex - startIndex, moveOptions);
-        },
-
-        // Character indexes are relative to the start of node
-        toCharacterRange: function(containerNode, characterOptions) {
-            if (!containerNode) {
-                containerNode = document.body;
-            }
-            var parent = containerNode.parentNode, nodeIndex = dom.getNodeIndex(containerNode);
-            var rangeStartsBeforeNode = (dom.comparePoints(this.startContainer, this.endContainer, parent, nodeIndex) == -1);
-            var rangeBetween = this.cloneRange();
-            var startIndex, endIndex;
-            if (rangeStartsBeforeNode) {
-                rangeBetween.setStart(this.startContainer, this.startOffset);
-                rangeBetween.setEnd(parent, nodeIndex);
-                startIndex = -rangeBetween.text(characterOptions).length;
-            } else {
-                rangeBetween.setStart(parent, nodeIndex);
-                rangeBetween.setEnd(this.startContainer, this.startOffset);
-                startIndex = rangeBetween.text(characterOptions).length;
-            }
-            endIndex = startIndex + this.text(characterOptions).length;
-
-            return {
-                start: startIndex,
-                end: endIndex
-            };
-        },
-
-        findText: function(searchTermParam, findOptions) {
-            // Set up options
-            findOptions = createOptions(findOptions, defaultFindOptions);
-
-            // Create word options if we're matching whole words only
-            if (findOptions.wholeWordsOnly) {
-                findOptions.wordOptions = createWordOptions(findOptions.wordOptions);
-
-                // We don't ever want trailing spaces for search results
-                findOptions.wordOptions.includeTrailingSpace = false;
-            }
-
-            var backward = isDirectionBackward(findOptions.direction);
-
-            // Create a range representing the search scope if none was provided
-            var searchScopeRange = findOptions.withinRange;
-            if (!searchScopeRange) {
-                searchScopeRange = api.createRange();
-                searchScopeRange.selectNodeContents(this.getDocument());
-            }
-
-            // Examine and prepare the search term
-            var searchTerm = searchTermParam, isRegex = false;
-            if (typeof searchTerm == "string") {
-                if (!findOptions.caseSensitive) {
-                    searchTerm = searchTerm.toLowerCase();
-                }
-            } else {
-                isRegex = true;
-            }
-
-            var initialPos = backward ? getRangeEndPosition(this) : getRangeStartPosition(this);
-
-            // Adjust initial position if it lies outside the search scope
-            var comparison = searchScopeRange.comparePoint(initialPos.node, initialPos.offset);
-            if (comparison === -1) {
-                initialPos = getRangeStartPosition(searchScopeRange);
-            } else if (comparison === 1) {
-                initialPos = getRangeEndPosition(searchScopeRange);
-            }
-
-            var pos = initialPos;
-            var wrappedAround = false;
-
-            // Try to find a match and ignore invalid ones
-            var findResult;
-            while (true) {
-                findResult = findTextFromPosition(pos, searchTerm, isRegex, searchScopeRange, findOptions);
-
-                if (findResult) {
-                    if (findResult.valid) {
-                        this.setStart(findResult.startPos.node, findResult.startPos.offset);
-                        this.setEnd(findResult.endPos.node, findResult.endPos.offset);
-                        return true;
-                    } else {
-                        // We've found a match that is not a whole word, so we carry on searching from the point immediately
-                        // after the match
-                        pos = backward ? findResult.startPos : findResult.endPos;
-                    }
-                } else if (findOptions.wrap && !wrappedAround) {
-                    // No result found but we're wrapping around and limiting the scope to the unsearched part of the range
-                    searchScopeRange = searchScopeRange.cloneRange();
-                    if (backward) {
-                        pos = getRangeEndPosition(searchScopeRange);
-                        searchScopeRange.setStart(initialPos.node, initialPos.offset);
-                    } else {
-                        pos = getRangeStartPosition(searchScopeRange);
-                        searchScopeRange.setEnd(initialPos.node, initialPos.offset);
-                    }
-                    log.debug("Wrapping search. New search range is " + searchScopeRange.inspect());
-                    wrappedAround = true;
-                } else {
-                    // Nothing found and we can't wrap around, so we're done
-                    return false;
-                }
-            }
-        },
-
-        pasteHtml: function(html) {
-            this.deleteContents();
-            if (html) {
-                var frag = this.createContextualFragment(html);
-                var lastChild = frag.lastChild;
-                this.insertNode(frag);
-                this.collapseAfter(lastChild);
-            }
-        }
-    });
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    // Extensions to the Rangy Selection object
-    
-    function createSelectionTrimmer(methodName) {
-        return function(characterOptions) {
-            var trimmed = false;
-            this.changeEachRange(function(range) {
-                trimmed = range[methodName](characterOptions) || trimmed;
-            });
-            return trimmed;
-        }
-    }
-
-    extend(api.selectionPrototype, {
-        expand: function(unit, expandOptions) {
-            this.changeEachRange(function(range) {
-                range.expand(unit, expandOptions);
-            });
-        },
-
-        move: function(unit, count, options) {
-            if (this.focusNode) {
-                this.collapse(this.focusNode, this.focusOffset);
-                var range = this.getRangeAt(0);
-                range.move(unit, count, options);
-                this.setSingleRange(range);
-            }
-        },
-        
-        trimStart: createSelectionTrimmer("trimStart"),
-        trimEnd: createSelectionTrimmer("trimEnd"),
-        trim: createSelectionTrimmer("trim"),
-
-        selectCharacters: function(containerNode, startIndex, endIndex, direction, characterOptions) {
-            var range = api.createRange(containerNode);
-            range.selectCharacters(containerNode, startIndex, endIndex, characterOptions);
-            this.setSingleRange(range, direction);
-        },
-
-        saveCharacterRanges: function(containerNode, characterOptions) {
-            var ranges = this.getAllRanges(), rangeCount = ranges.length;
-            var characterRanges = [];
-
-            var backward = rangeCount == 1 && this.isBackward();
-
-            for (var i = 0, len = ranges.length; i < len; ++i) {
-                characterRanges[i] = {
-                    range: ranges[i].toCharacterRange(containerNode, characterOptions),
-                    backward: backward,
-                    characterOptions: characterOptions
-                };
-            }
-
-            return characterRanges;
-        },
-
-        restoreCharacterRanges: function(containerNode, characterRanges) {
-            this.removeAllRanges();
-            for (var i = 0, len = characterRanges.length, range, characterRange; i < len; ++i) {
-                characterRange = characterRanges[i];
-                range = api.createRange(containerNode);
-                range.selectCharacters(containerNode, characterRange.range.start, characterRange.range.end, characterRange.characterOptions);
-                this.addRange(range, characterRange.backward);
-            }
-        },
-
-        text: function(characterOptions) {
-            var rangeTexts = [];
-            for (var i = 0, len = this.rangeCount; i < len; ++i) {
-                rangeTexts[i] = this.getRangeAt(i).text(characterOptions);
-            }
-            return rangeTexts.join("");
-        }
-    });
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    // Extensions to the core rangy object
-
-    api.innerText = function(el, characterOptions) {
-        var range = api.createRange(el);
-        range.selectNodeContents(el);
-        var text = range.text(characterOptions);
-        log.debug("innerText is '" + text.replace(/\s/g, function(matched) { return "[" + matched.charCodeAt(0) + "]"; }) + "'");
-        return text;
-    };
-
-    api.createWordIterator = function(startNode, startOffset, iteratorOptions) {
-        iteratorOptions = createOptions(iteratorOptions, defaultWordIteratorOptions);
-        characterOptions = createOptions(iteratorOptions.characterOptions, defaultCharacterOptions);
-        wordOptions = createWordOptions(iteratorOptions.wordOptions);
-        var startPos = new DomPosition(startNode, startOffset);
-        var tokenizedTextProvider = createTokenizedTextProvider(startPos, characterOptions, wordOptions);
-        var backward = isDirectionBackward(iteratorOptions.direction);
-
-        return {
-            next: function() {
-                return backward ? tokenizedTextProvider.previousStartToken() : tokenizedTextProvider.nextEndToken();
-            },
-
-            dispose: function() {
-                tokenizedTextProvider.dispose();
-                this.next = function() {};
-            }
-        };
-    };
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    api.textRange = {
-        isBlockNode: isBlockNode,
-        isCollapsedWhitespaceNode: isCollapsedWhitespaceNode,
-        nextPosition: nextPosition,
-        previousPosition: previousPosition,
-        nextVisiblePosition: nextVisiblePosition,
-        previousVisiblePosition: previousVisiblePosition
-    };
-
-});
+/**
+ * Text range module for Rangy.
+ * Text-based manipulation and searching of ranges and selections.
+ *
+ * Features
+ *
+ * - Ability to move range boundaries by character or word offsets
+ * - Customizable word tokenizer
+ * - Ignores text nodes inside <script> or <style> elements or those hidden by CSS display and visibility properties
+ * - Range findText method to search for text or regex within the page or within a range. Flags for whole words and case
+ *   sensitivity
+ * - Selection and range save/restore as text offsets within a node
+ * - Methods to return visible text within a range or selection
+ * - innerText method for elements
+ *
+ * References
+ *
+ * https://www.w3.org/Bugs/Public/show_bug.cgi?id=13145
+ * http://aryeh.name/spec/innertext/innertext.html
+ * http://dvcs.w3.org/hg/editing/raw-file/tip/editing.html
+ *
+ * Part of Rangy, a cross-browser JavaScript range and selection library
+ * http://code.google.com/p/rangy/
+ *
+ * Depends on Rangy core.
+ *
+ * Copyright %%build:year%%, Tim Down
+ * Licensed under the MIT license.
+ * Version: %%build:version%%
+ * Build date: %%build:date%%
+ */
+
+/**
+ * Problem: handling of trailing spaces before line breaks is handled inconsistently between browsers.
+ *
+ * First, a <br>: this is relatively simple. For the following HTML:
+ *
+ * 1 <br>2
+ *
+ * - IE and WebKit render the space, include it in the selection (i.e. when the content is selected and pasted into a
+ *   textarea, the space is present) and allow the caret to be placed after it.
+ * - Firefox does not acknowledge the space in the selection but it is possible to place the caret after it.
+ * - Opera does not render the space but has two separate caret positions on either side of the space (left and right
+ *   arrow keys show this) and includes the space in the selection.
+ *
+ * The other case is the line break or breaks implied by block elements. For the following HTML:
+ *
+ * <p>1 </p><p>2<p>
+ *
+ * - WebKit does not acknowledge the space in any way
+ * - Firefox, IE and Opera as per <br>
+ *
+ * One more case is trailing spaces before line breaks in elements with white-space: pre-line. For the following HTML:
+ *
+ * <p style="white-space: pre-line">1 
+ * 2</p>
+ *
+ * - Firefox and WebKit include the space in caret positions
+ * - IE does not support pre-line up to and including version 9
+ * - Opera ignores the space
+ * - Trailing space only renders if there is a non-collapsed character in the line 
+ *
+ * Problem is whether Rangy should ever acknowledge the space and if so, when. Another problem is whether this can be
+ * feature-tested
+ */
+rangy.createModule("TextRange", ["WrappedSelection"], function(api, module) {
+    var UNDEF = "undefined";
+    var CHARACTER = "character", WORD = "word";
+    var dom = api.dom, util = api.util, DomPosition = dom.DomPosition;
+    var extend = util.extend;
+
+    var log = log4javascript.getLogger("rangy.textrange");
+
+    var spacesRegex = /^[ \t\f\r\n]+$/;
+    var spacesMinusLineBreaksRegex = /^[ \t\f\r]+$/;
+    var allWhiteSpaceRegex = /^[\t-\r \u0085\u00A0\u1680\u180E\u2000-\u200B\u2028\u2029\u202F\u205F\u3000]+$/;
+    var nonLineBreakWhiteSpaceRegex = /^[\t \u00A0\u1680\u180E\u2000-\u200B\u202F\u205F\u3000]+$/;
+    var lineBreakRegex = /^[\n-\r\u0085\u2028\u2029]$/;
+
+    var defaultLanguage = "en";
+
+    var isDirectionBackward = api.Selection.isDirectionBackward;
+
+    // Test whether trailing spaces inside blocks are completely collapsed (as they are in WebKit, but not other
+    // browsers). Also test whether trailing spaces before <br> elements are collapsed
+    var trailingSpaceInBlockCollapses = true;
+    var trailingSpaceBeforeBrCollapses = true;
+    var trailingSpaceBeforeLineBreakInPreLineCollapses = true;
+    
+    var el = document.createElement("div");
+/*
+    if (util.isHostProperty(el, "innerText")) {
+        el.innerHTML = "<p>&nbsp; </p><p></p>";
+        document.body.appendChild(el);
+        trailingSpaceInBlockCollapses = (!/ /.test(el.innerText));
+        document.body.removeChild(el);
+
+        el.innerHTML = "&nbsp; <br>";
+        document.body.appendChild(el);
+        trailingSpaceBeforeBrCollapses = (!/ /.test(el.innerText));
+        document.body.removeChild(el);
+    }
+*/
+    
+    util.extend(api.features, {
+        trailingSpaceInBlockCollapses: trailingSpaceInBlockCollapses,
+        trailingSpaceBeforeBrCollapses: trailingSpaceBeforeBrCollapses
+    });
+    //alert([trailingSpaceBeforeBrCollapses, trailingSpaceInBlockCollapses])
+
+
+    var getComputedStyleProperty;
+    if (typeof window.getComputedStyle != UNDEF) {
+        getComputedStyleProperty = function(el, propName, win) {
+            return (win || dom.getWindow(el)).getComputedStyle(el, null)[propName];
+        };
+    } else if (typeof document.documentElement.currentStyle != UNDEF) {
+        getComputedStyleProperty = function(el, propName) {
+            return el.currentStyle[propName];
+        };
+    } else {
+        module.fail("No means of obtaining computed style properties found");
+    }
+
+    // "A block node is either an Element whose "display" property does not have
+    // resolved value "inline" or "inline-block" or "inline-table" or "none", or a
+    // Document, or a DocumentFragment."
+    function isBlockNode(node) {
+        return node &&
+            ((node.nodeType == 1 && !/^(inline(-block|-table)?|none)$/.test(getComputedDisplay(node))) ||
+            node.nodeType == 9 || node.nodeType == 11);
+    }
+
+    function getLastDescendantOrSelf(node) {
+        var lastChild = node.lastChild;
+        return lastChild ? getLastDescendantOrSelf(lastChild) : node;
+    }
+
+    function containsPositions(node) {
+        return dom.isCharacterDataNode(node) ||
+            !/^(area|base|basefont|br|col|frame|hr|img|input|isindex|link|meta|param)$/i.test(node.nodeName);
+    }
+
+    function getAncestors(node) {
+        var ancestors = [];
+        while (node.parentNode) {
+            ancestors.unshift(node.parentNode);
+            node = node.parentNode;
+        }
+        return ancestors;
+    }
+
+    function getAncestorsAndSelf(node) {
+        return getAncestors(node).concat([node]);
+    }
+
+    // Opera 11 puts HTML elements in the null namespace, it seems, and IE 7 has undefined namespaceURI
+    function isHtmlNode(node) {
+        var ns;
+        return typeof (ns = node.namespaceURI) == UNDEF || (ns === null || ns == "http://www.w3.org/1999/xhtml");
+    }
+
+    function isHtmlElement(node, tagNames) {
+        if (!node || node.nodeType != 1 || !isHtmlNode(node)) {
+            return false;
+        }
+        switch (typeof tagNames) {
+            case "string":
+                return node.tagName.toLowerCase() == tagNames.toLowerCase();
+            case "object":
+                return new RegExp("^(" + tagNames.join("|S") + ")$", "i").test(node.tagName);
+            default:
+                return true;
+        }
+    }
+
+    function nextNodeDescendants(node) {
+        while (node && !node.nextSibling) {
+            node = node.parentNode;
+        }
+        if (!node) {
+            return null;
+        }
+        return node.nextSibling;
+    }
+
+    function nextNode(node, excludeChildren) {
+        if (!excludeChildren && node.hasChildNodes()) {
+            return node.firstChild;
+        }
+        return nextNodeDescendants(node);
+    }
+
+    function previousNode(node) {
+        var previous = node.previousSibling;
+        if (previous) {
+            node = previous;
+            while (node.hasChildNodes()) {
+                node = node.lastChild;
+            }
+            return node;
+        }
+        var parent = node.parentNode;
+        if (parent && parent.nodeType == 1) {
+            return parent;
+        }
+        return null;
+    }
+
+    function isHidden(node) {
+        var ancestors = getAncestorsAndSelf(node);
+        for (var i = 0, len = ancestors.length; i < len; ++i) {
+            if (ancestors[i].nodeType == 1 && getComputedDisplay(ancestors[i]) == "none") {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    function isVisibilityHiddenTextNode(textNode) {
+        var el;
+        return textNode.nodeType == 3 &&
+            (el = textNode.parentNode) &&
+            getComputedStyleProperty(el, "visibility") == "hidden";
+    }
+
+    // Adpated from Aryeh's code.
+    // "A whitespace node is either a Text node whose data is the empty string; or
+    // a Text node whose data consists only of one or more tabs (0x0009), line
+    // feeds (0x000A), carriage returns (0x000D), and/or spaces (0x0020), and whose
+    // parent is an Element whose resolved value for "white-space" is "normal" or
+    // "nowrap"; or a Text node whose data consists only of one or more tabs
+    // (0x0009), carriage returns (0x000D), and/or spaces (0x0020), and whose
+    // parent is an Element whose resolved value for "white-space" is "pre-line"."
+    function isWhitespaceNode(node) {
+        if (!node || node.nodeType != 3) {
+            return false;
+        }
+        var text = node.data;
+        if (text === "") {
+            return true;
+        }
+        var parent = node.parentNode;
+        if (!parent || parent.nodeType != 1) {
+            return false;
+        }
+        var computedWhiteSpace = getComputedStyleProperty(node.parentNode, "whiteSpace");
+
+        return (/^[\t\n\r ]+$/.test(text) && /^(normal|nowrap)$/.test(computedWhiteSpace)) ||
+            (/^[\t\r ]+$/.test(text) && computedWhiteSpace == "pre-line");
+    }
+
+    // Adpated from Aryeh's code.
+    // "node is a collapsed whitespace node if the following algorithm returns
+    // true:"
+    function isCollapsedWhitespaceNode(node) {
+        // "If node's data is the empty string, return true."
+        if (node.data == "") {
+            return true;
+        }
+
+        // "If node is not a whitespace node, return false."
+        if (!isWhitespaceNode(node)) {
+            return false;
+        }
+
+        // "Let ancestor be node's parent."
+        var ancestor = node.parentNode;
+
+        // "If ancestor is null, return true."
+        if (!ancestor) {
+            return true;
+        }
+
+        // "If the "display" property of some ancestor of node has resolved value "none", return true."
+        if (isHidden(node)) {
+            return true;
+        }
+
+        // Algorithms further down the line decide whether the white space node is collapsed or not
+        //return false;
+
+        // "While ancestor is not a block node and its parent is not null, set
+        // ancestor to its parent."
+        while (!isBlockNode(ancestor) && ancestor.parentNode) {
+            ancestor = ancestor.parentNode;
+        }
+
+        // "Let reference be node."
+        var reference = node;
+
+        // "While reference is a descendant of ancestor:"
+        while (reference != ancestor) {
+            // "Let reference be the node before it in tree order."
+            reference = previousNode(reference);
+
+            log.info("reference is " + dom.inspectNode(reference), isWhitespaceNode(reference));
+
+            // "If reference is a block node or a br, return true."
+            if (isBlockNode(reference) || isHtmlElement(reference, "br")) {
+                return true;
+            }
+
+            // "If reference is a Text node that is not a whitespace node, or is an
+            // img, break from this loop."
+            if ((reference.nodeType == 3 && !isWhitespaceNode(reference)) || isHtmlElement(reference, "img")) {
+                break;
+            }
+        }
+
+        // "Let reference be node."
+        reference = node;
+
+        // "While reference is a descendant of ancestor:"
+        var stop = nextNodeDescendants(ancestor);
+        while (reference != stop) {
+            // "Let reference be the node after it in tree order, or null if there
+            // is no such node."
+            reference = nextNode(reference);
+
+            log.info("reference is " + dom.inspectNode(reference), isWhitespaceNode(reference));
+
+            // "If reference is a block node or a br, return true."
+            if (isBlockNode(reference) || isHtmlElement(reference, "br")) {
+                return true;
+            }
+
+            // "If reference is a Text node that is not a whitespace node, or is an
+            // img, break from this loop."
+            if ((reference && reference.nodeType == 3 && !isWhitespaceNode(reference)) || isHtmlElement(reference, "img")) {
+                break;
+            }
+        }
+
+        // "Return false."
+        return false;
+    }
+
+    // Test for old IE's incorrect display properties
+    var tableCssDisplayBlock;
+    (function() {
+        var table = document.createElement("table");
+        document.body.appendChild(table);
+        tableCssDisplayBlock = (getComputedStyleProperty(table, "display") == "block");
+        document.body.removeChild(table);
+    })();
+
+    api.features.tableCssDisplayBlock = tableCssDisplayBlock;
+
+    var defaultDisplayValueForTag = {
+        table: "table",
+        caption: "table-caption",
+        colgroup: "table-column-group",
+        col: "table-column",
+        thead: "table-header-group",
+        tbody: "table-row-group",
+        tfoot: "table-footer-group",
+        tr: "table-row",
+        td: "table-cell",
+        th: "table-cell"
+    };
+
+    // Corrects IE's "block" value for table-related elements
+    function getComputedDisplay(el, win) {
+        var display = getComputedStyleProperty(el, "display", win);
+        var tagName = el.tagName.toLowerCase();
+        return (display == "block" &&
+                tableCssDisplayBlock &&
+                defaultDisplayValueForTag.hasOwnProperty(tagName)) ?
+            defaultDisplayValueForTag[tagName] : display;
+    }
+
+    function isCollapsedNode(node) {
+        var type = node.nodeType;
+        //log.debug("isCollapsedNode", isHidden(node), /^(script|style)$/i.test(node.nodeName), isCollapsedWhitespaceNode(node));
+        return type == 7 /* PROCESSING_INSTRUCTION */  ||
+            type == 8 /* COMMENT */ ||
+            isHidden(node) ||
+            /^(script|style)$/i.test(node.nodeName) ||
+            isVisibilityHiddenTextNode(node) ||
+            isCollapsedWhitespaceNode(node);
+    }
+
+    function isIgnoredNode(node, win) {
+        var type = node.nodeType;
+        return type == 7 /* PROCESSING_INSTRUCTION */ ||
+            type == 8 /* COMMENT */ ||
+            (type == 1 && getComputedDisplay(node, win) == "none");
+    }
+
+    function hasInnerText(node) {
+        if (!isCollapsedNode(node)) {
+            if (node.nodeType == 3) {
+                return true;
+            } else {
+                for (var child = node.firstChild; child; child = child.nextSibling) {
+                    if (hasInnerText(child)) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    function getRangeStartPosition(range) {
+        return new DomPosition(range.startContainer, range.startOffset);
+    }
+
+    function getRangeEndPosition(range) {
+        return new DomPosition(range.endContainer, range.endOffset);
+    }
+
+    function TextPosition(character, position, isLeadingSpace, isTrailingSpace, isBr, collapsible) {
+        this.character = character;
+        this.position = position;
+        this.isLeadingSpace = isLeadingSpace;
+        this.isTrailingSpace = isTrailingSpace;
+        this.isBr = isBr;
+        this.collapsible = collapsible;
+    }
+
+    TextPosition.prototype.toString = function() {
+        return this.character;
+    };
+
+    TextPosition.prototype.collapsesPrecedingSpace = function() {
+        return (this.character == "\n") &&
+            ( (this.isBr && trailingSpaceBeforeBrCollapses) || (this.isTrailingSpace && trailingSpaceInBlockCollapses) );
+    };
+
+    function getTrailingSpace(el) {
+        if (el.tagName.toLowerCase() == "br") {
+            return "";
+        } else {
+            switch (getComputedDisplay(el)) {
+                case "inline":
+                    var child = el.lastChild;
+                    while (child) {
+                        if (!isIgnoredNode(child)) {
+                            return (child.nodeType == 1) ? getTrailingSpace(child) : "";
+                        }
+                        child = child.previousSibling;
+                    }
+                    break;
+                case "inline-block":
+                case "inline-table":
+                case "none":
+                case "table-column":
+                case "table-column-group":
+                    break;
+                case "table-cell":
+                    return "\t";
+                default:
+                    return hasInnerText(el) ? "\n" : "";
+            }
+        }
+        return "";
+    }
+
+    function getLeadingSpace(el) {
+        switch (getComputedDisplay(el)) {
+            case "inline":
+            case "inline-block":
+            case "inline-table":
+            case "none":
+            case "table-column":
+            case "table-column-group":
+            case "table-cell":
+                break;
+            default:
+                return hasInnerText(el) ? "\n" : "";
+        }
+        return "";
+    }
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    /*
+    Next and previous position moving functions that move between all possible positions in the document
+     */
+    function nextPosition(pos) {
+        var node = pos.node, offset = pos.offset;
+        if (!node) {
+            return null;
+        }
+        var nextNode, nextOffset, child;
+        if (offset == dom.getNodeLength(node)) {
+            // Move onto the next node
+            nextNode = node.parentNode;
+            nextOffset = nextNode ? dom.getNodeIndex(node) + 1 : 0;
+        } else {
+            if (dom.isCharacterDataNode(node)) {
+                nextNode = node;
+                nextOffset = offset + 1;
+            } else {
+                child = node.childNodes[offset];
+                // Go into the children next, if children there are
+                if (containsPositions(child)) {
+                    nextNode = child;
+                    nextOffset = 0;
+                } else {
+                    nextNode = node;
+                    nextOffset = offset + 1;
+                }
+            }
+        }
+        return nextNode ? new DomPosition(nextNode, nextOffset) : null;
+    }
+
+    function previousPosition(pos) {
+        if (!pos) {
+            return null;
+        }
+        var node = pos.node, offset = pos.offset;
+        var previousNode, previousOffset, child;
+        if (offset == 0) {
+            previousNode = node.parentNode;
+            previousOffset = previousNode ? dom.getNodeIndex(node) : 0;
+        } else {
+            if (dom.isCharacterDataNode(node)) {
+                previousNode = node;
+                previousOffset = offset - 1;
+            } else {
+                child = node.childNodes[offset - 1];
+                // Go into the children next, if children there are
+                if (containsPositions(child)) {
+                    previousNode = child;
+                    previousOffset = dom.getNodeLength(child);
+                } else {
+                    previousNode = node;
+                    previousOffset = offset - 1;
+                }
+            }
+        }
+        return previousNode ? new DomPosition(previousNode, previousOffset) : null;
+    }
+
+    /*
+    Next and previous position moving functions that filter out
+
+    - Whole whitespace nodes that do not affect rendering
+    - Hidden (CSS visibility/display) elements
+    - Script and style elements
+    - collapsed whitespace characters
+     */
+    function nextVisiblePosition(pos) {
+        var next = nextPosition(pos);
+        if (!next) {
+            return null;
+        }
+        var node = next.node;
+        var newPos = next;
+        if (isCollapsedNode(node)) {
+            // We're skipping this node and all its descendants
+            newPos = new DomPosition(node.parentNode, dom.getNodeIndex(node) + 1);
+        }
+        return newPos;
+    }
+
+    function previousVisiblePosition(pos) {
+        var previous = previousPosition(pos);
+        if (!previous) {
+            return null;
+        }
+        var node = previous.node;
+        var newPos = previous;
+        if (isCollapsedNode(node)) {
+            // We're skipping this node and all its descendants
+            newPos = new DomPosition(node.parentNode, dom.getNodeIndex(node));
+        }
+        return newPos;
+    }
+
+    function createTransaction(win, characterOptions) {
+        return {
+            characterOptions: characterOptions
+        };
+    }
+
+    function getTextNodeProperties(textNode) {
+        log.debug("getTextNodeProperties for " + textNode.data);
+        var spaceRegex = null, collapseSpaces = false;
+        var cssWhitespace = getComputedStyleProperty(textNode.parentNode, "whiteSpace");
+        var preLine = (cssWhitespace == "pre-line");
+        if (preLine) {
+            spaceRegex = spacesMinusLineBreaksRegex;
+            collapseSpaces = true;
+        } else if (cssWhitespace == "normal" || cssWhitespace == "nowrap") {
+            spaceRegex = spacesRegex;
+            collapseSpaces = true;
+        }
+
+        return {
+            node: textNode,
+            text: textNode.data,
+            spaceRegex: spaceRegex,
+            collapseSpaces: collapseSpaces,
+            preLine: preLine
+        };
+    }
+
+    function getPossibleCharacterAt(pos, transaction, options) {
+        var node = pos.node, offset = pos.offset;
+        log.debug("getPossibleCharacterAt " + pos);
+        var visibleChar = "", isLeadingSpace = false, isTrailingSpace = false, isBr = false, collapsible = false;
+        if (offset > 0) {
+            if (node.nodeType == 3) {
+                var text = node.data;
+                var textChar = text.charAt(offset - 1);
+                log.debug("Got char '" + textChar + "' in data '" + text + "'");
+                var nodeInfo = transaction.nodeInfo;
+                if (!nodeInfo || nodeInfo.node !== node) {
+                    transaction.nodeInfo = nodeInfo = getTextNodeProperties(node);
+                }
+                var spaceRegex = nodeInfo.spaceRegex;
+                if (nodeInfo.collapseSpaces) {
+                    if (spaceRegex.test(textChar)) {
+                        collapsible = true;
+                        // "If the character at position is from set, append a single space (U+0020) to newdata and advance
+                        // position until the character at position is not from set."
+
+                        // We also need to check for the case where we're in a pre-line and we have a space preceding a
+                        // line break, because such spaces are collapsed in some browsers
+                        if (offset > 1 && spaceRegex.test(text.charAt(offset - 2))) {
+                            log.debug("Character is a collapsible space preceded by another collapsible space, skipping");
+                        } else if (nodeInfo.preLine && text.charAt(offset) === "\n" && trailingSpaceBeforeBrCollapses && options.collapseSpaces) {
+                            log.debug("Character is a collapsible space which is followed by a line break in a pre-line element, skipping");
+                        } else {
+                            log.debug("Character is a collapsible space not preceded by another collapsible space, adding");
+                            visibleChar = " ";
+                        }
+                    } else {
+                        log.debug("Character is not a space, adding");
+                        visibleChar = textChar;
+                    }
+                } else {
+                    log.debug("Spaces are not collapsible, so adding");
+                    visibleChar = textChar;
+                }
+            } else {
+                var nodePassed = node.childNodes[offset - 1];
+                if (nodePassed && nodePassed.nodeType == 1 && !isCollapsedNode(nodePassed)) {
+                    if (nodePassed.tagName.toLowerCase() == "br") {
+                        log.debug("Node is br");
+                        visibleChar = "\n";
+                        isBr = true;
+                    } else {
+                        log.debug("Getting trailing space for node " + dom.inspectNode(nodePassed));
+                        visibleChar = getTrailingSpace(nodePassed);
+                        if (visibleChar) {
+                            isTrailingSpace = collapsible = true;
+                        }
+                    }
+                }
+
+                // Check the leading space of the next node for the case when a block element follows an inline
+                // element or text node. In that case, there is an implied line break between the two nodes.
+                if (!visibleChar) {
+                    var nextNode = node.childNodes[offset];
+                    if (nextNode && nextNode.nodeType == 1 && !isCollapsedNode(nextNode)) {
+                        log.debug("Getting leading space for node " + dom.inspectNode(nextNode) + " at position " + pos.inspect());
+                        visibleChar = getLeadingSpace(nextNode);
+                        if (visibleChar) {
+                            log.debug("GOT LEADING SPACE AND USING IT");
+                            isLeadingSpace = true;
+                        }
+                    }
+                }
+            }
+        }
+        return new TextPosition(visibleChar, pos, isLeadingSpace, isTrailingSpace, isBr, collapsible);
+    }
+
+/*
+    function getPreviousPossibleCharacter(pos, transaction) {
+        var previousPos = pos, previous;
+        while ( (previousPos = previousVisiblePosition(previousPos)) ) {
+            previous = getPossibleCharacterAt(previousPos, transaction);
+            if (previous.character !== "") {
+                return previous;
+            }
+        }
+        return null;
+    }
+*/
+
+    function getNextPossibleCharacter(pos, transaction) {
+        var nextPos = pos, next;
+        while ( (nextPos = nextVisiblePosition(nextPos)) ) {
+            next = getPossibleCharacterAt(nextPos, transaction);
+            if (next.character !== "") {
+                return next;
+            }
+        }
+        return null;
+    }
+
+    function getCharacterAt(pos, transaction, precedingChars, options) {
+        var possible = getPossibleCharacterAt(pos, transaction);
+        var possibleChar = possible.character;
+        var next, preceding;
+        log.group("*** getCharacterAt got possible char '" + possibleChar + "' at position " + pos);
+        if (possibleChar) {
+            if (spacesRegex.test(possibleChar)) {
+                if (!precedingChars) {
+                    // Work backwards until we have a non-space character
+                    var previousPos = pos, previous, previousPossibleChar;
+                    precedingChars = [];
+                    while ( (previousPos = previousVisiblePosition(previousPos)) ) {
+                        previous = getPossibleCharacterAt(previousPos, transaction);
+                        previousPossibleChar = previous.character;
+                        if (previousPossibleChar !== "") {
+                            log.debug("Found preceding character '" + previousPossibleChar + "' at position " + previousPos);
+                            precedingChars.unshift(previous);
+                            if (previousPossibleChar != " " && previousPossibleChar != "\n") {
+                                break;
+                            }
+                        }
+                    }
+                }
+                preceding = precedingChars[precedingChars.length - 1];
+    
+                log.info("possible.collapsible: " + possible.collapsible + ", leading space: " + possible.isLeadingSpace + ", trailing space: " + possible.isTrailingSpace);
+                if (preceding) {
+                    log.info("preceding: '" + preceding + "' (" + preceding.position + "), possible: " + possible.position);
+                    log.info([possible.isLeadingSpace, possibleChar == "\n", [!preceding, preceding.isLeadingSpace, !dom.isOrIsAncestorOf(possible.position.node.parentNode, preceding.position.node), dom.inspectNode(possible.position.node.parentNode), dom.inspectNode(preceding.position.node)]]);
+                }
+    
+                // Disallow a collapsible space that follows a trailing space or line break, or is the first character
+                if (possibleChar === " " && possible.collapsible &&
+                        (!preceding || preceding.isTrailingSpace || preceding.character == "\n")) {
+                    log.info("Preceding character is a trailing space or non-existent or follows a line break and current possible character is a collapsible space, so space is collapsed");
+                    possible.character = "";
+                }
+    
+                // Disallow a collapsible space that is followed by a line break or is the last character
+                else if (possible.collapsible &&
+                        (!(next = getNextPossibleCharacter(pos, transaction))
+                            || (next.character == "\n" && options.collapseSpaceBeforeLineBreak && next.collapsesPrecedingSpace()))) {
+                    log.debug("Character is a space which is followed by a line break that collapses preceding spaces, or nothing, so collapsing");
+                    possible.character = "";
+                }
+    
+                // Collapse a br element that is followed by a trailing space
+                else if (possibleChar === "\n" && !possible.collapsible && (!(next = getNextPossibleCharacter(pos, transaction)) || next.isTrailingSpace)) {
+                    log.debug("Character is a br which is followed by a trailing space or nothing, collapsing");
+                    possible.character = "";
+                }
+            }
+        }
+        log.groupEnd();
+        return possible;
+    }
+
+
+    function createCharacterIterator(startPos, backward, endPos, characterOptions) {
+        log.info("createCharacterIterator called backwards " + backward + " and with endPos " + (endPos ? endPos.inspect() : ""));
+        var transaction = createTransaction(dom.getWindow(startPos.node), characterOptions);
+
+        // Adjust the end position to ensure that it is actually reached
+        if (endPos) {
+            if (backward) {
+                if (isCollapsedNode(endPos.node)) {
+                    endPos = previousVisiblePosition(endPos);
+                }
+            } else {
+                if (isCollapsedNode(endPos.node)) {
+                    endPos = nextVisiblePosition(endPos);
+                }
+            }
+        }
+        log.info("endPos now " + (endPos ? endPos.inspect() : "") + ", startPos " + startPos.inspect());
+
+        var pos = startPos, finished = false;
+
+        function next() {
+            var textPos = null;
+            if (!finished) {
+                if (!backward) {
+                    pos = nextVisiblePosition(pos);
+                }
+                if (pos) {
+                    textPos = getCharacterAt(pos, transaction, null, characterOptions);
+                    //log.debug("pos is " + pos.inspect() + ", endPos is " + (endPos ? endPos.inspect() : null) + ", equal is " + pos.equals(endPos));
+                    if (endPos && pos.equals(endPos)) {
+                        finished = true;
+                    }
+                } else {
+                    finished = true;
+                }
+                if (backward) {
+                    pos = previousVisiblePosition(pos);
+                }
+            }
+            return textPos;
+        }
+
+        var previousTextPos, returnPreviousTextPos = false;
+
+        return {
+            next: function() {
+                if (returnPreviousTextPos) {
+                    returnPreviousTextPos = false;
+                    return previousTextPos;
+                } else {
+                    var textPos;
+                    while ( (textPos = next()) ) {
+                        if (textPos.character) {
+                            previousTextPos = textPos;
+                            return textPos;
+                        }
+                    }
+                }
+            },
+
+            rewind: function() {
+                if (previousTextPos) {
+                    returnPreviousTextPos = true;
+                } else {
+                    throw module.createError("createCharacterIterator: cannot rewind. Only one position can be rewound.");
+                }
+            },
+
+            dispose: function() {
+                startPos = endPos = transaction = null;
+            }
+        };
+    }
+
+    // This function must create word and non-word tokens for the whole of the text supplied to it
+    function defaultTokenizer(chars, wordOptions) {
+        var word = chars.join(""), result, tokens = [];
+
+        function createTokenFromRange(start, end, isWord) {
+            var tokenChars = chars.slice(start, end);
+            var token = {
+                isWord: isWord,
+                chars: tokenChars,
+                toString: function() { return tokenChars.join(""); }
+            };
+            for (var i = 0, len = tokenChars.length; i < len; ++i) {
+                tokenChars[i].token = token;
+            }
+            tokens.push(token);
+        }
+
+        // Match words and mark characters
+        var lastWordEnd = 0, wordStart, wordEnd;
+        while ( (result = wordOptions.wordRegex.exec(word)) ) {
+            wordStart = result.index;
+            wordEnd = wordStart + result[0].length;
+
+            // Create token for non-word characters preceding this word
+            if (wordStart > lastWordEnd) {
+                createTokenFromRange(lastWordEnd, wordStart, false);
+            }
+
+            // Get trailing space characters for word
+            if (wordOptions.includeTrailingSpace) {
+                while (nonLineBreakWhiteSpaceRegex.test(chars[wordEnd])) {
+                    ++wordEnd;
+                }
+            }
+            createTokenFromRange(wordStart, wordEnd, true);
+            lastWordEnd = wordEnd;
+        }
+
+        // Create token for trailing non-word characters, if any exist
+        if (lastWordEnd < chars.length) {
+            createTokenFromRange(lastWordEnd, chars.length, false);
+        }
+
+        return tokens;
+    }
+
+    var arrayIndexOf = Array.prototype.indexOf ?
+        function(arr, val) {
+            return arr.indexOf(val);
+        } :
+        function(arr, val) {
+            for (var i = 0, len = arr.length; i < len; ++i) {
+                if (arr[i] === val) {
+                    return i;
+                }
+            }
+            return -1;
+        };
+
+    // Provides a pair of iterators over text positions, tokenized. Transparently requests more text when next()
+    // is called and there is no more tokenized text
+    function createTokenizedTextProvider(pos, characterOptions, wordOptions) {
+        var forwardIterator = createCharacterIterator(pos, false, null, characterOptions);
+        var backwardIterator = createCharacterIterator(pos, true, null, characterOptions);
+        var tokenizer = wordOptions.tokenizer;
+
+        // Consumes a word and the whitespace beyond it
+        function consumeWord(forward) {
+            log.debug("consumeWord called, forward is " + forward);
+            var textPos, textChar;
+            var newChars = [], it = forward ? forwardIterator : backwardIterator;
+
+            var passedWordBoundary = false, insideWord = false;
+
+            while ( (textPos = it.next()) ) {
+                textChar = textPos.character;
+
+                if (allWhiteSpaceRegex.test(textChar)) {
+                    if (insideWord) {
+                        insideWord = false;
+                        passedWordBoundary = true;
+                    }
+                } else {
+                    if (passedWordBoundary) {
+                        it.rewind();
+                        break;
+                    } else {
+                        insideWord = true;
+                    }
+                }
+                newChars.push(textPos);
+            }
+
+            log.debug("consumeWord got new chars " + newChars.join(""));
+            return newChars;
+        }
+
+        // Get initial word surrounding initial position and tokenize it
+        var forwardChars = consumeWord(true);
+        var backwardChars = consumeWord(false).reverse();
+        var tokens = tokenizer(backwardChars.concat(forwardChars), wordOptions);
+
+        // Create initial token buffers
+        var forwardTokensBuffer = forwardChars.length ?
+            tokens.slice(arrayIndexOf(tokens, forwardChars[0].token)) : [];
+
+        var backwardTokensBuffer = backwardChars.length ?
+            tokens.slice(0, arrayIndexOf(tokens, backwardChars.pop().token) + 1) : [];
+
+        function inspectBuffer(buffer) {
+            var textPositions = ["[" + buffer.length + "]"];
+            for (var i = 0; i < buffer.length; ++i) {
+                textPositions.push("(word: " + buffer[i] + ", is word: " + buffer[i].isWord + ")");
+            }
+            return textPositions;
+        }
+
+        log.info("Initial word: ", inspectBuffer(forwardTokensBuffer) + "", " and ", inspectBuffer(backwardTokensBuffer) + "", forwardChars, backwardChars);
+
+        return {
+            nextEndToken: function() {
+                var lastToken, forwardChars;
+
+                // If we're down to the last token, consume character chunks until we have a word or run out of
+                // characters to consume
+                while ( forwardTokensBuffer.length == 1 &&
+                        !(lastToken = forwardTokensBuffer[0]).isWord &&
+                        (forwardChars = consumeWord(true)).length > 0) {
+
+                    // Merge trailing non-word into next word and tokenize
+                    forwardTokensBuffer = tokenizer(lastToken.chars.concat(forwardChars), wordOptions);
+                }
+
+                return forwardTokensBuffer.shift();
+            },
+
+            previousStartToken: function() {
+                var lastToken, backwardChars;
+
+                // If we're down to the last token, consume character chunks until we have a word or run out of
+                // characters to consume
+                while ( backwardTokensBuffer.length == 1 &&
+                        !(lastToken = backwardTokensBuffer[0]).isWord &&
+                        (backwardChars = consumeWord(false)).length > 0) {
+
+                    // Merge leading non-word into next word and tokenize
+                    backwardTokensBuffer = tokenizer(backwardChars.reverse().concat(lastToken.chars), options);
+                }
+
+                return backwardTokensBuffer.pop();
+            },
+
+            dispose: function() {
+                forwardIterator.dispose();
+                backwardIterator.dispose();
+                forwardTokensBuffer = backwardTokensBuffer = null;
+            }
+        };
+    }
+
+    var defaultCharacterOptions = {
+        collapseSpaceBeforeLineBreak: true
+    };
+
+    function createOptions(optionsParam, defaults) {
+        if (!optionsParam) {
+            return defaults;
+        } else {
+            var options = {};
+            extend(options, defaults);
+            extend(options, optionsParam);
+            return options;
+        }
+    }
+    
+    var defaultWordOptions = {
+        "en": {
+            wordRegex: /[a-z0-9]+('[a-z0-9]+)*/gi,
+            includeTrailingSpace: false,
+            tokenizer: defaultTokenizer
+        }
+    };
+
+    function createWordOptions(options) {
+        var lang, defaults;
+        if (!options) {
+            return defaultWordOptions[defaultLanguage];
+        } else {
+            lang = options.language || defaultLanguage;
+            defaults = {};
+            extend(defaults, defaultWordOptions[lang] || defaultWordOptions[defaultLanguage]);
+            extend(defaults, options);
+            return defaults;
+        }
+    }
+
+    var defaultFindOptions = {
+        caseSensitive: false,
+        withinRange: null,
+        wholeWordsOnly: false,
+        wrap: false,
+        direction: "forward",
+        wordOptions: null,
+        characterOptions: null
+    };
+
+    var defaultMoveOptions = {
+        wordOptions: null,
+        characterOptions: null
+    };
+
+    var defaultExpandOptions = {
+        wordOptions: null,
+        characterOptions: null,
+        trim: false,
+        trimStart: true,
+        trimEnd: true
+    };
+
+    var defaultWordIteratorOptions = {
+        wordOptions: null,
+        characterOptions: null,
+        direction: "forward"
+    };
+
+    function movePositionBy(pos, unit, count, characterOptions, wordOptions) {
+        log.info("movePositionBy called " + count + ", pos " + pos.inspect());
+        var unitsMoved = 0, newPos = pos, textPos, charIterator, nextTextPos, newTextPos, absCount = Math.abs(count), token;
+        if (count !== 0) {
+            var backward = (count < 0);
+
+            switch (unit) {
+                case CHARACTER:
+                    charIterator = createCharacterIterator(pos, backward, null, characterOptions);
+                    while ( (textPos = charIterator.next()) && unitsMoved < absCount ) {
+                        log.info("*** movePositionBy GOT CHAR " + textPos.character + "[" + textPos.character.charCodeAt(0) + "]");
+                        ++unitsMoved;
+                        newTextPos = textPos;
+                    }
+                    nextTextPos = textPos;
+                    charIterator.dispose();
+                    break;
+                case WORD:
+                    var tokenizedTextProvider = createTokenizedTextProvider(pos, characterOptions, wordOptions);
+                    var next = backward ? tokenizedTextProvider.previousStartToken : tokenizedTextProvider.nextEndToken;
+
+                    while ( (token = next()) && unitsMoved < absCount ) {
+                        log.debug("token: " + token.chars.join(""), token.isWord);
+                        if (token.isWord) {
+                            ++unitsMoved;
+                            log.info("**** FOUND END OF WORD. unitsMoved NOW " + unitsMoved);
+                            newTextPos = backward ? token.chars[0] : token.chars[token.chars.length - 1];
+                        }
+                    }
+                    break;
+                default:
+                    throw new Error("movePositionBy: unit '" + unit + "' not implemented");
+            }
+
+            // Perform any necessary position tweaks
+            if (newTextPos) {
+                newPos = newTextPos.position;
+            }
+            if (backward) {
+                log.debug("Adjusting position. Current newPos: " + newPos);
+                newPos = previousVisiblePosition(newPos);
+                log.debug("newPos now: " + newPos);
+                unitsMoved = -unitsMoved;
+            } else if (newTextPos && newTextPos.isLeadingSpace) {
+                // Tweak the position for the case of a leading space. The problem is that an uncollapsed leading space
+                // before a block element (for example, the line break between "1" and "2" in the following HTML:
+                // "1<p>2</p>") is considered to be attached to the position immediately before the block element, which
+                // corresponds with a different selection position in most browsers from the one we want (i.e. at the
+                // start of the contents of the block element). We get round this by advancing the position returned to
+                // the last possible equivalent visible position.
+                log.info("movePositionBy ended immediately after a leading space at " + newPos);
+                if (unit == WORD) {
+                    charIterator = createCharacterIterator(pos, false, null, characterOptions);
+                    nextTextPos = charIterator.next();
+                    charIterator.dispose();
+                }
+                if (nextTextPos) {
+                    newPos = previousVisiblePosition(nextTextPos.position);
+                    log.info("movePositionBy adjusted leading space position to " + newPos);
+                }
+            }
+        }
+
+        return {
+            position: newPos,
+            unitsMoved: unitsMoved
+        };
+    }
+
+    function createRangeCharacterIterator(range, characterOptions, backward) {
+        var rangeStart = getRangeStartPosition(range), rangeEnd = getRangeEndPosition(range);
+        var itStart = backward ? rangeEnd : rangeStart, itEnd = backward ? rangeStart : rangeEnd;
+        return createCharacterIterator(itStart, !!backward, itEnd, characterOptions);
+    }
+
+    function getRangeCharacters(range, characterOptions) {
+        log.info("getRangeCharacters called on range " + range.inspect());
+
+        var chars = [], it = createRangeCharacterIterator(range, characterOptions), textPos;
+        while ( (textPos = it.next()) ) {
+            log.info("*** GOT CHAR " + textPos.character + "[" + textPos.character.charCodeAt(0) + "]");
+            chars.push(textPos);
+        }
+
+        it.dispose();
+        return chars;
+    }
+
+    function isWholeWord(startPos, endPos, wordOptions) {
+        var range = api.createRange(startPos.node);
+        range.setStart(startPos.node, startPos.offset);
+        range.setEnd(endPos.node, endPos.offset);
+        var returnVal = !range.expand("word", wordOptions);
+        return returnVal;
+    }
+
+    function findTextFromPosition(initialPos, searchTerm, isRegex, searchScopeRange, findOptions) {
+        log.debug("findTextFromPosition called with search term " + searchTerm + ", initialPos " + initialPos.inspect() + " within range " + searchScopeRange.inspect());
+        var backward = isDirectionBackward(findOptions.direction);
+        var it = createCharacterIterator(
+            initialPos,
+            backward,
+            backward ? getRangeStartPosition(searchScopeRange) : getRangeEndPosition(searchScopeRange),
+            findOptions
+        );
+        var text = "", chars = [], textPos, currentChar, matchStartIndex, matchEndIndex;
+        var result, insideRegexMatch;
+        var returnValue = null;
+
+        function handleMatch(startIndex, endIndex) {
+            var startPos = previousVisiblePosition(chars[startIndex].position);
+            var endPos = chars[endIndex - 1].position;
+            var valid = (!findOptions.wholeWordsOnly || isWholeWord(startPos, endPos, findOptions.wordOptions));
+
+            return {
+                startPos: startPos,
+                endPos: endPos,
+                valid: valid
+            };
+        }
+
+        while ( (textPos = it.next()) ) {
+            currentChar = textPos.character;
+            currentChar = textPos.character;
+            if (!isRegex && !findOptions.caseSensitive) {
+                currentChar = currentChar.toLowerCase();
+            }
+
+            if (backward) {
+                chars.unshift(textPos);
+                text = currentChar + text;
+            } else {
+                chars.push(textPos);
+                text += currentChar;
+            }
+
+            if (isRegex) {
+                result = searchTerm.exec(text);
+                if (result) {
+                    if (insideRegexMatch) {
+                        // Check whether the match is now over
+                        matchStartIndex = result.index;
+                        matchEndIndex = matchStartIndex + result[0].length;
+                        if ((!backward && matchEndIndex < text.length) || (backward && matchStartIndex > 0)) {
+                            returnValue = handleMatch(matchStartIndex, matchEndIndex);
+                            break;
+                        }
+                    } else {
+                        insideRegexMatch = true;
+                    }
+                }
+            } else if ( (matchStartIndex = text.indexOf(searchTerm)) != -1 ) {
+                returnValue = handleMatch(matchStartIndex, matchStartIndex + searchTerm.length);
+                break;
+            }
+        }
+
+        // Check whether regex match extends to the end of the range
+        if (insideRegexMatch) {
+            returnValue = handleMatch(matchStartIndex, matchEndIndex);
+        }
+        it.dispose();
+
+        return returnValue;
+    }
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    // Extensions to the rangy.dom utility object
+
+    extend(dom, {
+        nextNode: nextNode,
+        previousNode: previousNode,
+        hasInnerText: hasInnerText
+    });
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    // Extensions to the Rangy Range object
+
+    function createRangeBoundaryMover(isStart, collapse) {
+        /*
+        Unit can be "character" or "word"
+        Options:
+
+        - includeTrailingSpace
+        - wordRegex
+        - tokenizer
+        - collapseSpaceBeforeLineBreak
+        */
+        return function(unit, count, moveOptions) {
+            if (typeof count == "undefined") {
+                count = unit;
+                unit = CHARACTER;
+            }
+            moveOptions = createOptions(moveOptions, defaultMoveOptions);
+            var characterOptions = createOptions(moveOptions.characterOptions, defaultCharacterOptions);
+            var wordOptions = createWordOptions(moveOptions.wordOptions);
+            log.debug("** moving boundary. start: " + isStart + ", unit: " + unit + ", count: " + count);
+
+            var boundaryIsStart = isStart;
+            if (collapse) {
+                boundaryIsStart = (count >= 0);
+                this.collapse(!boundaryIsStart);
+            }
+            var rangePositionGetter = boundaryIsStart ? getRangeStartPosition : getRangeEndPosition;
+            var moveResult = movePositionBy(rangePositionGetter(this), unit, count, characterOptions, wordOptions);
+            var newPos = moveResult.position;
+            this[boundaryIsStart ? "setStart" : "setEnd"](newPos.node, newPos.offset);
+            return moveResult.unitsMoved;
+        };
+    }
+
+    function createRangeTrimmer(isStart) {
+        return function(characterOptions) {
+            characterOptions = createOptions(characterOptions, defaultCharacterOptions);
+            var textPos;
+            var it = createRangeCharacterIterator(this, characterOptions, !isStart);
+            var trimCharCount = 0;
+            while ( (textPos = it.next()) && allWhiteSpaceRegex.test(textPos.character) ) {
+                ++trimCharCount;
+            }
+            it.dispose();
+            var trimmed = (trimCharCount > 0);
+            if (trimmed) {
+                this[isStart ? "moveStart" : "moveEnd"](
+                    "character",
+                    isStart ? trimCharCount : -trimCharCount,
+                    { characterOptions: characterOptions }
+                );
+            }
+            return trimmed;
+        };
+    }
+    
+    extend(api.rangePrototype, {
+        moveStart: createRangeBoundaryMover(true, false),
+
+        moveEnd: createRangeBoundaryMover(false, false),
+
+        move: createRangeBoundaryMover(true, true),
+        
+        trimStart: createRangeTrimmer(true),
+
+        trimEnd: createRangeTrimmer(false),
+        
+        trim: function(characterOptions) {
+            var startTrimmed = this.trimStart(characterOptions), endTrimmed = this.trimEnd(characterOptions);
+            return startTrimmed || endTrimmed;
+        },
+
+        expand: function(unit, expandOptions) {
+            var moved = false;
+            expandOptions = createOptions(expandOptions, defaultExpandOptions);
+            var characterOptions = createOptions(expandOptions.characterOptions, defaultCharacterOptions);
+            if (!unit) {
+                unit = CHARACTER;
+            }
+            if (unit == WORD) {
+                var wordOptions = createWordOptions(expandOptions.wordOptions);
+                var startPos = getRangeStartPosition(this);
+                var endPos = getRangeEndPosition(this);
+
+                var startTokenizedTextProvider = createTokenizedTextProvider(startPos, characterOptions, wordOptions);
+                var startToken = startTokenizedTextProvider.nextEndToken();
+                var newStartPos = previousVisiblePosition(startToken.chars[0].position);
+                var endToken, newEndPos;
+
+                if (this.collapsed) {
+                    endToken = startToken;
+                } else {
+                    var endTokenizedTextProvider = createTokenizedTextProvider(endPos, characterOptions, wordOptions);
+                    endToken = endTokenizedTextProvider.previousStartToken();
+                }
+                newEndPos = endToken.chars[endToken.chars.length - 1].position;
+
+                if (!newStartPos.equals(startPos)) {
+                    this.setStart(newStartPos.node, newStartPos.offset);
+                    moved = true;
+                }
+                if (!newEndPos.equals(endPos)) {
+                    this.setEnd(newEndPos.node, newEndPos.offset);
+                    moved = true;
+                }
+
+                if (expandOptions.trim) {
+                    if (expandOptions.trimStart) {
+                        moved = this.trimStart(characterOptions) || moved;
+                    }
+                    if (expandOptions.trimEnd) {
+                        moved = this.trimEnd(characterOptions) || moved;
+                    }
+                }
+                
+                return moved;
+            } else {
+                return this.moveEnd(CHARACTER, 1, expandOptions);
+            }
+        },
+
+        text: function(characterOptions) {
+            return this.collapsed ?
+                "" : getRangeCharacters(this, createOptions(characterOptions, defaultCharacterOptions)).join("");
+        },
+
+        selectCharacters: function(containerNode, startIndex, endIndex, characterOptions) {
+            var moveOptions = { characterOptions: characterOptions };
+            this.selectNodeContents(containerNode);
+            this.collapse(true);
+            this.moveStart("character", startIndex, moveOptions);
+            this.collapse(true);
+            this.moveEnd("character", endIndex - startIndex, moveOptions);
+        },
+
+        // Character indexes are relative to the start of node
+        toCharacterRange: function(containerNode, characterOptions) {
+            if (!containerNode) {
+                containerNode = document.body;
+            }
+            var parent = containerNode.parentNode, nodeIndex = dom.getNodeIndex(containerNode);
+            var rangeStartsBeforeNode = (dom.comparePoints(this.startContainer, this.endContainer, parent, nodeIndex) == -1);
+            var rangeBetween = this.cloneRange();
+            var startIndex, endIndex;
+            if (rangeStartsBeforeNode) {
+                rangeBetween.setStart(this.startContainer, this.startOffset);
+                rangeBetween.setEnd(parent, nodeIndex);
+                startIndex = -rangeBetween.text(characterOptions).length;
+            } else {
+                rangeBetween.setStart(parent, nodeIndex);
+                rangeBetween.setEnd(this.startContainer, this.startOffset);
+                startIndex = rangeBetween.text(characterOptions).length;
+            }
+            endIndex = startIndex + this.text(characterOptions).length;
+
+            return {
+                start: startIndex,
+                end: endIndex
+            };
+        },
+
+        findText: function(searchTermParam, findOptions) {
+            // Set up options
+            findOptions = createOptions(findOptions, defaultFindOptions);
+
+            // Create word options if we're matching whole words only
+            if (findOptions.wholeWordsOnly) {
+                findOptions.wordOptions = createWordOptions(findOptions.wordOptions);
+
+                // We don't ever want trailing spaces for search results
+                findOptions.wordOptions.includeTrailingSpace = false;
+            }
+
+            var backward = isDirectionBackward(findOptions.direction);
+
+            // Create a range representing the search scope if none was provided
+            var searchScopeRange = findOptions.withinRange;
+            if (!searchScopeRange) {
+                searchScopeRange = api.createRange();
+                searchScopeRange.selectNodeContents(this.getDocument());
+            }
+
+            // Examine and prepare the search term
+            var searchTerm = searchTermParam, isRegex = false;
+            if (typeof searchTerm == "string") {
+                if (!findOptions.caseSensitive) {
+                    searchTerm = searchTerm.toLowerCase();
+                }
+            } else {
+                isRegex = true;
+            }
+
+            var initialPos = backward ? getRangeEndPosition(this) : getRangeStartPosition(this);
+
+            // Adjust initial position if it lies outside the search scope
+            var comparison = searchScopeRange.comparePoint(initialPos.node, initialPos.offset);
+            if (comparison === -1) {
+                initialPos = getRangeStartPosition(searchScopeRange);
+            } else if (comparison === 1) {
+                initialPos = getRangeEndPosition(searchScopeRange);
+            }
+
+            var pos = initialPos;
+            var wrappedAround = false;
+
+            // Try to find a match and ignore invalid ones
+            var findResult;
+            while (true) {
+                findResult = findTextFromPosition(pos, searchTerm, isRegex, searchScopeRange, findOptions);
+
+                if (findResult) {
+                    if (findResult.valid) {
+                        this.setStart(findResult.startPos.node, findResult.startPos.offset);
+                        this.setEnd(findResult.endPos.node, findResult.endPos.offset);
+                        return true;
+                    } else {
+                        // We've found a match that is not a whole word, so we carry on searching from the point immediately
+                        // after the match
+                        pos = backward ? findResult.startPos : findResult.endPos;
+                    }
+                } else if (findOptions.wrap && !wrappedAround) {
+                    // No result found but we're wrapping around and limiting the scope to the unsearched part of the range
+                    searchScopeRange = searchScopeRange.cloneRange();
+                    if (backward) {
+                        pos = getRangeEndPosition(searchScopeRange);
+                        searchScopeRange.setStart(initialPos.node, initialPos.offset);
+                    } else {
+                        pos = getRangeStartPosition(searchScopeRange);
+                        searchScopeRange.setEnd(initialPos.node, initialPos.offset);
+                    }
+                    log.debug("Wrapping search. New search range is " + searchScopeRange.inspect());
+                    wrappedAround = true;
+                } else {
+                    // Nothing found and we can't wrap around, so we're done
+                    return false;
+                }
+            }
+        },
+
+        pasteHtml: function(html) {
+            this.deleteContents();
+            if (html) {
+                var frag = this.createContextualFragment(html);
+                var lastChild = frag.lastChild;
+                this.insertNode(frag);
+                this.collapseAfter(lastChild);
+            }
+        }
+    });
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    // Extensions to the Rangy Selection object
+    
+    function createSelectionTrimmer(methodName) {
+        return function(characterOptions) {
+            var trimmed = false;
+            this.changeEachRange(function(range) {
+                trimmed = range[methodName](characterOptions) || trimmed;
+            });
+            return trimmed;
+        }
+    }
+
+    extend(api.selectionPrototype, {
+        expand: function(unit, expandOptions) {
+            this.changeEachRange(function(range) {
+                range.expand(unit, expandOptions);
+            });
+        },
+
+        move: function(unit, count, options) {
+            if (this.focusNode) {
+                this.collapse(this.focusNode, this.focusOffset);
+                var range = this.getRangeAt(0);
+                range.move(unit, count, options);
+                this.setSingleRange(range);
+            }
+        },
+        
+        trimStart: createSelectionTrimmer("trimStart"),
+        trimEnd: createSelectionTrimmer("trimEnd"),
+        trim: createSelectionTrimmer("trim"),
+
+        selectCharacters: function(containerNode, startIndex, endIndex, direction, characterOptions) {
+            var range = api.createRange(containerNode);
+            range.selectCharacters(containerNode, startIndex, endIndex, characterOptions);
+            this.setSingleRange(range, direction);
+        },
+
+        saveCharacterRanges: function(containerNode, characterOptions) {
+            var ranges = this.getAllRanges(), rangeCount = ranges.length;
+            var characterRanges = [];
+
+            var backward = rangeCount == 1 && this.isBackward();
+
+            for (var i = 0, len = ranges.length; i < len; ++i) {
+                characterRanges[i] = {
+                    range: ranges[i].toCharacterRange(containerNode, characterOptions),
+                    backward: backward,
+                    characterOptions: characterOptions
+                };
+            }
+
+            return characterRanges;
+        },
+
+        restoreCharacterRanges: function(containerNode, characterRanges) {
+            this.removeAllRanges();
+            for (var i = 0, len = characterRanges.length, range, characterRange; i < len; ++i) {
+                characterRange = characterRanges[i];
+                range = api.createRange(containerNode);
+                range.selectCharacters(containerNode, characterRange.range.start, characterRange.range.end, characterRange.characterOptions);
+                this.addRange(range, characterRange.backward);
+            }
+        },
+
+        text: function(characterOptions) {
+            var rangeTexts = [];
+            for (var i = 0, len = this.rangeCount; i < len; ++i) {
+                rangeTexts[i] = this.getRangeAt(i).text(characterOptions);
+            }
+            return rangeTexts.join("");
+        }
+    });
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    // Extensions to the core rangy object
+
+    api.innerText = function(el, characterOptions) {
+        var range = api.createRange(el);
+        range.selectNodeContents(el);
+        var text = range.text(characterOptions);
+        log.debug("innerText is '" + text.replace(/\s/g, function(matched) { return "[" + matched.charCodeAt(0) + "]"; }) + "'");
+        return text;
+    };
+
+    api.createWordIterator = function(startNode, startOffset, iteratorOptions) {
+        iteratorOptions = createOptions(iteratorOptions, defaultWordIteratorOptions);
+        characterOptions = createOptions(iteratorOptions.characterOptions, defaultCharacterOptions);
+        wordOptions = createWordOptions(iteratorOptions.wordOptions);
+        var startPos = new DomPosition(startNode, startOffset);
+        var tokenizedTextProvider = createTokenizedTextProvider(startPos, characterOptions, wordOptions);
+        var backward = isDirectionBackward(iteratorOptions.direction);
+
+        return {
+            next: function() {
+                return backward ? tokenizedTextProvider.previousStartToken() : tokenizedTextProvider.nextEndToken();
+            },
+
+            dispose: function() {
+                tokenizedTextProvider.dispose();
+                this.next = function() {};
+            }
+        };
+    };
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    api.textRange = {
+        isBlockNode: isBlockNode,
+        isCollapsedWhitespaceNode: isCollapsedWhitespaceNode,
+        nextPosition: nextPosition,
+        previousPosition: previousPosition,
+        nextVisiblePosition: nextVisiblePosition,
+        previousVisiblePosition: previousVisiblePosition
+    };
+
+});
diff --git a/src/js/modules/rangy-textrange.js b/src/modules/rangy-textrange.js
similarity index 97%
rename from src/js/modules/rangy-textrange.js
rename to src/modules/rangy-textrange.js
index db08d929..70e45b5c 100644
--- a/src/js/modules/rangy-textrange.js
+++ b/src/modules/rangy-textrange.js
@@ -1,1991 +1,1991 @@
-/**
- * Text range module for Rangy.
- * Text-based manipulation and searching of ranges and selections.
- *
- * Features
- *
- * - Ability to move range boundaries by character or word offsets
- * - Customizable word tokenizer
- * - Ignores text nodes inside <script> or <style> elements or those hidden by CSS display and visibility properties
- * - Range findText method to search for text or regex within the page or within a range. Flags for whole words and case
- *   sensitivity
- * - Selection and range save/restore as text offsets within a node
- * - Methods to return visible text within a range or selection
- * - innerText method for elements
- *
- * References
- *
- * https://www.w3.org/Bugs/Public/show_bug.cgi?id=13145
- * http://aryeh.name/spec/innertext/innertext.html
- * http://dvcs.w3.org/hg/editing/raw-file/tip/editing.html
- *
- * Part of Rangy, a cross-browser JavaScript range and selection library
- * http://code.google.com/p/rangy/
- *
- * Depends on Rangy core.
- *
- * Copyright %%build:year%%, Tim Down
- * Licensed under the MIT license.
- * Version: %%build:version%%
- * Build date: %%build:date%%
- */
-
-/**
- * Problem: handling of trailing spaces before line breaks is handled inconsistently between browsers.
- *
- * First, a <br>: this is relatively simple. For the following HTML:
- *
- * 1 <br>2
- *
- * - IE and WebKit render the space, include it in the selection (i.e. when the content is selected and pasted into a
- *   textarea, the space is present) and allow the caret to be placed after it.
- * - Firefox does not acknowledge the space in the selection but it is possible to place the caret after it.
- * - Opera does not render the space but has two separate caret positions on either side of the space (left and right
- *   arrow keys show this) and includes the space in the selection.
- *
- * The other case is the line break or breaks implied by block elements. For the following HTML:
- *
- * <p>1 </p><p>2<p>
- *
- * - WebKit does not acknowledge the space in any way
- * - Firefox, IE and Opera as per <br>
- *
- * One more case is trailing spaces before line breaks in elements with white-space: pre-line. For the following HTML:
- *
- * <p style="white-space: pre-line">1
- * 2</p>
- *
- * - Firefox and WebKit include the space in caret positions
- * - IE does not support pre-line up to and including version 9
- * - Opera ignores the space
- * - Trailing space only renders if there is a non-collapsed character in the line
- *
- * Problem is whether Rangy should ever acknowledge the space and if so, when. Another problem is whether this can be
- * feature-tested
- */
-/* build:modularizeWithDependencies(["./rangy-core"]) */
-rangy.createModule("TextRange", ["WrappedSelection"], function(api, module) {
-    var UNDEF = "undefined";
-    var CHARACTER = "character", WORD = "word";
-    var dom = api.dom, util = api.util;
-    var extend = util.extend;
-    var createOptions = util.createOptions;
-    var getBody = dom.getBody;
-
-    var log = log4javascript.getLogger("rangy.textrange");
-
-    var spacesRegex = /^[ \t\f\r\n]+$/;
-    var spacesMinusLineBreaksRegex = /^[ \t\f\r]+$/;
-    var allWhiteSpaceRegex = /^[\t-\r \u0085\u00A0\u1680\u180E\u2000-\u200B\u2028\u2029\u202F\u205F\u3000]+$/;
-    var nonLineBreakWhiteSpaceRegex = /^[\t \u00A0\u1680\u180E\u2000-\u200B\u202F\u205F\u3000]+$/;
-    var lineBreakRegex = /^[\n-\r\u0085\u2028\u2029]$/;
-
-    var defaultLanguage = "en";
-
-    var isDirectionBackward = api.Selection.isDirectionBackward;
-
-    // Properties representing whether trailing spaces inside blocks are completely collapsed (as they are in WebKit,
-    // but not other browsers). Also test whether trailing spaces before <br> elements are collapsed.
-    var trailingSpaceInBlockCollapses = false;
-    var trailingSpaceBeforeBrCollapses = false;
-    var trailingSpaceBeforeBlockCollapses = false;
-    var trailingSpaceBeforeLineBreakInPreLineCollapses = true;
-
-    (function() {
-        var el = document.createElement("div");
-        el.contentEditable = "true";
-        el.innerHTML = "<p>1 </p><p></p>";
-        var body = getBody(document);
-        var p = el.firstChild;
-        var sel = api.getSelection();
-
-        body.appendChild(el);
-        sel.collapse(p.lastChild, 2);
-        sel.setStart(p.firstChild, 0);
-        trailingSpaceInBlockCollapses = ("" + sel).length == 1;
-
-        el.innerHTML = "1 <br>";
-        sel.collapse(el, 2);
-        sel.setStart(el.firstChild, 0);
-        trailingSpaceBeforeBrCollapses = ("" + sel).length == 1;
-
-        el.innerHTML = "1 <p>1</p>";
-        sel.collapse(el, 2);
-        sel.setStart(el.firstChild, 0);
-        trailingSpaceBeforeBlockCollapses = ("" + sel).length == 1;
-
-        body.removeChild(el);
-        sel.removeAllRanges();
-    })();
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    // This function must create word and non-word tokens for the whole of the text supplied to it
-    function defaultTokenizer(chars, wordOptions) {
-        var word = chars.join(""), result, tokens = [];
-
-        function createTokenFromRange(start, end, isWord) {
-            var tokenChars = chars.slice(start, end);
-            var token = {
-                isWord: isWord,
-                chars: tokenChars,
-                toString: function() {
-                    return tokenChars.join("");
-                }
-            };
-            for (var i = 0, len = tokenChars.length; i < len; ++i) {
-                tokenChars[i].token = token;
-            }
-            tokens.push(token);
-        }
-
-        // Match words and mark characters
-        var lastWordEnd = 0, wordStart, wordEnd;
-        while ( (result = wordOptions.wordRegex.exec(word)) ) {
-            wordStart = result.index;
-            wordEnd = wordStart + result[0].length;
-
-            // Create token for non-word characters preceding this word
-            if (wordStart > lastWordEnd) {
-                createTokenFromRange(lastWordEnd, wordStart, false);
-            }
-
-            // Get trailing space characters for word
-            if (wordOptions.includeTrailingSpace) {
-                while (nonLineBreakWhiteSpaceRegex.test(chars[wordEnd])) {
-                    ++wordEnd;
-                }
-            }
-            createTokenFromRange(wordStart, wordEnd, true);
-            lastWordEnd = wordEnd;
-        }
-
-        // Create token for trailing non-word characters, if any exist
-        if (lastWordEnd < chars.length) {
-            createTokenFromRange(lastWordEnd, chars.length, false);
-        }
-
-        return tokens;
-    }
-
-    var defaultCharacterOptions = {
-        includeBlockContentTrailingSpace: true,
-        includeSpaceBeforeBr: true,
-        includeSpaceBeforeBlock: true,
-        includePreLineTrailingSpace: true
-    };
-
-    var defaultCaretCharacterOptions = {
-        includeBlockContentTrailingSpace: !trailingSpaceBeforeLineBreakInPreLineCollapses,
-        includeSpaceBeforeBr: !trailingSpaceBeforeBrCollapses,
-        includeSpaceBeforeBlock: !trailingSpaceBeforeBlockCollapses,
-        includePreLineTrailingSpace: true
-    };
-    
-    var defaultWordOptions = {
-        "en": {
-            wordRegex: /[a-z0-9]+('[a-z0-9]+)*/gi,
-            includeTrailingSpace: false,
-            tokenizer: defaultTokenizer
-        }
-    };
-
-    var defaultFindOptions = {
-        caseSensitive: false,
-        withinRange: null,
-        wholeWordsOnly: false,
-        wrap: false,
-        direction: "forward",
-        wordOptions: null,
-        characterOptions: null
-    };
-
-    var defaultMoveOptions = {
-        wordOptions: null,
-        characterOptions: null
-    };
-
-    var defaultExpandOptions = {
-        wordOptions: null,
-        characterOptions: null,
-        trim: false,
-        trimStart: true,
-        trimEnd: true
-    };
-
-    var defaultWordIteratorOptions = {
-        wordOptions: null,
-        characterOptions: null,
-        direction: "forward"
-    };
-
-    function createWordOptions(options) {
-        var lang, defaults;
-        if (!options) {
-            return defaultWordOptions[defaultLanguage];
-        } else {
-            lang = options.language || defaultLanguage;
-            defaults = {};
-            extend(defaults, defaultWordOptions[lang] || defaultWordOptions[defaultLanguage]);
-            extend(defaults, options);
-            return defaults;
-        }
-    }
-
-    function createCharacterOptions(options) {
-        return createOptions(options, defaultCharacterOptions);
-    }
-
-    function createCaretCharacterOptions(options) {
-        return createOptions(options, defaultCaretCharacterOptions);
-    }
-
-    function createFindOptions(optionsParam) {
-        var options = createOptions(optionsParam, defaultFindOptions);
-        options.characterOptions = createCharacterOptions(options.wordOptions);
-        return options;
-    }
-    
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    /* DOM utility functions */
-    var getComputedStyleProperty = dom.getComputedStyleProperty;
-
-    // Create cachable versions of DOM functions
-
-    // Test for old IE's incorrect display properties
-    var tableCssDisplayBlock;
-    (function() {
-        var table = document.createElement("table");
-        var body = getBody(document);
-        body.appendChild(table);
-        tableCssDisplayBlock = (getComputedStyleProperty(table, "display") == "block");
-        body.removeChild(table);
-    })();
-
-    api.features.tableCssDisplayBlock = tableCssDisplayBlock;
-
-    var defaultDisplayValueForTag = {
-        table: "table",
-        caption: "table-caption",
-        colgroup: "table-column-group",
-        col: "table-column",
-        thead: "table-header-group",
-        tbody: "table-row-group",
-        tfoot: "table-footer-group",
-        tr: "table-row",
-        td: "table-cell",
-        th: "table-cell"
-    };
-
-    // Corrects IE's "block" value for table-related elements
-    function getComputedDisplay(el, win) {
-        var display = getComputedStyleProperty(el, "display", win);
-        var tagName = el.tagName.toLowerCase();
-        return (display == "block" &&
-                tableCssDisplayBlock &&
-                defaultDisplayValueForTag.hasOwnProperty(tagName)) ?
-            defaultDisplayValueForTag[tagName] : display;
-    }
-
-    function isHidden(node) {
-        var ancestors = getAncestorsAndSelf(node);
-        for (var i = 0, len = ancestors.length; i < len; ++i) {
-            if (ancestors[i].nodeType == 1 && getComputedDisplay(ancestors[i]) == "none") {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    function isVisibilityHiddenTextNode(textNode) {
-        var el;
-        return textNode.nodeType == 3 &&
-            (el = textNode.parentNode) &&
-            getComputedStyleProperty(el, "visibility") == "hidden";
-    }
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-
-    // "A block node is either an Element whose "display" property does not have
-    // resolved value "inline" or "inline-block" or "inline-table" or "none", or a
-    // Document, or a DocumentFragment."
-    function isBlockNode(node) {
-        return node &&
-            ((node.nodeType == 1 && !/^(inline(-block|-table)?|none)$/.test(getComputedDisplay(node))) ||
-            node.nodeType == 9 || node.nodeType == 11);
-    }
-
-    function getLastDescendantOrSelf(node) {
-        var lastChild = node.lastChild;
-        return lastChild ? getLastDescendantOrSelf(lastChild) : node;
-    }
-
-    function containsPositions(node) {
-        return dom.isCharacterDataNode(node) ||
-            !/^(area|base|basefont|br|col|frame|hr|img|input|isindex|link|meta|param)$/i.test(node.nodeName);
-    }
-
-    function getAncestors(node) {
-        var ancestors = [];
-        while (node.parentNode) {
-            ancestors.unshift(node.parentNode);
-            node = node.parentNode;
-        }
-        return ancestors;
-    }
-
-    function getAncestorsAndSelf(node) {
-        return getAncestors(node).concat([node]);
-    }
-
-    function nextNodeDescendants(node) {
-        while (node && !node.nextSibling) {
-            node = node.parentNode;
-        }
-        if (!node) {
-            return null;
-        }
-        return node.nextSibling;
-    }
-
-    function nextNode(node, excludeChildren) {
-        if (!excludeChildren && node.hasChildNodes()) {
-            return node.firstChild;
-        }
-        return nextNodeDescendants(node);
-    }
-
-    function previousNode(node) {
-        var previous = node.previousSibling;
-        if (previous) {
-            node = previous;
-            while (node.hasChildNodes()) {
-                node = node.lastChild;
-            }
-            return node;
-        }
-        var parent = node.parentNode;
-        if (parent && parent.nodeType == 1) {
-            return parent;
-        }
-        return null;
-    }
-
-    // Adpated from Aryeh's code.
-    // "A whitespace node is either a Text node whose data is the empty string; or
-    // a Text node whose data consists only of one or more tabs (0x0009), line
-    // feeds (0x000A), carriage returns (0x000D), and/or spaces (0x0020), and whose
-    // parent is an Element whose resolved value for "white-space" is "normal" or
-    // "nowrap"; or a Text node whose data consists only of one or more tabs
-    // (0x0009), carriage returns (0x000D), and/or spaces (0x0020), and whose
-    // parent is an Element whose resolved value for "white-space" is "pre-line"."
-    function isWhitespaceNode(node) {
-        if (!node || node.nodeType != 3) {
-            return false;
-        }
-        var text = node.data;
-        if (text === "") {
-            return true;
-        }
-        var parent = node.parentNode;
-        if (!parent || parent.nodeType != 1) {
-            return false;
-        }
-        var computedWhiteSpace = getComputedStyleProperty(node.parentNode, "whiteSpace");
-
-        return (/^[\t\n\r ]+$/.test(text) && /^(normal|nowrap)$/.test(computedWhiteSpace)) ||
-            (/^[\t\r ]+$/.test(text) && computedWhiteSpace == "pre-line");
-    }
-
-    // Adpated from Aryeh's code.
-    // "node is a collapsed whitespace node if the following algorithm returns
-    // true:"
-    function isCollapsedWhitespaceNode(node) {
-        // "If node's data is the empty string, return true."
-        if (node.data === "") {
-            return true;
-        }
-
-        // "If node is not a whitespace node, return false."
-        if (!isWhitespaceNode(node)) {
-            return false;
-        }
-
-        // "Let ancestor be node's parent."
-        var ancestor = node.parentNode;
-
-        // "If ancestor is null, return true."
-        if (!ancestor) {
-            return true;
-        }
-
-        // "If the "display" property of some ancestor of node has resolved value "none", return true."
-        if (isHidden(node)) {
-            return true;
-        }
-
-        return false;
-    }
-
-    function isCollapsedNode(node) {
-        var type = node.nodeType;
-        //log.debug("isCollapsedNode", isHidden(node), /^(script|style)$/i.test(node.nodeName), isCollapsedWhitespaceNode(node));
-        return type == 7 /* PROCESSING_INSTRUCTION */ ||
-            type == 8 /* COMMENT */ ||
-            isHidden(node) ||
-            /^(script|style)$/i.test(node.nodeName) ||
-            isVisibilityHiddenTextNode(node) ||
-            isCollapsedWhitespaceNode(node);
-    }
-
-    function isIgnoredNode(node, win) {
-        var type = node.nodeType;
-        return type == 7 /* PROCESSING_INSTRUCTION */ ||
-            type == 8 /* COMMENT */ ||
-            (type == 1 && getComputedDisplay(node, win) == "none");
-    }
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    // Possibly overengineered caching system to prevent repeated DOM calls slowing everything down
-
-    function Cache() {
-        this.store = {};
-    }
-
-    Cache.prototype = {
-        get: function(key) {
-            return this.store.hasOwnProperty(key) ? this.store[key] : null;
-        },
-
-        set: function(key, value) {
-            return this.store[key] = value;
-        }
-    };
-
-    var cachedCount = 0, uncachedCount = 0;
-    
-    function createCachingGetter(methodName, func, objProperty) {
-        return function(args) {
-            var cache = this.cache;
-            if (cache.hasOwnProperty(methodName)) {
-                cachedCount++;
-                return cache[methodName];
-            } else {
-                uncachedCount++;
-                var value = func.call(this, objProperty ? this[objProperty] : this, args);
-                cache[methodName] = value;
-                return value;
-            }
-        };
-    }
-    
-/*
-    api.report = function() {
-        console.log("Cached: " + cachedCount + ", uncached: " + uncachedCount);
-    };
-*/
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    function NodeWrapper(node, session) {
-        this.node = node;
-        this.session = session;
-        this.cache = new Cache();
-        this.positions = new Cache();
-    }
-
-    var nodeProto = {
-        getPosition: function(offset) {
-            var positions = this.positions;
-            return positions.get(offset) || positions.set(offset, new Position(this, offset));
-        },
-
-        toString: function() {
-            return "[NodeWrapper(" + dom.inspectNode(this.node) + ")]";
-        }
-    };
-
-    NodeWrapper.prototype = nodeProto;
-
-    var EMPTY = "EMPTY",
-        NON_SPACE = "NON_SPACE",
-        UNCOLLAPSIBLE_SPACE = "UNCOLLAPSIBLE_SPACE",
-        COLLAPSIBLE_SPACE = "COLLAPSIBLE_SPACE",
-        TRAILING_SPACE_BEFORE_BLOCK = "TRAILING_SPACE_BEFORE_BLOCK",
-        TRAILING_SPACE_IN_BLOCK = "TRAILING_SPACE_IN_BLOCK",
-        TRAILING_SPACE_BEFORE_BR = "TRAILING_SPACE_BEFORE_BR",
-        PRE_LINE_TRAILING_SPACE_BEFORE_LINE_BREAK = "PRE_LINE_TRAILING_SPACE_BEFORE_LINE_BREAK",
-        TRAILING_LINE_BREAK_AFTER_BR = "TRAILING_LINE_BREAK_AFTER_BR";
-
-    extend(nodeProto, {
-        isCharacterDataNode: createCachingGetter("isCharacterDataNode", dom.isCharacterDataNode, "node"),
-        getNodeIndex: createCachingGetter("nodeIndex", dom.getNodeIndex, "node"),
-        getLength: createCachingGetter("nodeLength", dom.getNodeLength, "node"),
-        containsPositions: createCachingGetter("containsPositions", containsPositions, "node"),
-        isWhitespace: createCachingGetter("isWhitespace", isWhitespaceNode, "node"),
-        isCollapsedWhitespace: createCachingGetter("isCollapsedWhitespace", isCollapsedWhitespaceNode, "node"),
-        getComputedDisplay: createCachingGetter("computedDisplay", getComputedDisplay, "node"),
-        isCollapsed: createCachingGetter("collapsed", isCollapsedNode, "node"),
-        isIgnored: createCachingGetter("ignored", isIgnoredNode, "node"),
-        next: createCachingGetter("nextPos", nextNode, "node"),
-        previous: createCachingGetter("previous", previousNode, "node"),
-
-        getTextNodeInfo: createCachingGetter("textNodeInfo", function(textNode) {
-            log.debug("getTextNodeInfo for " + textNode.data);
-            var spaceRegex = null, collapseSpaces = false;
-            var cssWhitespace = getComputedStyleProperty(textNode.parentNode, "whiteSpace");
-            var preLine = (cssWhitespace == "pre-line");
-            if (preLine) {
-                spaceRegex = spacesMinusLineBreaksRegex;
-                collapseSpaces = true;
-            } else if (cssWhitespace == "normal" || cssWhitespace == "nowrap") {
-                spaceRegex = spacesRegex;
-                collapseSpaces = true;
-            }
-
-            return {
-                node: textNode,
-                text: textNode.data,
-                spaceRegex: spaceRegex,
-                collapseSpaces: collapseSpaces,
-                preLine: preLine
-            };
-        }, "node"),
-
-        hasInnerText: createCachingGetter("hasInnerText", function(el, backward) {
-            var session = this.session;
-            var posAfterEl = session.getPosition(el.parentNode, this.getNodeIndex() + 1);
-            var firstPosInEl = session.getPosition(el, 0);
-
-            var pos = backward ? posAfterEl : firstPosInEl;
-            var endPos = backward ? firstPosInEl : posAfterEl;
-
-            /*
-             <body><p>X  </p><p>Y</p></body>
-
-             Positions:
-
-             body:0:""
-             p:0:""
-             text:0:""
-             text:1:"X"
-             text:2:TRAILING_SPACE_IN_BLOCK
-             text:3:COLLAPSED_SPACE
-             p:1:""
-             body:1:"\n"
-             p:0:""
-             text:0:""
-             text:1:"Y"
-
-             A character is a TRAILING_SPACE_IN_BLOCK iff:
-
-             - There is no uncollapsed character after it within the visible containing block element
-
-             A character is a TRAILING_SPACE_BEFORE_BR iff:
-
-             - There is no uncollapsed character after it preceding a <br> element
-
-             An element has inner text iff
-
-             - It is not hidden
-             - It contains an uncollapsed character
-
-             All trailing spaces (pre-line, before <br>, end of block) require definite non-empty characters to render.
-             */
-
-            while (pos !== endPos) {
-                pos.prepopulateChar();
-                if (pos.isDefinitelyNonEmpty()) {
-                    return true;
-                }
-                pos = backward ? pos.previousVisible() : pos.nextVisible();
-            }
-
-            return false;
-        }, "node"),
-        
-        isRenderedBlock: createCachingGetter("isRenderedBlock", function(el) {
-            // Ensure that a block element containing a <br> is considered to have inner text 
-            var brs = el.getElementsByTagName("br");
-            for (var i = 0, len = brs.length; i < len; ++i) {
-                if (!isCollapsedNode(brs[i])) {
-                    return true;
-                }
-            }
-            return this.hasInnerText();
-        }, "node"),
-
-        getTrailingSpace: createCachingGetter("trailingSpace", function(el) {
-            if (el.tagName.toLowerCase() == "br") {
-                return "";
-            } else {
-                switch (this.getComputedDisplay()) {
-                    case "inline":
-                        var child = el.lastChild;
-                        while (child) {
-                            if (!isIgnoredNode(child)) {
-                                return (child.nodeType == 1) ? this.session.getNodeWrapper(child).getTrailingSpace() : "";
-                            }
-                            child = child.previousSibling;
-                        }
-                        break;
-                    case "inline-block":
-                    case "inline-table":
-                    case "none":
-                    case "table-column":
-                    case "table-column-group":
-                        break;
-                    case "table-cell":
-                        return "\t";
-                    default:
-                        return this.isRenderedBlock(true) ? "\n" : "";
-                }
-            }
-            return "";
-        }, "node"),
-
-        getLeadingSpace: createCachingGetter("leadingSpace", function(el) {
-            switch (this.getComputedDisplay()) {
-                case "inline":
-                case "inline-block":
-                case "inline-table":
-                case "none":
-                case "table-column":
-                case "table-column-group":
-                case "table-cell":
-                    break;
-                default:
-                    return this.isRenderedBlock(false) ? "\n" : "";
-            }
-            return "";
-        }, "node")
-    });
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-
-    function Position(nodeWrapper, offset) {
-        this.offset = offset;
-        this.nodeWrapper = nodeWrapper;
-        this.node = nodeWrapper.node;
-        this.session = nodeWrapper.session;
-        this.cache = new Cache();
-    }
-
-    function inspectPosition() {
-        return "[Position(" + dom.inspectNode(this.node) + ":" + this.offset + ")]";
-    }
-
-    var positionProto = {
-        character: "",
-        characterType: EMPTY,
-        isBr: false,
-
-        /*
-        This method:
-        - Fully populates positions that have characters that can be determined independently of any other characters.
-        - Populates most types of space positions with a provisional character. The character is finalized later.
-         */
-        prepopulateChar: function() {
-            var pos = this;
-            if (!pos.prepopulatedChar) {
-                var node = pos.node, offset = pos.offset;
-                log.debug("prepopulateChar " + pos.inspect());
-                var visibleChar = "", charType = EMPTY;
-                var finalizedChar = false;
-                if (offset > 0) {
-                    if (node.nodeType == 3) {
-                        var text = node.data;
-                        var textChar = text.charAt(offset - 1);
-                        log.debug("Got char '" + textChar + "' in data '" + text + "'");
-
-                        var nodeInfo = pos.nodeWrapper.getTextNodeInfo();
-                        var spaceRegex = nodeInfo.spaceRegex;
-                        if (nodeInfo.collapseSpaces) {
-                            if (spaceRegex.test(textChar)) {
-                                // "If the character at position is from set, append a single space (U+0020) to newdata and advance
-                                // position until the character at position is not from set."
-
-                                // We also need to check for the case where we're in a pre-line and we have a space preceding a
-                                // line break, because such spaces are collapsed in some browsers
-                                if (offset > 1 && spaceRegex.test(text.charAt(offset - 2))) {
-                                    log.debug("Character is a collapsible space preceded by another collapsible space, therefore empty");
-                                } else if (nodeInfo.preLine && text.charAt(offset) === "\n") {
-                                    log.debug("Character is a collapsible space which is followed by a line break in a pre-line element, skipping");
-                                    visibleChar = " ";
-                                    charType = PRE_LINE_TRAILING_SPACE_BEFORE_LINE_BREAK;
-                                } else {
-                                    log.debug("Character is a collapsible space not preceded by another collapsible space, including but will need to check for whether it precedes a <br> or end of a block");
-                                    visibleChar = " ";
-                                    //pos.checkForFollowingLineBreak = true;
-                                    charType = COLLAPSIBLE_SPACE;
-                                }
-                            } else {
-                                log.debug("Character is not a space, adding");
-                                visibleChar = textChar;
-                                charType = NON_SPACE;
-                                finalizedChar = true;
-                            }
-                        } else {
-                            log.debug("Spaces are not collapsible, so adding");
-                            visibleChar = textChar;
-                            charType = UNCOLLAPSIBLE_SPACE;
-                            finalizedChar = true;
-                        }
-                    } else {
-                        var nodePassed = node.childNodes[offset - 1];
-                        if (nodePassed && nodePassed.nodeType == 1 && !isCollapsedNode(nodePassed)) {
-                            if (nodePassed.tagName.toLowerCase() == "br") {
-                                log.debug("Node is br");
-                                visibleChar = "\n";
-                                pos.isBr = true;
-                                charType = COLLAPSIBLE_SPACE;
-                                finalizedChar = false;
-                            } else {
-                                log.debug("Unresolved trailing space for node " + dom.inspectNode(nodePassed) + ". Will resolve this later if necessary.");
-                                pos.checkForTrailingSpace = true;
-                            }
-                        }
-
-                        // Check the leading space of the next node for the case when a block element follows an inline
-                        // element or text node. In that case, there is an implied line break between the two nodes.
-                        if (!visibleChar) {
-                            var nextNode = node.childNodes[offset];
-                            if (nextNode && nextNode.nodeType == 1 && !isCollapsedNode(nextNode)) {
-                                log.debug("Unresolved leading space for node " + dom.inspectNode(nextNode) + ". Will resolve this later if necessary.");
-                                pos.checkForLeadingSpace = true;
-                            }
-                        }
-                    }
-                }
-
-                pos.prepopulatedChar = true;
-                pos.character = visibleChar;
-                pos.characterType = charType;
-                pos.isCharInvariant = finalizedChar;
-            }
-        },
-
-        isDefinitelyNonEmpty: function() {
-            var charType = this.characterType;
-            return charType == NON_SPACE || charType == UNCOLLAPSIBLE_SPACE;
-        },
-
-        // Resolve leading and trailing spaces, which may involve prepopulating other positions
-        resolveLeadingAndTrailingSpaces: function() {
-            if (!this.prepopulatedChar) {
-                this.prepopulateChar();
-            }
-            if (this.checkForTrailingSpace) {
-                var trailingSpace = this.session.getNodeWrapper(this.node.childNodes[this.offset - 1]).getTrailingSpace();
-                log.debug("resolveLeadingAndTrailingSpaces checking for trailing space on " + this.inspect() + ", got '" + trailingSpace + "'");
-                if (trailingSpace) {
-                    this.isTrailingSpace = true;
-                    this.character = trailingSpace;
-                    this.characterType = COLLAPSIBLE_SPACE;
-                }
-                this.checkForTrailingSpace = false;
-            }
-            if (this.checkForLeadingSpace) {
-                var leadingSpace = this.session.getNodeWrapper(this.node.childNodes[this.offset]).getLeadingSpace();
-                log.debug("resolveLeadingAndTrailingSpaces checking for leading space on " + this.inspect() + ", got '" + leadingSpace + "'");
-                if (leadingSpace) {
-                    this.isLeadingSpace = true;
-                    this.character = leadingSpace;
-                    this.characterType = COLLAPSIBLE_SPACE;
-                }
-                this.checkForLeadingSpace = false;
-            }
-        },
-        
-        getPrecedingUncollapsedPosition: function(characterOptions) {
-            log.group("getPrecedingUncollapsedPosition " + this.inspect());
-            var pos = this, character;
-            while ( (pos = pos.previousVisible()) ) {
-                character = pos.getCharacter(characterOptions);
-                if (character !== "") {
-                    log.groupEnd();
-                    return pos;
-                }
-            }
-
-            log.groupEnd();
-            return null;
-        },
-
-        getCharacter: function(characterOptions) {
-            log.group("getCharacter called on " + this.inspect());
-            this.resolveLeadingAndTrailingSpaces();
-            
-            // Check if this position's  character is invariant (i.e. not dependent on character options) and return it
-            // if so
-            if (this.isCharInvariant) {
-                log.debug("Character is invariant. Returning '" + this.character + "'");
-                log.groupEnd();
-                return this.character;
-            }
-            
-            var cacheKey = ["character", characterOptions.includeSpaceBeforeBr, characterOptions.includeBlockContentTrailingSpace, characterOptions.includePreLineTrailingSpace].join("_");
-            var cachedChar = this.cache.get(cacheKey);
-            if (cachedChar !== null) {
-                log.debug("Returning cached character '" + cachedChar + "'");
-                log.groupEnd();
-                return cachedChar;
-            }
-            
-            // We need to actually get the character
-            var character = "";
-            var collapsible = (this.characterType == COLLAPSIBLE_SPACE);
-            log.info("getCharacter initial character is '" + this.character + "'", collapsible ? "collapsible" : "");
-            
-            var nextPos, previousPos/* = this.getPrecedingUncollapsedPosition(characterOptions)*/;
-            var gotPreviousPos = false;
-            var pos = this;
-            
-            function getPreviousPos() {
-                if (!gotPreviousPos) {
-                    previousPos = pos.getPrecedingUncollapsedPosition(characterOptions);
-                    gotPreviousPos = true;
-                }
-                return previousPos;
-            }
-
-            // Disallow a collapsible space that is followed by a line break or is the last character
-            if (collapsible) {
-                // Disallow a collapsible space that follows a trailing space or line break, or is the first character
-                if (this.character == " " &&
-                        (!getPreviousPos() || previousPos.isTrailingSpace || previousPos.character == "\n")) {
-                    log.info("Preceding character is a trailing space or non-existent or follows a line break and current possible character is a collapsible space, so space is collapsed");
-                }
-                // Allow a leading line break unless it follows a line break
-                else if (this.character == "\n" && this.isLeadingSpace) {
-                    if (getPreviousPos() && previousPos.character != "\n") {
-                        character = "\n";
-                        log.info("Character is a leading line break and is being included");
-                    } else {
-                        log.info("Character is a leading line break and preceding character is a line break, so leading line break is excluded");
-                    }
-                } else {
-                    nextPos = this.nextUncollapsed();
-                    log.debug("nextPos: " + (nextPos ? nextPos.inspect() : "non-existent"));
-                    if (nextPos) {
-                        if (nextPos.isBr) {
-                            this.type = TRAILING_SPACE_BEFORE_BR;
-                        } else if (nextPos.isTrailingSpace && nextPos.character == "\n") {
-                            this.type = TRAILING_SPACE_IN_BLOCK;
-                        } else if (nextPos.isLeadingSpace && nextPos.character == "\n") {
-                            this.type = TRAILING_SPACE_BEFORE_BLOCK;
-                        }
-                        
-                        log.debug("nextPos.isLeadingSpace: " + nextPos.isLeadingSpace + ", this type: " + this.type);
-                        if (nextPos.character === "\n") {
-                            if (this.type == TRAILING_SPACE_BEFORE_BR && !characterOptions.includeSpaceBeforeBr) {
-                                log.debug("Character is a space which is followed by a br. Policy from options is to collapse.");
-                            } else if (this.type == TRAILING_SPACE_BEFORE_BLOCK && !characterOptions.includeSpaceBeforeBlock) {
-                                log.debug("Character is a space which is followed by a block. Policy from options is to collapse.");
-                            } else if (this.type == TRAILING_SPACE_IN_BLOCK && nextPos.isTrailingSpace && !characterOptions.includeBlockContentTrailingSpace) {
-                                log.debug("Character is a space which is the final character in a block. Policy from options is to collapse.");
-                            } else if (this.type == PRE_LINE_TRAILING_SPACE_BEFORE_LINE_BREAK && nextPos.type == NON_SPACE && !characterOptions.includePreLineTrailingSpace) {
-                                log.debug("Character is a space which is followed by a line break in a pre-line element. Policy from options is to collapse.");
-                            } else if (this.character === "\n") {
-                                if (nextPos.isTrailingSpace) {
-                                    if (this.isTrailingSpace) {
-                                        log.debug("Trailing line break preceding another trailing line break is excluded.");
-                                    } else if (this.isBr) {
-                                        log.debug("Trailing line break (type " + nextPos.type + ", characterType " + nextPos.characterType + ") following a br is excluded but br may be included.");
-                                        nextPos.type = TRAILING_LINE_BREAK_AFTER_BR;
-                                        
-                                        if (getPreviousPos() && previousPos.isLeadingSpace && previousPos.character == "\n") {
-                                            log.debug("Trailing space following a br following a leading line break is excluded.");
-                                            nextPos.character = "";
-                                        } else {
-                                            log.debug("Trailing space following a br not preceded by a leading line break is included.");
-                                            //character = "\n";
-                                            //nextPos
-                                            //log.debug("Br preceding a trailing line break is excluded.");
-                                            /*
-                                             nextPos.character = "";
-                                             log.debug("Br preceding a trailing line break included but excludes trailing line break.");
-                                             character = "\n";
-                                             */
-                                        }
-                                    }
-                                } else {
-                                    log.debug("Collapsible line break followed by a non-trailing line break is being included.");
-                                    character = "\n";
-                                }
-                            } else if (this.character === " ") {
-                                log.debug("Collapsible space followed by a line break is being included.");
-                                character = " ";
-                            } else {
-                                log.debug("Collapsible space that is neither space not line break and is followed by a line break is being excluded.");
-                            }
-                        } else {
-                            log.debug("Character is a collapsible space or line break that has not been disallowed");
-                            character = this.character;
-                        }
-                    } else {
-                        log.debug("Character is a space which is followed by nothing, so collapsing");
-                    }
-                }
-            }
-
-            // Collapse a br element that is followed by a trailing space
-            else if (this.character === "\n" &&
-                    (!(nextPos = this.nextUncollapsed()) || nextPos.isTrailingSpace)) {
-                log.debug("Character is a br which is followed by a trailing space or nothing. This is always collapsed.");
-            }
-            
-            log.debug("getCharacter returning '" + character + "' for pos " + this.inspect())
-            log.groupEnd();
-            
-            this.cache.set(cacheKey, character);
-
-            return character;
-        },
-
-        equals: function(pos) {
-            return !!pos && this.node === pos.node && this.offset === pos.offset;
-        },
-
-        inspect: inspectPosition,
-
-        toString: function() {
-            return this.character;
-        }
-    };
-
-    Position.prototype = positionProto;
-
-    extend(positionProto, {
-        next: createCachingGetter("nextPos", function(pos) {
-            var nodeWrapper = pos.nodeWrapper, node = pos.node, offset = pos.offset, session = nodeWrapper.session;
-            if (!node) {
-                return null;
-            }
-            var nextNode, nextOffset, child;
-            if (offset == nodeWrapper.getLength()) {
-                // Move onto the next node
-                nextNode = node.parentNode;
-                nextOffset = nextNode ? nodeWrapper.getNodeIndex() + 1 : 0;
-            } else {
-                if (nodeWrapper.isCharacterDataNode()) {
-                    nextNode = node;
-                    nextOffset = offset + 1;
-                } else {
-                    child = node.childNodes[offset];
-                    // Go into the children next, if children there are
-                    if (session.getNodeWrapper(child).containsPositions()) {
-                        nextNode = child;
-                        nextOffset = 0;
-                    } else {
-                        nextNode = node;
-                        nextOffset = offset + 1;
-                    }
-                }
-            }
-
-            return nextNode ? session.getPosition(nextNode, nextOffset) : null;
-        }),
-
-        previous: createCachingGetter("previous", function(pos) {
-            var nodeWrapper = pos.nodeWrapper, node = pos.node, offset = pos.offset, session = nodeWrapper.session;
-            var previousNode, previousOffset, child;
-            if (offset == 0) {
-                previousNode = node.parentNode;
-                previousOffset = previousNode ? nodeWrapper.getNodeIndex() : 0;
-            } else {
-                if (nodeWrapper.isCharacterDataNode()) {
-                    previousNode = node;
-                    previousOffset = offset - 1;
-                } else {
-                    child = node.childNodes[offset - 1];
-                    // Go into the children next, if children there are
-                    if (session.getNodeWrapper(child).containsPositions()) {
-                        previousNode = child;
-                        previousOffset = dom.getNodeLength(child);
-                    } else {
-                        previousNode = node;
-                        previousOffset = offset - 1;
-                    }
-                }
-            }
-            return previousNode ? session.getPosition(previousNode, previousOffset) : null;
-        }),
-
-        /*
-         Next and previous position moving functions that filter out
-
-         - Hidden (CSS visibility/display) elements
-         - Script and style elements
-         */
-        nextVisible: createCachingGetter("nextVisible", function(pos) {
-            var next = pos.next();
-            if (!next) {
-                return null;
-            }
-            var nodeWrapper = next.nodeWrapper, node = next.node;
-            var newPos = next;
-            if (nodeWrapper.isCollapsed()) {
-                // We're skipping this node and all its descendants
-                newPos = nodeWrapper.session.getPosition(node.parentNode, nodeWrapper.getNodeIndex() + 1);
-            }
-            return newPos;
-        }),
-
-        nextUncollapsed: createCachingGetter("nextUncollapsed", function(pos) {
-            log.group("nextUncollapsed " + this.inspect());
-            var nextPos = pos;
-            while ( (nextPos = nextPos.nextVisible()) ) {
-                nextPos.resolveLeadingAndTrailingSpaces();
-                if (nextPos.character !== "") {
-                    log.groupEnd();
-                    return nextPos;
-                }
-            }
-            log.groupEnd();
-            return null;
-        }),
-
-        previousVisible: createCachingGetter("previousVisible", function(pos) {
-            var previous = pos.previous();
-            if (!previous) {
-                return null;
-            }
-            var nodeWrapper = previous.nodeWrapper, node = previous.node;
-            var newPos = previous;
-            if (nodeWrapper.isCollapsed()) {
-                // We're skipping this node and all its descendants
-                newPos = nodeWrapper.session.getPosition(node.parentNode, nodeWrapper.getNodeIndex());
-            }
-            return newPos;
-        })
-    });
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    var currentSession = null;
-
-    var Session = (function() {
-        function createWrapperCache(nodeProperty) {
-            var cache = new Cache();
-
-            return {
-                get: function(node) {
-                    var wrappersByProperty = cache.get(node[nodeProperty]);
-                    if (wrappersByProperty) {
-                        for (var i = 0, wrapper; wrapper = wrappersByProperty[i++]; ) {
-                            if (wrapper.node === node) {
-                                return wrapper;
-                            }
-                        }
-                    }
-                    return null;
-                },
-
-                set: function(nodeWrapper) {
-                    var property = nodeWrapper.node[nodeProperty];
-                    var wrappersByProperty = cache.get(property) || cache.set(property, []);
-                    wrappersByProperty.push(nodeWrapper);
-                }
-            };
-        }
-
-        var uniqueIDSupported = util.isHostProperty(document.documentElement, "uniqueID");
-
-        function Session() {
-            this.initCaches();
-        }
-
-        Session.prototype = {
-            initCaches: function() {
-                this.elementCache = uniqueIDSupported ? (function() {
-                    var elementsCache = new Cache();
-
-                    return {
-                        get: function(el) {
-                            return elementsCache.get(el.uniqueID);
-                        },
-
-                        set: function(elWrapper) {
-                            elementsCache.set(elWrapper.node.uniqueID, elWrapper);
-                        }
-                    };
-                })() : createWrapperCache("tagName");
-
-                // Store text nodes keyed by data, although we may need to truncate this
-                this.textNodeCache = createWrapperCache("data");
-                this.otherNodeCache = createWrapperCache("nodeName");
-            },
-
-            getNodeWrapper: function(node) {
-                var wrapperCache;
-                switch (node.nodeType) {
-                    case 1:
-                        wrapperCache = this.elementCache;
-                        break;
-                    case 3:
-                        wrapperCache = this.textNodeCache;
-                        break;
-                    default:
-                        wrapperCache = this.otherNodeCache;
-                        break;
-                }
-
-                var wrapper = wrapperCache.get(node);
-                if (!wrapper) {
-                    wrapper = new NodeWrapper(node, this);
-                    wrapperCache.set(wrapper);
-                }
-                return wrapper;
-            },
-
-            getPosition: function(node, offset) {
-                return this.getNodeWrapper(node).getPosition(offset);
-            },
-
-            getRangeBoundaryPosition: function(range, isStart) {
-                var prefix = isStart ? "start" : "end";
-                return this.getPosition(range[prefix + "Container"], range[prefix + "Offset"]);
-            },
-
-            detach: function() {
-                this.elementCache = this.textNodeCache = this.otherNodeCache = null;
-            }
-        };
-
-        return Session;
-    })();
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    function startSession() {
-        endSession();
-        return (currentSession = new Session());
-    }
-
-    function getSession() {
-        return currentSession || startSession();
-    }
-
-    function endSession() {
-        if (currentSession) {
-            currentSession.detach();
-        }
-        currentSession = null;
-    }
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    // Extensions to the rangy.dom utility object
-
-    extend(dom, {
-        nextNode: nextNode,
-        previousNode: previousNode
-    });
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    function createCharacterIterator(startPos, backward, endPos, characterOptions) {
-        log.info("createCharacterIterator called backwards " + backward + " and with endPos " + (endPos ? endPos.inspect() : ""));
-
-        // Adjust the end position to ensure that it is actually reached
-        if (endPos) {
-            if (backward) {
-                if (isCollapsedNode(endPos.node)) {
-                    endPos = startPos.previousVisible();
-                }
-            } else {
-                if (isCollapsedNode(endPos.node)) {
-                    endPos = endPos.nextVisible();
-                }
-            }
-        }
-        log.info("endPos now " + (endPos ? endPos.inspect() : "") + ", startPos " + startPos.inspect());
-
-        var pos = startPos, finished = false;
-
-        function next() {
-            log.debug("****** NEXT CALLED. FINISHED IS " + finished + ", pos is " + (pos ? pos.inspect() : "non-existent"));
-            var charPos = null;
-            if (backward) {
-                charPos = pos;
-                if (!finished) {
-                    pos = pos.previousVisible();
-                    finished = !pos || (endPos && pos.equals(endPos));
-                }
-            } else {
-                if (!finished) {
-                    charPos = pos = pos.nextVisible();
-                    finished = !pos || (endPos && pos.equals(endPos));
-                }
-            }
-            if (finished) {
-                pos = null;
-            }
-            log.info("Finished: " + finished);
-            return charPos;
-        }
-
-        var previousTextPos, returnPreviousTextPos = false;
-
-        return {
-            next: function() {
-                if (returnPreviousTextPos) {
-                    returnPreviousTextPos = false;
-                    return previousTextPos;
-                } else {
-                    var pos, character;
-                    while ( (pos = next()) ) {
-                        character = pos.getCharacter(characterOptions);
-                        if (character) {
-                            previousTextPos = pos;
-                            return pos;
-                        }
-                    }
-                    return null;
-                }
-            },
-
-            rewind: function() {
-                if (previousTextPos) {
-                    returnPreviousTextPos = true;
-                } else {
-                    throw module.createError("createCharacterIterator: cannot rewind. Only one position can be rewound.");
-                }
-            },
-
-            dispose: function() {
-                startPos = endPos = null;
-            }
-        };
-    }
-
-    var arrayIndexOf = Array.prototype.indexOf ?
-        function(arr, val) {
-            return arr.indexOf(val);
-        } :
-        function(arr, val) {
-            for (var i = 0, len = arr.length; i < len; ++i) {
-                if (arr[i] === val) {
-                    return i;
-                }
-            }
-            return -1;
-        };
-
-    // Provides a pair of iterators over text positions, tokenized. Transparently requests more text when next()
-    // is called and there is no more tokenized text
-    function createTokenizedTextProvider(pos, characterOptions, wordOptions) {
-        var forwardIterator = createCharacterIterator(pos, false, null, characterOptions);
-        var backwardIterator = createCharacterIterator(pos, true, null, characterOptions);
-        var tokenizer = wordOptions.tokenizer;
-
-        // Consumes a word and the whitespace beyond it
-        function consumeWord(forward) {
-            log.debug("consumeWord called, forward is " + forward);
-            var pos, textChar;
-            var newChars = [], it = forward ? forwardIterator : backwardIterator;
-
-            var passedWordBoundary = false, insideWord = false;
-
-            while ( (pos = it.next()) ) {
-                textChar = pos.character;
-                
-                log.debug("Testing char '" + textChar + "'")
-
-                if (allWhiteSpaceRegex.test(textChar)) {
-                    if (insideWord) {
-                        insideWord = false;
-                        passedWordBoundary = true;
-                    }
-                } else {
-                    log.debug("Got non-whitespace, passedWordBoundary is " + passedWordBoundary);
-                    if (passedWordBoundary) {
-                        it.rewind();
-                        break;
-                    } else {
-                        insideWord = true;
-                    }
-                }
-                newChars.push(pos);
-            }
-
-            log.debug("consumeWord done, pos is " + (pos ? pos.inspect() : "non-existent"));
-
-            log.debug("consumeWord got new chars " + newChars.join(""));
-            return newChars;
-        }
-
-        // Get initial word surrounding initial position and tokenize it
-        var forwardChars = consumeWord(true);
-        var backwardChars = consumeWord(false).reverse();
-        var tokens = tokenizer(backwardChars.concat(forwardChars), wordOptions);
-
-        // Create initial token buffers
-        var forwardTokensBuffer = forwardChars.length ?
-            tokens.slice(arrayIndexOf(tokens, forwardChars[0].token)) : [];
-
-        var backwardTokensBuffer = backwardChars.length ?
-            tokens.slice(0, arrayIndexOf(tokens, backwardChars.pop().token) + 1) : [];
-
-        function inspectBuffer(buffer) {
-            var textPositions = ["[" + buffer.length + "]"];
-            for (var i = 0; i < buffer.length; ++i) {
-                textPositions.push("(word: " + buffer[i] + ", is word: " + buffer[i].isWord + ")");
-            }
-            return textPositions;
-        }
-
-        log.info("Initial word: ", inspectBuffer(forwardTokensBuffer) + "", " and ", inspectBuffer(backwardTokensBuffer) + "", forwardChars, backwardChars);
-
-        return {
-            nextEndToken: function() {
-                var lastToken, forwardChars;
-
-                // If we're down to the last token, consume character chunks until we have a word or run out of
-                // characters to consume
-                while ( forwardTokensBuffer.length == 1 &&
-                    !(lastToken = forwardTokensBuffer[0]).isWord &&
-                    (forwardChars = consumeWord(true)).length > 0) {
-
-                    // Merge trailing non-word into next word and tokenize
-                    forwardTokensBuffer = tokenizer(lastToken.chars.concat(forwardChars), wordOptions);
-                }
-
-                return forwardTokensBuffer.shift();
-            },
-
-            previousStartToken: function() {
-                var lastToken, backwardChars;
-
-                // If we're down to the last token, consume character chunks until we have a word or run out of
-                // characters to consume
-                while ( backwardTokensBuffer.length == 1 &&
-                    !(lastToken = backwardTokensBuffer[0]).isWord &&
-                    (backwardChars = consumeWord(false)).length > 0) {
-
-                    // Merge leading non-word into next word and tokenize
-                    backwardTokensBuffer = tokenizer(backwardChars.reverse().concat(lastToken.chars), wordOptions);
-                }
-
-                return backwardTokensBuffer.pop();
-            },
-
-            dispose: function() {
-                forwardIterator.dispose();
-                backwardIterator.dispose();
-                forwardTokensBuffer = backwardTokensBuffer = null;
-            }
-        };
-    }
-
-    function movePositionBy(pos, unit, count, characterOptions, wordOptions) {
-        log.group("movePositionBy " + pos.inspect());
-        log.info("movePositionBy called " + count);
-        var unitsMoved = 0, currentPos, newPos = pos, charIterator, nextPos, absCount = Math.abs(count), token;
-        if (count !== 0) {
-            var backward = (count < 0);
-
-            switch (unit) {
-                case CHARACTER:
-                    charIterator = createCharacterIterator(pos, backward, null, characterOptions);
-                    while ( (currentPos = charIterator.next()) && unitsMoved < absCount ) {
-                        log.info("*** movePositionBy GOT CHAR " + currentPos.character + "[" + currentPos.character.charCodeAt(0) + "] at position " + currentPos.inspect());
-                        ++unitsMoved;
-                        newPos = currentPos;
-                        log.debug("unitsMoved: " + unitsMoved + ", absCount: " + absCount)
-                    }
-                    nextPos = currentPos;
-                    charIterator.dispose();
-                    break;
-                case WORD:
-                    var tokenizedTextProvider = createTokenizedTextProvider(pos, characterOptions, wordOptions);
-                    var next = backward ? tokenizedTextProvider.previousStartToken : tokenizedTextProvider.nextEndToken;
-
-                    while ( (token = next()) && unitsMoved < absCount ) {
-                        log.debug("token: " + token.chars.join(""), token.isWord);
-                        if (token.isWord) {
-                            ++unitsMoved;
-                            log.info("**** FOUND END OF WORD. unitsMoved NOW " + unitsMoved);
-                            newPos = backward ? token.chars[0] : token.chars[token.chars.length - 1];
-                        }
-                    }
-                    break;
-                default:
-                    throw new Error("movePositionBy: unit '" + unit + "' not implemented");
-            }
-
-            // Perform any necessary position tweaks
-            if (backward) {
-                log.debug("Adjusting position. Current newPos: " + newPos);
-                newPos = newPos.previousVisible();
-                log.debug("newPos now: " + newPos);
-                unitsMoved = -unitsMoved;
-            } else if (newPos && newPos.isLeadingSpace) {
-                // Tweak the position for the case of a leading space. The problem is that an uncollapsed leading space
-                // before a block element (for example, the line break between "1" and "2" in the following HTML:
-                // "1<p>2</p>") is considered to be attached to the position immediately before the block element, which
-                // corresponds with a different selection position in most browsers from the one we want (i.e. at the
-                // start of the contents of the block element). We get round this by advancing the position returned to
-                // the last possible equivalent visible position.
-                log.info("movePositionBy ended immediately after a leading space at " + newPos.inspect());
-                if (unit == WORD) {
-                    charIterator = createCharacterIterator(pos, false, null, characterOptions);
-                    nextPos = charIterator.next();
-                    charIterator.dispose();
-                }
-                if (nextPos) {
-                    newPos = nextPos.previousVisible();
-                    log.info("movePositionBy adjusted leading space position to " + newPos.inspect());
-                }
-            }
-        }
-
-        log.groupEnd();
-
-        return {
-            position: newPos,
-            unitsMoved: unitsMoved
-        };
-    }
-
-    function createRangeCharacterIterator(session, range, characterOptions, backward) {
-        var rangeStart = session.getRangeBoundaryPosition(range, true);
-        var rangeEnd = session.getRangeBoundaryPosition(range, false);
-        var itStart = backward ? rangeEnd : rangeStart;
-        var itEnd = backward ? rangeStart : rangeEnd;
-
-        return createCharacterIterator(itStart, !!backward, itEnd, characterOptions);
-    }
-
-    function getRangeCharacters(session, range, characterOptions) {
-        log.info("getRangeCharacters called on range " + range.inspect());
-
-        var chars = [], it = createRangeCharacterIterator(session, range, characterOptions), pos;
-        while ( (pos = it.next()) ) {
-            log.info("*** GOT CHAR " + pos.character + "[" + pos.character.charCodeAt(0) + "] for " + pos.inspect());
-            chars.push(pos);
-        }
-
-        it.dispose();
-        return chars;
-    }
-
-    function isWholeWord(startPos, endPos, wordOptions) {
-        var range = api.createRange(startPos.node);
-        range.setStartAndEnd(startPos.node, startPos.offset, endPos.node, endPos.offset);
-        var returnVal = !range.expand("word", wordOptions);
-        return returnVal;
-    }
-
-    function findTextFromPosition(initialPos, searchTerm, isRegex, searchScopeRange, findOptions) {
-        log.debug("findTextFromPosition called with search term " + searchTerm + ", initialPos " + initialPos.inspect() + " within range " + searchScopeRange.inspect());
-        var backward = isDirectionBackward(findOptions.direction);
-        var it = createCharacterIterator(
-            initialPos,
-            backward,
-            initialPos.session.getRangeBoundaryPosition(searchScopeRange, backward),
-            findOptions.characterOptions
-        );
-        var text = "", chars = [], pos, currentChar, matchStartIndex, matchEndIndex;
-        var result, insideRegexMatch;
-        var returnValue = null;
-
-        function handleMatch(startIndex, endIndex) {
-            var startPos = chars[startIndex].previousVisible();
-            var endPos = chars[endIndex - 1];
-            var valid = (!findOptions.wholeWordsOnly || isWholeWord(startPos, endPos, findOptions.wordOptions));
-
-            return {
-                startPos: startPos,
-                endPos: endPos,
-                valid: valid
-            };
-        }
-
-        while ( (pos = it.next()) ) {
-            currentChar = pos.character;
-            if (!isRegex && !findOptions.caseSensitive) {
-                currentChar = currentChar.toLowerCase();
-            }
-
-            if (backward) {
-                chars.unshift(pos);
-                text = currentChar + text;
-            } else {
-                chars.push(pos);
-                text += currentChar;
-            }
-            
-            //console.log("text " + text)
-
-            if (isRegex) {
-                result = searchTerm.exec(text);
-                if (result) {
-                    if (insideRegexMatch) {
-                        // Check whether the match is now over
-                        matchStartIndex = result.index;
-                        matchEndIndex = matchStartIndex + result[0].length;
-                        if ((!backward && matchEndIndex < text.length) || (backward && matchStartIndex > 0)) {
-                            returnValue = handleMatch(matchStartIndex, matchEndIndex);
-                            break;
-                        }
-                    } else {
-                        insideRegexMatch = true;
-                    }
-                }
-            } else if ( (matchStartIndex = text.indexOf(searchTerm)) != -1 ) {
-                returnValue = handleMatch(matchStartIndex, matchStartIndex + searchTerm.length);
-                break;
-            }
-            log.debug(text.replace(/\s/g, function(m) { return "[" + m.charCodeAt(0) + "]"}), matchStartIndex);
-        }
-
-        // Check whether regex match extends to the end of the range
-        if (insideRegexMatch) {
-            returnValue = handleMatch(matchStartIndex, matchEndIndex);
-        }
-        it.dispose();
-
-        return returnValue;
-    }
-
-    function createEntryPointFunction(func) {
-        return function() {
-            var sessionRunning = !!currentSession;
-            var session = getSession();
-            var args = [session].concat( util.toArray(arguments) );
-            var returnValue = func.apply(this, args);
-            if (!sessionRunning) {
-                endSession();
-            }
-            return returnValue;
-        };
-    }
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    // Extensions to the Rangy Range object
-
-    function createRangeBoundaryMover(isStart, collapse) {
-        /*
-         Unit can be "character" or "word"
-         Options:
-
-         - includeTrailingSpace
-         - wordRegex
-         - tokenizer
-         - collapseSpaceBeforeLineBreak
-         */
-        return createEntryPointFunction(
-            function(session, unit, count, moveOptions) {
-                if (typeof count == "undefined") {
-                    count = unit;
-                    unit = CHARACTER;
-                }
-                moveOptions = createOptions(moveOptions, defaultMoveOptions);
-                var characterOptions = createCharacterOptions(moveOptions.characterOptions);
-                var wordOptions = createWordOptions(moveOptions.wordOptions);
-                log.debug("** moving boundary. start: " + isStart + ", unit: " + unit + ", count: " + count);
-
-                var boundaryIsStart = isStart;
-                if (collapse) {
-                    boundaryIsStart = (count >= 0);
-                    this.collapse(!boundaryIsStart);
-                }
-                var moveResult = movePositionBy(session.getRangeBoundaryPosition(this, boundaryIsStart), unit, count, characterOptions, wordOptions);
-                var newPos = moveResult.position;
-                this[boundaryIsStart ? "setStart" : "setEnd"](newPos.node, newPos.offset);
-                log.debug("*** MOVED " + moveResult.unitsMoved, newPos.inspect())
-                return moveResult.unitsMoved;
-            }
-        );
-    }
-
-    function createRangeTrimmer(isStart) {
-        return createEntryPointFunction(
-            function(session, characterOptions) {
-                characterOptions = createCharacterOptions(characterOptions);
-                var pos;
-                var it = createRangeCharacterIterator(session, this, characterOptions, !isStart);
-                var trimCharCount = 0;
-                while ( (pos = it.next()) && allWhiteSpaceRegex.test(pos.character) ) {
-                    ++trimCharCount;
-                }
-                it.dispose();
-                var trimmed = (trimCharCount > 0);
-                if (trimmed) {
-                    this[isStart ? "moveStart" : "moveEnd"](
-                        "character",
-                        isStart ? trimCharCount : -trimCharCount,
-                        { characterOptions: characterOptions }
-                    );
-                }
-                return trimmed;
-            }
-        );
-    }
-
-    extend(api.rangePrototype, {
-        moveStart: createRangeBoundaryMover(true, false),
-
-        moveEnd: createRangeBoundaryMover(false, false),
-
-        move: createRangeBoundaryMover(true, true),
-
-        trimStart: createRangeTrimmer(true),
-
-        trimEnd: createRangeTrimmer(false),
-
-        trim: createEntryPointFunction(
-            function(session, characterOptions) {
-                var startTrimmed = this.trimStart(characterOptions), endTrimmed = this.trimEnd(characterOptions);
-                return startTrimmed || endTrimmed;
-            }
-        ),
-
-        expand: createEntryPointFunction(
-            function(session, unit, expandOptions) {
-                var moved = false;
-                expandOptions = createOptions(expandOptions, defaultExpandOptions);
-                var characterOptions = createCharacterOptions(expandOptions.characterOptions);
-                if (!unit) {
-                    unit = CHARACTER;
-                }
-                if (unit == WORD) {
-                    var wordOptions = createWordOptions(expandOptions.wordOptions);
-                    var startPos = session.getRangeBoundaryPosition(this, true);
-                    var endPos = session.getRangeBoundaryPosition(this, false);
-
-                    var startTokenizedTextProvider = createTokenizedTextProvider(startPos, characterOptions, wordOptions);
-                    var startToken = startTokenizedTextProvider.nextEndToken();
-                    var newStartPos = startToken.chars[0].previousVisible();
-                    var endToken, newEndPos;
-
-                    if (this.collapsed) {
-                        endToken = startToken;
-                    } else {
-                        var endTokenizedTextProvider = createTokenizedTextProvider(endPos, characterOptions, wordOptions);
-                        endToken = endTokenizedTextProvider.previousStartToken();
-                    }
-                    newEndPos = endToken.chars[endToken.chars.length - 1];
-
-                    if (!newStartPos.equals(startPos)) {
-                        this.setStart(newStartPos.node, newStartPos.offset);
-                        moved = true;
-                    }
-                    if (newEndPos && !newEndPos.equals(endPos)) {
-                        this.setEnd(newEndPos.node, newEndPos.offset);
-                        moved = true;
-                    }
-
-                    if (expandOptions.trim) {
-                        if (expandOptions.trimStart) {
-                            moved = this.trimStart(characterOptions) || moved;
-                        }
-                        if (expandOptions.trimEnd) {
-                            moved = this.trimEnd(characterOptions) || moved;
-                        }
-                    }
-
-                    return moved;
-                } else {
-                    return this.moveEnd(CHARACTER, 1, expandOptions);
-                }
-            }
-        ),
-
-        text: createEntryPointFunction(
-            function(session, characterOptions) {
-                log.info("text. Transaction: " + session + ", characterOptions:", characterOptions);
-                return this.collapsed ?
-                    "" : getRangeCharacters(session, this, createCharacterOptions(characterOptions)).join("");
-            }
-        ),
-
-        selectCharacters: createEntryPointFunction(
-            function(session, containerNode, startIndex, endIndex, characterOptions) {
-                var moveOptions = { characterOptions: characterOptions };
-                if (!containerNode) {
-                    containerNode = getBody( this.getDocument() );
-                }
-                this.selectNodeContents(containerNode);
-                this.collapse(true);
-                this.moveStart("character", startIndex, moveOptions);
-                this.collapse(true);
-                this.moveEnd("character", endIndex - startIndex, moveOptions);
-            }
-        ),
-
-        // Character indexes are relative to the start of node
-        toCharacterRange: createEntryPointFunction(
-            function(session, containerNode, characterOptions) {
-                if (!containerNode) {
-                    containerNode = getBody( this.getDocument() );
-                }
-                var parent = containerNode.parentNode, nodeIndex = dom.getNodeIndex(containerNode);
-                var rangeStartsBeforeNode = (dom.comparePoints(this.startContainer, this.endContainer, parent, nodeIndex) == -1);
-                var rangeBetween = this.cloneRange();
-                var startIndex, endIndex;
-                if (rangeStartsBeforeNode) {
-                    rangeBetween.setStartAndEnd(this.startContainer, this.startOffset, parent, nodeIndex);
-                    startIndex = -rangeBetween.text(characterOptions).length;
-                } else {
-                    rangeBetween.setStartAndEnd(parent, nodeIndex, this.startContainer, this.startOffset);
-                    startIndex = rangeBetween.text(characterOptions).length;
-                }
-                endIndex = startIndex + this.text(characterOptions).length;
-    
-                return {
-                    start: startIndex,
-                    end: endIndex
-                };
-            }
-        ),
-
-        findText: createEntryPointFunction(
-            function(session, searchTermParam, findOptions) {
-                // Set up options
-                findOptions = createFindOptions(findOptions);
-    
-                // Create word options if we're matching whole words only
-                if (findOptions.wholeWordsOnly) {
-                    findOptions.wordOptions = createWordOptions(findOptions.wordOptions);
-    
-                    // We don't ever want trailing spaces for search results
-                    findOptions.wordOptions.includeTrailingSpace = false;
-                }
-    
-                var backward = isDirectionBackward(findOptions.direction);
-    
-                // Create a range representing the search scope if none was provided
-                var searchScopeRange = findOptions.withinRange;
-                if (!searchScopeRange) {
-                    searchScopeRange = api.createRange();
-                    searchScopeRange.selectNodeContents(this.getDocument());
-                }
-    
-                // Examine and prepare the search term
-                var searchTerm = searchTermParam, isRegex = false;
-                if (typeof searchTerm == "string") {
-                    if (!findOptions.caseSensitive) {
-                        searchTerm = searchTerm.toLowerCase();
-                    }
-                } else {
-                    isRegex = true;
-                }
-    
-                var initialPos = session.getRangeBoundaryPosition(this, !backward);
-    
-                // Adjust initial position if it lies outside the search scope
-                var comparison = searchScopeRange.comparePoint(initialPos.node, initialPos.offset);
-                
-                if (comparison === -1) {
-                    initialPos = session.getRangeBoundaryPosition(searchScopeRange, true);
-                } else if (comparison === 1) {
-                    initialPos = session.getRangeBoundaryPosition(searchScopeRange, false);
-                }
-    
-                var pos = initialPos;
-                var wrappedAround = false;
-    
-                // Try to find a match and ignore invalid ones
-                var findResult;
-                while (true) {
-                    findResult = findTextFromPosition(pos, searchTerm, isRegex, searchScopeRange, findOptions);
-    
-                    if (findResult) {
-                        if (findResult.valid) {
-                            this.setStartAndEnd(findResult.startPos.node, findResult.startPos.offset, findResult.endPos.node, findResult.endPos.offset);
-                            return true;
-                        } else {
-                            // We've found a match that is not a whole word, so we carry on searching from the point immediately
-                            // after the match
-                            pos = backward ? findResult.startPos : findResult.endPos;
-                        }
-                    } else if (findOptions.wrap && !wrappedAround) {
-                        // No result found but we're wrapping around and limiting the scope to the unsearched part of the range
-                        searchScopeRange = searchScopeRange.cloneRange();
-                        pos = session.getRangeBoundaryPosition(searchScopeRange, !backward);
-                        searchScopeRange.setBoundary(initialPos.node, initialPos.offset, backward);
-                        log.debug("Wrapping search. New search range is " + searchScopeRange.inspect());
-                        wrappedAround = true;
-                    } else {
-                        // Nothing found and we can't wrap around, so we're done
-                        return false;
-                    }
-                }
-            }
-        ),
-
-        pasteHtml: function(html) {
-            this.deleteContents();
-            if (html) {
-                var frag = this.createContextualFragment(html);
-                var lastChild = frag.lastChild;
-                this.insertNode(frag);
-                this.collapseAfter(lastChild);
-            }
-        }
-    });
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    // Extensions to the Rangy Selection object
-
-    function createSelectionTrimmer(methodName) {
-        return createEntryPointFunction(
-            function(session, characterOptions) {
-                var trimmed = false;
-                this.changeEachRange(function(range) {
-                    trimmed = range[methodName](characterOptions) || trimmed;
-                });
-                return trimmed;
-            }
-        );
-    }
-
-    extend(api.selectionPrototype, {
-        expand: createEntryPointFunction(
-            function(session, unit, expandOptions) {
-                this.changeEachRange(function(range) {
-                    range.expand(unit, expandOptions);
-                });
-            }
-        ),
-
-        move: createEntryPointFunction(
-            function(session, unit, count, options) {
-                var unitsMoved = 0;
-                if (this.focusNode) {
-                    this.collapse(this.focusNode, this.focusOffset);
-                    var range = this.getRangeAt(0);
-                    if (!options) {
-                        options = {};
-                    }
-                    options.characterOptions = createCaretCharacterOptions(options.characterOptions);
-                    unitsMoved = range.move(unit, count, options);
-                    log.debug("Selection move setting range " + range.inspect());
-                    this.setSingleRange(range);
-                    log.debug("Selection now " + this.inspect());
-                }
-                return unitsMoved;
-            }
-        ),
-
-        trimStart: createSelectionTrimmer("trimStart"),
-        trimEnd: createSelectionTrimmer("trimEnd"),
-        trim: createSelectionTrimmer("trim"),
-
-        selectCharacters: createEntryPointFunction(
-            function(session, containerNode, startIndex, endIndex, direction, characterOptions) {
-                var range = api.createRange(containerNode);
-                range.selectCharacters(containerNode, startIndex, endIndex, characterOptions);
-                this.setSingleRange(range, direction);
-            }
-        ),
-
-        saveCharacterRanges: createEntryPointFunction(
-            function(session, containerNode, characterOptions) {
-                var ranges = this.getAllRanges(), rangeCount = ranges.length;
-                var rangeInfos = [];
-    
-                var backward = rangeCount == 1 && this.isBackward();
-    
-                for (var i = 0, len = ranges.length; i < len; ++i) {
-                    rangeInfos[i] = {
-                        characterRange: ranges[i].toCharacterRange(containerNode, characterOptions),
-                        backward: backward,
-                        characterOptions: characterOptions
-                    };
-                }
-    
-                return rangeInfos;
-            }
-        ),
-
-        restoreCharacterRanges: createEntryPointFunction(
-            function(session, containerNode, saved) {
-                this.removeAllRanges();
-                for (var i = 0, len = saved.length, range, rangeInfo, characterRange; i < len; ++i) {
-                    rangeInfo = saved[i];
-                    characterRange = rangeInfo.characterRange;
-                    range = api.createRange(containerNode);
-                    range.selectCharacters(containerNode, characterRange.start, characterRange.end, rangeInfo.characterOptions);
-                    log.info("New selected range: " + range.inspect());
-                    this.addRange(range, rangeInfo.backward);
-                }
-            }
-        ),
-
-        text: createEntryPointFunction(
-            function(session, characterOptions) {
-                var rangeTexts = [];
-                for (var i = 0, len = this.rangeCount; i < len; ++i) {
-                    rangeTexts[i] = this.getRangeAt(i).text(characterOptions);
-                }
-                return rangeTexts.join("");
-            }
-        )
-    });
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    // Extensions to the core rangy object
-
-    api.innerText = function(el, characterOptions) {
-        var range = api.createRange(el);
-        range.selectNodeContents(el);
-        var text = range.text(characterOptions);
-        log.debug("innerText is '" + text.replace(/\s/g, function(matched) { return "[" + matched.charCodeAt(0) + "]"; }) + "'");
-        return text;
-    };
-
-    api.createWordIterator = function(startNode, startOffset, iteratorOptions) {
-        var session = getSession();
-        iteratorOptions = createOptions(iteratorOptions, defaultWordIteratorOptions);
-        var characterOptions = createCharacterOptions(iteratorOptions.characterOptions);
-        var wordOptions = createWordOptions(iteratorOptions.wordOptions);
-        var startPos = session.getPosition(startNode, startOffset);
-        var tokenizedTextProvider = createTokenizedTextProvider(startPos, characterOptions, wordOptions);
-        var backward = isDirectionBackward(iteratorOptions.direction);
-
-        return {
-            next: function() {
-                return backward ? tokenizedTextProvider.previousStartToken() : tokenizedTextProvider.nextEndToken();
-            },
-
-            dispose: function() {
-                tokenizedTextProvider.dispose();
-                this.next = function() {};
-            }
-        };
-    };
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-    
-    api.noMutation = function(func) {
-        var session = getSession();
-        func(session);
-        endSession();
-    };
-
-    api.noMutation.createEntryPointFunction = createEntryPointFunction;
-
-    api.textRange = {
-        isBlockNode: isBlockNode,
-        isCollapsedWhitespaceNode: isCollapsedWhitespaceNode,
-
-        createPosition: createEntryPointFunction(
-            function(session, node, offset) {
-                return session.getPosition(node, offset);
-            }
-        )
-    };
-});
+/**
+ * Text range module for Rangy.
+ * Text-based manipulation and searching of ranges and selections.
+ *
+ * Features
+ *
+ * - Ability to move range boundaries by character or word offsets
+ * - Customizable word tokenizer
+ * - Ignores text nodes inside <script> or <style> elements or those hidden by CSS display and visibility properties
+ * - Range findText method to search for text or regex within the page or within a range. Flags for whole words and case
+ *   sensitivity
+ * - Selection and range save/restore as text offsets within a node
+ * - Methods to return visible text within a range or selection
+ * - innerText method for elements
+ *
+ * References
+ *
+ * https://www.w3.org/Bugs/Public/show_bug.cgi?id=13145
+ * http://aryeh.name/spec/innertext/innertext.html
+ * http://dvcs.w3.org/hg/editing/raw-file/tip/editing.html
+ *
+ * Part of Rangy, a cross-browser JavaScript range and selection library
+ * http://code.google.com/p/rangy/
+ *
+ * Depends on Rangy core.
+ *
+ * Copyright %%build:year%%, Tim Down
+ * Licensed under the MIT license.
+ * Version: %%build:version%%
+ * Build date: %%build:date%%
+ */
+
+/**
+ * Problem: handling of trailing spaces before line breaks is handled inconsistently between browsers.
+ *
+ * First, a <br>: this is relatively simple. For the following HTML:
+ *
+ * 1 <br>2
+ *
+ * - IE and WebKit render the space, include it in the selection (i.e. when the content is selected and pasted into a
+ *   textarea, the space is present) and allow the caret to be placed after it.
+ * - Firefox does not acknowledge the space in the selection but it is possible to place the caret after it.
+ * - Opera does not render the space but has two separate caret positions on either side of the space (left and right
+ *   arrow keys show this) and includes the space in the selection.
+ *
+ * The other case is the line break or breaks implied by block elements. For the following HTML:
+ *
+ * <p>1 </p><p>2<p>
+ *
+ * - WebKit does not acknowledge the space in any way
+ * - Firefox, IE and Opera as per <br>
+ *
+ * One more case is trailing spaces before line breaks in elements with white-space: pre-line. For the following HTML:
+ *
+ * <p style="white-space: pre-line">1
+ * 2</p>
+ *
+ * - Firefox and WebKit include the space in caret positions
+ * - IE does not support pre-line up to and including version 9
+ * - Opera ignores the space
+ * - Trailing space only renders if there is a non-collapsed character in the line
+ *
+ * Problem is whether Rangy should ever acknowledge the space and if so, when. Another problem is whether this can be
+ * feature-tested
+ */
+/* build:modularizeWithDependencies(["./rangy-core"]) */
+rangy.createModule("TextRange", ["WrappedSelection"], function(api, module) {
+    var UNDEF = "undefined";
+    var CHARACTER = "character", WORD = "word";
+    var dom = api.dom, util = api.util;
+    var extend = util.extend;
+    var createOptions = util.createOptions;
+    var getBody = dom.getBody;
+
+    var log = log4javascript.getLogger("rangy.textrange");
+
+    var spacesRegex = /^[ \t\f\r\n]+$/;
+    var spacesMinusLineBreaksRegex = /^[ \t\f\r]+$/;
+    var allWhiteSpaceRegex = /^[\t-\r \u0085\u00A0\u1680\u180E\u2000-\u200B\u2028\u2029\u202F\u205F\u3000]+$/;
+    var nonLineBreakWhiteSpaceRegex = /^[\t \u00A0\u1680\u180E\u2000-\u200B\u202F\u205F\u3000]+$/;
+    var lineBreakRegex = /^[\n-\r\u0085\u2028\u2029]$/;
+
+    var defaultLanguage = "en";
+
+    var isDirectionBackward = api.Selection.isDirectionBackward;
+
+    // Properties representing whether trailing spaces inside blocks are completely collapsed (as they are in WebKit,
+    // but not other browsers). Also test whether trailing spaces before <br> elements are collapsed.
+    var trailingSpaceInBlockCollapses = false;
+    var trailingSpaceBeforeBrCollapses = false;
+    var trailingSpaceBeforeBlockCollapses = false;
+    var trailingSpaceBeforeLineBreakInPreLineCollapses = true;
+
+    (function() {
+        var el = document.createElement("div");
+        el.contentEditable = "true";
+        el.innerHTML = "<p>1 </p><p></p>";
+        var body = getBody(document);
+        var p = el.firstChild;
+        var sel = api.getSelection();
+
+        body.appendChild(el);
+        sel.collapse(p.lastChild, 2);
+        sel.setStart(p.firstChild, 0);
+        trailingSpaceInBlockCollapses = ("" + sel).length == 1;
+
+        el.innerHTML = "1 <br>";
+        sel.collapse(el, 2);
+        sel.setStart(el.firstChild, 0);
+        trailingSpaceBeforeBrCollapses = ("" + sel).length == 1;
+
+        el.innerHTML = "1 <p>1</p>";
+        sel.collapse(el, 2);
+        sel.setStart(el.firstChild, 0);
+        trailingSpaceBeforeBlockCollapses = ("" + sel).length == 1;
+
+        body.removeChild(el);
+        sel.removeAllRanges();
+    })();
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    // This function must create word and non-word tokens for the whole of the text supplied to it
+    function defaultTokenizer(chars, wordOptions) {
+        var word = chars.join(""), result, tokens = [];
+
+        function createTokenFromRange(start, end, isWord) {
+            var tokenChars = chars.slice(start, end);
+            var token = {
+                isWord: isWord,
+                chars: tokenChars,
+                toString: function() {
+                    return tokenChars.join("");
+                }
+            };
+            for (var i = 0, len = tokenChars.length; i < len; ++i) {
+                tokenChars[i].token = token;
+            }
+            tokens.push(token);
+        }
+
+        // Match words and mark characters
+        var lastWordEnd = 0, wordStart, wordEnd;
+        while ( (result = wordOptions.wordRegex.exec(word)) ) {
+            wordStart = result.index;
+            wordEnd = wordStart + result[0].length;
+
+            // Create token for non-word characters preceding this word
+            if (wordStart > lastWordEnd) {
+                createTokenFromRange(lastWordEnd, wordStart, false);
+            }
+
+            // Get trailing space characters for word
+            if (wordOptions.includeTrailingSpace) {
+                while (nonLineBreakWhiteSpaceRegex.test(chars[wordEnd])) {
+                    ++wordEnd;
+                }
+            }
+            createTokenFromRange(wordStart, wordEnd, true);
+            lastWordEnd = wordEnd;
+        }
+
+        // Create token for trailing non-word characters, if any exist
+        if (lastWordEnd < chars.length) {
+            createTokenFromRange(lastWordEnd, chars.length, false);
+        }
+
+        return tokens;
+    }
+
+    var defaultCharacterOptions = {
+        includeBlockContentTrailingSpace: true,
+        includeSpaceBeforeBr: true,
+        includeSpaceBeforeBlock: true,
+        includePreLineTrailingSpace: true
+    };
+
+    var defaultCaretCharacterOptions = {
+        includeBlockContentTrailingSpace: !trailingSpaceBeforeLineBreakInPreLineCollapses,
+        includeSpaceBeforeBr: !trailingSpaceBeforeBrCollapses,
+        includeSpaceBeforeBlock: !trailingSpaceBeforeBlockCollapses,
+        includePreLineTrailingSpace: true
+    };
+    
+    var defaultWordOptions = {
+        "en": {
+            wordRegex: /[a-z0-9]+('[a-z0-9]+)*/gi,
+            includeTrailingSpace: false,
+            tokenizer: defaultTokenizer
+        }
+    };
+
+    var defaultFindOptions = {
+        caseSensitive: false,
+        withinRange: null,
+        wholeWordsOnly: false,
+        wrap: false,
+        direction: "forward",
+        wordOptions: null,
+        characterOptions: null
+    };
+
+    var defaultMoveOptions = {
+        wordOptions: null,
+        characterOptions: null
+    };
+
+    var defaultExpandOptions = {
+        wordOptions: null,
+        characterOptions: null,
+        trim: false,
+        trimStart: true,
+        trimEnd: true
+    };
+
+    var defaultWordIteratorOptions = {
+        wordOptions: null,
+        characterOptions: null,
+        direction: "forward"
+    };
+
+    function createWordOptions(options) {
+        var lang, defaults;
+        if (!options) {
+            return defaultWordOptions[defaultLanguage];
+        } else {
+            lang = options.language || defaultLanguage;
+            defaults = {};
+            extend(defaults, defaultWordOptions[lang] || defaultWordOptions[defaultLanguage]);
+            extend(defaults, options);
+            return defaults;
+        }
+    }
+
+    function createCharacterOptions(options) {
+        return createOptions(options, defaultCharacterOptions);
+    }
+
+    function createCaretCharacterOptions(options) {
+        return createOptions(options, defaultCaretCharacterOptions);
+    }
+
+    function createFindOptions(optionsParam) {
+        var options = createOptions(optionsParam, defaultFindOptions);
+        options.characterOptions = createCharacterOptions(options.wordOptions);
+        return options;
+    }
+    
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    /* DOM utility functions */
+    var getComputedStyleProperty = dom.getComputedStyleProperty;
+
+    // Create cachable versions of DOM functions
+
+    // Test for old IE's incorrect display properties
+    var tableCssDisplayBlock;
+    (function() {
+        var table = document.createElement("table");
+        var body = getBody(document);
+        body.appendChild(table);
+        tableCssDisplayBlock = (getComputedStyleProperty(table, "display") == "block");
+        body.removeChild(table);
+    })();
+
+    api.features.tableCssDisplayBlock = tableCssDisplayBlock;
+
+    var defaultDisplayValueForTag = {
+        table: "table",
+        caption: "table-caption",
+        colgroup: "table-column-group",
+        col: "table-column",
+        thead: "table-header-group",
+        tbody: "table-row-group",
+        tfoot: "table-footer-group",
+        tr: "table-row",
+        td: "table-cell",
+        th: "table-cell"
+    };
+
+    // Corrects IE's "block" value for table-related elements
+    function getComputedDisplay(el, win) {
+        var display = getComputedStyleProperty(el, "display", win);
+        var tagName = el.tagName.toLowerCase();
+        return (display == "block" &&
+                tableCssDisplayBlock &&
+                defaultDisplayValueForTag.hasOwnProperty(tagName)) ?
+            defaultDisplayValueForTag[tagName] : display;
+    }
+
+    function isHidden(node) {
+        var ancestors = getAncestorsAndSelf(node);
+        for (var i = 0, len = ancestors.length; i < len; ++i) {
+            if (ancestors[i].nodeType == 1 && getComputedDisplay(ancestors[i]) == "none") {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    function isVisibilityHiddenTextNode(textNode) {
+        var el;
+        return textNode.nodeType == 3 &&
+            (el = textNode.parentNode) &&
+            getComputedStyleProperty(el, "visibility") == "hidden";
+    }
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+
+    // "A block node is either an Element whose "display" property does not have
+    // resolved value "inline" or "inline-block" or "inline-table" or "none", or a
+    // Document, or a DocumentFragment."
+    function isBlockNode(node) {
+        return node &&
+            ((node.nodeType == 1 && !/^(inline(-block|-table)?|none)$/.test(getComputedDisplay(node))) ||
+            node.nodeType == 9 || node.nodeType == 11);
+    }
+
+    function getLastDescendantOrSelf(node) {
+        var lastChild = node.lastChild;
+        return lastChild ? getLastDescendantOrSelf(lastChild) : node;
+    }
+
+    function containsPositions(node) {
+        return dom.isCharacterDataNode(node) ||
+            !/^(area|base|basefont|br|col|frame|hr|img|input|isindex|link|meta|param)$/i.test(node.nodeName);
+    }
+
+    function getAncestors(node) {
+        var ancestors = [];
+        while (node.parentNode) {
+            ancestors.unshift(node.parentNode);
+            node = node.parentNode;
+        }
+        return ancestors;
+    }
+
+    function getAncestorsAndSelf(node) {
+        return getAncestors(node).concat([node]);
+    }
+
+    function nextNodeDescendants(node) {
+        while (node && !node.nextSibling) {
+            node = node.parentNode;
+        }
+        if (!node) {
+            return null;
+        }
+        return node.nextSibling;
+    }
+
+    function nextNode(node, excludeChildren) {
+        if (!excludeChildren && node.hasChildNodes()) {
+            return node.firstChild;
+        }
+        return nextNodeDescendants(node);
+    }
+
+    function previousNode(node) {
+        var previous = node.previousSibling;
+        if (previous) {
+            node = previous;
+            while (node.hasChildNodes()) {
+                node = node.lastChild;
+            }
+            return node;
+        }
+        var parent = node.parentNode;
+        if (parent && parent.nodeType == 1) {
+            return parent;
+        }
+        return null;
+    }
+
+    // Adpated from Aryeh's code.
+    // "A whitespace node is either a Text node whose data is the empty string; or
+    // a Text node whose data consists only of one or more tabs (0x0009), line
+    // feeds (0x000A), carriage returns (0x000D), and/or spaces (0x0020), and whose
+    // parent is an Element whose resolved value for "white-space" is "normal" or
+    // "nowrap"; or a Text node whose data consists only of one or more tabs
+    // (0x0009), carriage returns (0x000D), and/or spaces (0x0020), and whose
+    // parent is an Element whose resolved value for "white-space" is "pre-line"."
+    function isWhitespaceNode(node) {
+        if (!node || node.nodeType != 3) {
+            return false;
+        }
+        var text = node.data;
+        if (text === "") {
+            return true;
+        }
+        var parent = node.parentNode;
+        if (!parent || parent.nodeType != 1) {
+            return false;
+        }
+        var computedWhiteSpace = getComputedStyleProperty(node.parentNode, "whiteSpace");
+
+        return (/^[\t\n\r ]+$/.test(text) && /^(normal|nowrap)$/.test(computedWhiteSpace)) ||
+            (/^[\t\r ]+$/.test(text) && computedWhiteSpace == "pre-line");
+    }
+
+    // Adpated from Aryeh's code.
+    // "node is a collapsed whitespace node if the following algorithm returns
+    // true:"
+    function isCollapsedWhitespaceNode(node) {
+        // "If node's data is the empty string, return true."
+        if (node.data === "") {
+            return true;
+        }
+
+        // "If node is not a whitespace node, return false."
+        if (!isWhitespaceNode(node)) {
+            return false;
+        }
+
+        // "Let ancestor be node's parent."
+        var ancestor = node.parentNode;
+
+        // "If ancestor is null, return true."
+        if (!ancestor) {
+            return true;
+        }
+
+        // "If the "display" property of some ancestor of node has resolved value "none", return true."
+        if (isHidden(node)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    function isCollapsedNode(node) {
+        var type = node.nodeType;
+        //log.debug("isCollapsedNode", isHidden(node), /^(script|style)$/i.test(node.nodeName), isCollapsedWhitespaceNode(node));
+        return type == 7 /* PROCESSING_INSTRUCTION */ ||
+            type == 8 /* COMMENT */ ||
+            isHidden(node) ||
+            /^(script|style)$/i.test(node.nodeName) ||
+            isVisibilityHiddenTextNode(node) ||
+            isCollapsedWhitespaceNode(node);
+    }
+
+    function isIgnoredNode(node, win) {
+        var type = node.nodeType;
+        return type == 7 /* PROCESSING_INSTRUCTION */ ||
+            type == 8 /* COMMENT */ ||
+            (type == 1 && getComputedDisplay(node, win) == "none");
+    }
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    // Possibly overengineered caching system to prevent repeated DOM calls slowing everything down
+
+    function Cache() {
+        this.store = {};
+    }
+
+    Cache.prototype = {
+        get: function(key) {
+            return this.store.hasOwnProperty(key) ? this.store[key] : null;
+        },
+
+        set: function(key, value) {
+            return this.store[key] = value;
+        }
+    };
+
+    var cachedCount = 0, uncachedCount = 0;
+    
+    function createCachingGetter(methodName, func, objProperty) {
+        return function(args) {
+            var cache = this.cache;
+            if (cache.hasOwnProperty(methodName)) {
+                cachedCount++;
+                return cache[methodName];
+            } else {
+                uncachedCount++;
+                var value = func.call(this, objProperty ? this[objProperty] : this, args);
+                cache[methodName] = value;
+                return value;
+            }
+        };
+    }
+    
+/*
+    api.report = function() {
+        console.log("Cached: " + cachedCount + ", uncached: " + uncachedCount);
+    };
+*/
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    function NodeWrapper(node, session) {
+        this.node = node;
+        this.session = session;
+        this.cache = new Cache();
+        this.positions = new Cache();
+    }
+
+    var nodeProto = {
+        getPosition: function(offset) {
+            var positions = this.positions;
+            return positions.get(offset) || positions.set(offset, new Position(this, offset));
+        },
+
+        toString: function() {
+            return "[NodeWrapper(" + dom.inspectNode(this.node) + ")]";
+        }
+    };
+
+    NodeWrapper.prototype = nodeProto;
+
+    var EMPTY = "EMPTY",
+        NON_SPACE = "NON_SPACE",
+        UNCOLLAPSIBLE_SPACE = "UNCOLLAPSIBLE_SPACE",
+        COLLAPSIBLE_SPACE = "COLLAPSIBLE_SPACE",
+        TRAILING_SPACE_BEFORE_BLOCK = "TRAILING_SPACE_BEFORE_BLOCK",
+        TRAILING_SPACE_IN_BLOCK = "TRAILING_SPACE_IN_BLOCK",
+        TRAILING_SPACE_BEFORE_BR = "TRAILING_SPACE_BEFORE_BR",
+        PRE_LINE_TRAILING_SPACE_BEFORE_LINE_BREAK = "PRE_LINE_TRAILING_SPACE_BEFORE_LINE_BREAK",
+        TRAILING_LINE_BREAK_AFTER_BR = "TRAILING_LINE_BREAK_AFTER_BR";
+
+    extend(nodeProto, {
+        isCharacterDataNode: createCachingGetter("isCharacterDataNode", dom.isCharacterDataNode, "node"),
+        getNodeIndex: createCachingGetter("nodeIndex", dom.getNodeIndex, "node"),
+        getLength: createCachingGetter("nodeLength", dom.getNodeLength, "node"),
+        containsPositions: createCachingGetter("containsPositions", containsPositions, "node"),
+        isWhitespace: createCachingGetter("isWhitespace", isWhitespaceNode, "node"),
+        isCollapsedWhitespace: createCachingGetter("isCollapsedWhitespace", isCollapsedWhitespaceNode, "node"),
+        getComputedDisplay: createCachingGetter("computedDisplay", getComputedDisplay, "node"),
+        isCollapsed: createCachingGetter("collapsed", isCollapsedNode, "node"),
+        isIgnored: createCachingGetter("ignored", isIgnoredNode, "node"),
+        next: createCachingGetter("nextPos", nextNode, "node"),
+        previous: createCachingGetter("previous", previousNode, "node"),
+
+        getTextNodeInfo: createCachingGetter("textNodeInfo", function(textNode) {
+            log.debug("getTextNodeInfo for " + textNode.data);
+            var spaceRegex = null, collapseSpaces = false;
+            var cssWhitespace = getComputedStyleProperty(textNode.parentNode, "whiteSpace");
+            var preLine = (cssWhitespace == "pre-line");
+            if (preLine) {
+                spaceRegex = spacesMinusLineBreaksRegex;
+                collapseSpaces = true;
+            } else if (cssWhitespace == "normal" || cssWhitespace == "nowrap") {
+                spaceRegex = spacesRegex;
+                collapseSpaces = true;
+            }
+
+            return {
+                node: textNode,
+                text: textNode.data,
+                spaceRegex: spaceRegex,
+                collapseSpaces: collapseSpaces,
+                preLine: preLine
+            };
+        }, "node"),
+
+        hasInnerText: createCachingGetter("hasInnerText", function(el, backward) {
+            var session = this.session;
+            var posAfterEl = session.getPosition(el.parentNode, this.getNodeIndex() + 1);
+            var firstPosInEl = session.getPosition(el, 0);
+
+            var pos = backward ? posAfterEl : firstPosInEl;
+            var endPos = backward ? firstPosInEl : posAfterEl;
+
+            /*
+             <body><p>X  </p><p>Y</p></body>
+
+             Positions:
+
+             body:0:""
+             p:0:""
+             text:0:""
+             text:1:"X"
+             text:2:TRAILING_SPACE_IN_BLOCK
+             text:3:COLLAPSED_SPACE
+             p:1:""
+             body:1:"\n"
+             p:0:""
+             text:0:""
+             text:1:"Y"
+
+             A character is a TRAILING_SPACE_IN_BLOCK iff:
+
+             - There is no uncollapsed character after it within the visible containing block element
+
+             A character is a TRAILING_SPACE_BEFORE_BR iff:
+
+             - There is no uncollapsed character after it preceding a <br> element
+
+             An element has inner text iff
+
+             - It is not hidden
+             - It contains an uncollapsed character
+
+             All trailing spaces (pre-line, before <br>, end of block) require definite non-empty characters to render.
+             */
+
+            while (pos !== endPos) {
+                pos.prepopulateChar();
+                if (pos.isDefinitelyNonEmpty()) {
+                    return true;
+                }
+                pos = backward ? pos.previousVisible() : pos.nextVisible();
+            }
+
+            return false;
+        }, "node"),
+        
+        isRenderedBlock: createCachingGetter("isRenderedBlock", function(el) {
+            // Ensure that a block element containing a <br> is considered to have inner text 
+            var brs = el.getElementsByTagName("br");
+            for (var i = 0, len = brs.length; i < len; ++i) {
+                if (!isCollapsedNode(brs[i])) {
+                    return true;
+                }
+            }
+            return this.hasInnerText();
+        }, "node"),
+
+        getTrailingSpace: createCachingGetter("trailingSpace", function(el) {
+            if (el.tagName.toLowerCase() == "br") {
+                return "";
+            } else {
+                switch (this.getComputedDisplay()) {
+                    case "inline":
+                        var child = el.lastChild;
+                        while (child) {
+                            if (!isIgnoredNode(child)) {
+                                return (child.nodeType == 1) ? this.session.getNodeWrapper(child).getTrailingSpace() : "";
+                            }
+                            child = child.previousSibling;
+                        }
+                        break;
+                    case "inline-block":
+                    case "inline-table":
+                    case "none":
+                    case "table-column":
+                    case "table-column-group":
+                        break;
+                    case "table-cell":
+                        return "\t";
+                    default:
+                        return this.isRenderedBlock(true) ? "\n" : "";
+                }
+            }
+            return "";
+        }, "node"),
+
+        getLeadingSpace: createCachingGetter("leadingSpace", function(el) {
+            switch (this.getComputedDisplay()) {
+                case "inline":
+                case "inline-block":
+                case "inline-table":
+                case "none":
+                case "table-column":
+                case "table-column-group":
+                case "table-cell":
+                    break;
+                default:
+                    return this.isRenderedBlock(false) ? "\n" : "";
+            }
+            return "";
+        }, "node")
+    });
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+
+    function Position(nodeWrapper, offset) {
+        this.offset = offset;
+        this.nodeWrapper = nodeWrapper;
+        this.node = nodeWrapper.node;
+        this.session = nodeWrapper.session;
+        this.cache = new Cache();
+    }
+
+    function inspectPosition() {
+        return "[Position(" + dom.inspectNode(this.node) + ":" + this.offset + ")]";
+    }
+
+    var positionProto = {
+        character: "",
+        characterType: EMPTY,
+        isBr: false,
+
+        /*
+        This method:
+        - Fully populates positions that have characters that can be determined independently of any other characters.
+        - Populates most types of space positions with a provisional character. The character is finalized later.
+         */
+        prepopulateChar: function() {
+            var pos = this;
+            if (!pos.prepopulatedChar) {
+                var node = pos.node, offset = pos.offset;
+                log.debug("prepopulateChar " + pos.inspect());
+                var visibleChar = "", charType = EMPTY;
+                var finalizedChar = false;
+                if (offset > 0) {
+                    if (node.nodeType == 3) {
+                        var text = node.data;
+                        var textChar = text.charAt(offset - 1);
+                        log.debug("Got char '" + textChar + "' in data '" + text + "'");
+
+                        var nodeInfo = pos.nodeWrapper.getTextNodeInfo();
+                        var spaceRegex = nodeInfo.spaceRegex;
+                        if (nodeInfo.collapseSpaces) {
+                            if (spaceRegex.test(textChar)) {
+                                // "If the character at position is from set, append a single space (U+0020) to newdata and advance
+                                // position until the character at position is not from set."
+
+                                // We also need to check for the case where we're in a pre-line and we have a space preceding a
+                                // line break, because such spaces are collapsed in some browsers
+                                if (offset > 1 && spaceRegex.test(text.charAt(offset - 2))) {
+                                    log.debug("Character is a collapsible space preceded by another collapsible space, therefore empty");
+                                } else if (nodeInfo.preLine && text.charAt(offset) === "\n") {
+                                    log.debug("Character is a collapsible space which is followed by a line break in a pre-line element, skipping");
+                                    visibleChar = " ";
+                                    charType = PRE_LINE_TRAILING_SPACE_BEFORE_LINE_BREAK;
+                                } else {
+                                    log.debug("Character is a collapsible space not preceded by another collapsible space, including but will need to check for whether it precedes a <br> or end of a block");
+                                    visibleChar = " ";
+                                    //pos.checkForFollowingLineBreak = true;
+                                    charType = COLLAPSIBLE_SPACE;
+                                }
+                            } else {
+                                log.debug("Character is not a space, adding");
+                                visibleChar = textChar;
+                                charType = NON_SPACE;
+                                finalizedChar = true;
+                            }
+                        } else {
+                            log.debug("Spaces are not collapsible, so adding");
+                            visibleChar = textChar;
+                            charType = UNCOLLAPSIBLE_SPACE;
+                            finalizedChar = true;
+                        }
+                    } else {
+                        var nodePassed = node.childNodes[offset - 1];
+                        if (nodePassed && nodePassed.nodeType == 1 && !isCollapsedNode(nodePassed)) {
+                            if (nodePassed.tagName.toLowerCase() == "br") {
+                                log.debug("Node is br");
+                                visibleChar = "\n";
+                                pos.isBr = true;
+                                charType = COLLAPSIBLE_SPACE;
+                                finalizedChar = false;
+                            } else {
+                                log.debug("Unresolved trailing space for node " + dom.inspectNode(nodePassed) + ". Will resolve this later if necessary.");
+                                pos.checkForTrailingSpace = true;
+                            }
+                        }
+
+                        // Check the leading space of the next node for the case when a block element follows an inline
+                        // element or text node. In that case, there is an implied line break between the two nodes.
+                        if (!visibleChar) {
+                            var nextNode = node.childNodes[offset];
+                            if (nextNode && nextNode.nodeType == 1 && !isCollapsedNode(nextNode)) {
+                                log.debug("Unresolved leading space for node " + dom.inspectNode(nextNode) + ". Will resolve this later if necessary.");
+                                pos.checkForLeadingSpace = true;
+                            }
+                        }
+                    }
+                }
+
+                pos.prepopulatedChar = true;
+                pos.character = visibleChar;
+                pos.characterType = charType;
+                pos.isCharInvariant = finalizedChar;
+            }
+        },
+
+        isDefinitelyNonEmpty: function() {
+            var charType = this.characterType;
+            return charType == NON_SPACE || charType == UNCOLLAPSIBLE_SPACE;
+        },
+
+        // Resolve leading and trailing spaces, which may involve prepopulating other positions
+        resolveLeadingAndTrailingSpaces: function() {
+            if (!this.prepopulatedChar) {
+                this.prepopulateChar();
+            }
+            if (this.checkForTrailingSpace) {
+                var trailingSpace = this.session.getNodeWrapper(this.node.childNodes[this.offset - 1]).getTrailingSpace();
+                log.debug("resolveLeadingAndTrailingSpaces checking for trailing space on " + this.inspect() + ", got '" + trailingSpace + "'");
+                if (trailingSpace) {
+                    this.isTrailingSpace = true;
+                    this.character = trailingSpace;
+                    this.characterType = COLLAPSIBLE_SPACE;
+                }
+                this.checkForTrailingSpace = false;
+            }
+            if (this.checkForLeadingSpace) {
+                var leadingSpace = this.session.getNodeWrapper(this.node.childNodes[this.offset]).getLeadingSpace();
+                log.debug("resolveLeadingAndTrailingSpaces checking for leading space on " + this.inspect() + ", got '" + leadingSpace + "'");
+                if (leadingSpace) {
+                    this.isLeadingSpace = true;
+                    this.character = leadingSpace;
+                    this.characterType = COLLAPSIBLE_SPACE;
+                }
+                this.checkForLeadingSpace = false;
+            }
+        },
+        
+        getPrecedingUncollapsedPosition: function(characterOptions) {
+            log.group("getPrecedingUncollapsedPosition " + this.inspect());
+            var pos = this, character;
+            while ( (pos = pos.previousVisible()) ) {
+                character = pos.getCharacter(characterOptions);
+                if (character !== "") {
+                    log.groupEnd();
+                    return pos;
+                }
+            }
+
+            log.groupEnd();
+            return null;
+        },
+
+        getCharacter: function(characterOptions) {
+            log.group("getCharacter called on " + this.inspect());
+            this.resolveLeadingAndTrailingSpaces();
+            
+            // Check if this position's  character is invariant (i.e. not dependent on character options) and return it
+            // if so
+            if (this.isCharInvariant) {
+                log.debug("Character is invariant. Returning '" + this.character + "'");
+                log.groupEnd();
+                return this.character;
+            }
+            
+            var cacheKey = ["character", characterOptions.includeSpaceBeforeBr, characterOptions.includeBlockContentTrailingSpace, characterOptions.includePreLineTrailingSpace].join("_");
+            var cachedChar = this.cache.get(cacheKey);
+            if (cachedChar !== null) {
+                log.debug("Returning cached character '" + cachedChar + "'");
+                log.groupEnd();
+                return cachedChar;
+            }
+            
+            // We need to actually get the character
+            var character = "";
+            var collapsible = (this.characterType == COLLAPSIBLE_SPACE);
+            log.info("getCharacter initial character is '" + this.character + "'", collapsible ? "collapsible" : "");
+            
+            var nextPos, previousPos/* = this.getPrecedingUncollapsedPosition(characterOptions)*/;
+            var gotPreviousPos = false;
+            var pos = this;
+            
+            function getPreviousPos() {
+                if (!gotPreviousPos) {
+                    previousPos = pos.getPrecedingUncollapsedPosition(characterOptions);
+                    gotPreviousPos = true;
+                }
+                return previousPos;
+            }
+
+            // Disallow a collapsible space that is followed by a line break or is the last character
+            if (collapsible) {
+                // Disallow a collapsible space that follows a trailing space or line break, or is the first character
+                if (this.character == " " &&
+                        (!getPreviousPos() || previousPos.isTrailingSpace || previousPos.character == "\n")) {
+                    log.info("Preceding character is a trailing space or non-existent or follows a line break and current possible character is a collapsible space, so space is collapsed");
+                }
+                // Allow a leading line break unless it follows a line break
+                else if (this.character == "\n" && this.isLeadingSpace) {
+                    if (getPreviousPos() && previousPos.character != "\n") {
+                        character = "\n";
+                        log.info("Character is a leading line break and is being included");
+                    } else {
+                        log.info("Character is a leading line break and preceding character is a line break, so leading line break is excluded");
+                    }
+                } else {
+                    nextPos = this.nextUncollapsed();
+                    log.debug("nextPos: " + (nextPos ? nextPos.inspect() : "non-existent"));
+                    if (nextPos) {
+                        if (nextPos.isBr) {
+                            this.type = TRAILING_SPACE_BEFORE_BR;
+                        } else if (nextPos.isTrailingSpace && nextPos.character == "\n") {
+                            this.type = TRAILING_SPACE_IN_BLOCK;
+                        } else if (nextPos.isLeadingSpace && nextPos.character == "\n") {
+                            this.type = TRAILING_SPACE_BEFORE_BLOCK;
+                        }
+                        
+                        log.debug("nextPos.isLeadingSpace: " + nextPos.isLeadingSpace + ", this type: " + this.type);
+                        if (nextPos.character === "\n") {
+                            if (this.type == TRAILING_SPACE_BEFORE_BR && !characterOptions.includeSpaceBeforeBr) {
+                                log.debug("Character is a space which is followed by a br. Policy from options is to collapse.");
+                            } else if (this.type == TRAILING_SPACE_BEFORE_BLOCK && !characterOptions.includeSpaceBeforeBlock) {
+                                log.debug("Character is a space which is followed by a block. Policy from options is to collapse.");
+                            } else if (this.type == TRAILING_SPACE_IN_BLOCK && nextPos.isTrailingSpace && !characterOptions.includeBlockContentTrailingSpace) {
+                                log.debug("Character is a space which is the final character in a block. Policy from options is to collapse.");
+                            } else if (this.type == PRE_LINE_TRAILING_SPACE_BEFORE_LINE_BREAK && nextPos.type == NON_SPACE && !characterOptions.includePreLineTrailingSpace) {
+                                log.debug("Character is a space which is followed by a line break in a pre-line element. Policy from options is to collapse.");
+                            } else if (this.character === "\n") {
+                                if (nextPos.isTrailingSpace) {
+                                    if (this.isTrailingSpace) {
+                                        log.debug("Trailing line break preceding another trailing line break is excluded.");
+                                    } else if (this.isBr) {
+                                        log.debug("Trailing line break (type " + nextPos.type + ", characterType " + nextPos.characterType + ") following a br is excluded but br may be included.");
+                                        nextPos.type = TRAILING_LINE_BREAK_AFTER_BR;
+                                        
+                                        if (getPreviousPos() && previousPos.isLeadingSpace && previousPos.character == "\n") {
+                                            log.debug("Trailing space following a br following a leading line break is excluded.");
+                                            nextPos.character = "";
+                                        } else {
+                                            log.debug("Trailing space following a br not preceded by a leading line break is included.");
+                                            //character = "\n";
+                                            //nextPos
+                                            //log.debug("Br preceding a trailing line break is excluded.");
+                                            /*
+                                             nextPos.character = "";
+                                             log.debug("Br preceding a trailing line break included but excludes trailing line break.");
+                                             character = "\n";
+                                             */
+                                        }
+                                    }
+                                } else {
+                                    log.debug("Collapsible line break followed by a non-trailing line break is being included.");
+                                    character = "\n";
+                                }
+                            } else if (this.character === " ") {
+                                log.debug("Collapsible space followed by a line break is being included.");
+                                character = " ";
+                            } else {
+                                log.debug("Collapsible space that is neither space not line break and is followed by a line break is being excluded.");
+                            }
+                        } else {
+                            log.debug("Character is a collapsible space or line break that has not been disallowed");
+                            character = this.character;
+                        }
+                    } else {
+                        log.debug("Character is a space which is followed by nothing, so collapsing");
+                    }
+                }
+            }
+
+            // Collapse a br element that is followed by a trailing space
+            else if (this.character === "\n" &&
+                    (!(nextPos = this.nextUncollapsed()) || nextPos.isTrailingSpace)) {
+                log.debug("Character is a br which is followed by a trailing space or nothing. This is always collapsed.");
+            }
+            
+            log.debug("getCharacter returning '" + character + "' for pos " + this.inspect())
+            log.groupEnd();
+            
+            this.cache.set(cacheKey, character);
+
+            return character;
+        },
+
+        equals: function(pos) {
+            return !!pos && this.node === pos.node && this.offset === pos.offset;
+        },
+
+        inspect: inspectPosition,
+
+        toString: function() {
+            return this.character;
+        }
+    };
+
+    Position.prototype = positionProto;
+
+    extend(positionProto, {
+        next: createCachingGetter("nextPos", function(pos) {
+            var nodeWrapper = pos.nodeWrapper, node = pos.node, offset = pos.offset, session = nodeWrapper.session;
+            if (!node) {
+                return null;
+            }
+            var nextNode, nextOffset, child;
+            if (offset == nodeWrapper.getLength()) {
+                // Move onto the next node
+                nextNode = node.parentNode;
+                nextOffset = nextNode ? nodeWrapper.getNodeIndex() + 1 : 0;
+            } else {
+                if (nodeWrapper.isCharacterDataNode()) {
+                    nextNode = node;
+                    nextOffset = offset + 1;
+                } else {
+                    child = node.childNodes[offset];
+                    // Go into the children next, if children there are
+                    if (session.getNodeWrapper(child).containsPositions()) {
+                        nextNode = child;
+                        nextOffset = 0;
+                    } else {
+                        nextNode = node;
+                        nextOffset = offset + 1;
+                    }
+                }
+            }
+
+            return nextNode ? session.getPosition(nextNode, nextOffset) : null;
+        }),
+
+        previous: createCachingGetter("previous", function(pos) {
+            var nodeWrapper = pos.nodeWrapper, node = pos.node, offset = pos.offset, session = nodeWrapper.session;
+            var previousNode, previousOffset, child;
+            if (offset == 0) {
+                previousNode = node.parentNode;
+                previousOffset = previousNode ? nodeWrapper.getNodeIndex() : 0;
+            } else {
+                if (nodeWrapper.isCharacterDataNode()) {
+                    previousNode = node;
+                    previousOffset = offset - 1;
+                } else {
+                    child = node.childNodes[offset - 1];
+                    // Go into the children next, if children there are
+                    if (session.getNodeWrapper(child).containsPositions()) {
+                        previousNode = child;
+                        previousOffset = dom.getNodeLength(child);
+                    } else {
+                        previousNode = node;
+                        previousOffset = offset - 1;
+                    }
+                }
+            }
+            return previousNode ? session.getPosition(previousNode, previousOffset) : null;
+        }),
+
+        /*
+         Next and previous position moving functions that filter out
+
+         - Hidden (CSS visibility/display) elements
+         - Script and style elements
+         */
+        nextVisible: createCachingGetter("nextVisible", function(pos) {
+            var next = pos.next();
+            if (!next) {
+                return null;
+            }
+            var nodeWrapper = next.nodeWrapper, node = next.node;
+            var newPos = next;
+            if (nodeWrapper.isCollapsed()) {
+                // We're skipping this node and all its descendants
+                newPos = nodeWrapper.session.getPosition(node.parentNode, nodeWrapper.getNodeIndex() + 1);
+            }
+            return newPos;
+        }),
+
+        nextUncollapsed: createCachingGetter("nextUncollapsed", function(pos) {
+            log.group("nextUncollapsed " + this.inspect());
+            var nextPos = pos;
+            while ( (nextPos = nextPos.nextVisible()) ) {
+                nextPos.resolveLeadingAndTrailingSpaces();
+                if (nextPos.character !== "") {
+                    log.groupEnd();
+                    return nextPos;
+                }
+            }
+            log.groupEnd();
+            return null;
+        }),
+
+        previousVisible: createCachingGetter("previousVisible", function(pos) {
+            var previous = pos.previous();
+            if (!previous) {
+                return null;
+            }
+            var nodeWrapper = previous.nodeWrapper, node = previous.node;
+            var newPos = previous;
+            if (nodeWrapper.isCollapsed()) {
+                // We're skipping this node and all its descendants
+                newPos = nodeWrapper.session.getPosition(node.parentNode, nodeWrapper.getNodeIndex());
+            }
+            return newPos;
+        })
+    });
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    var currentSession = null;
+
+    var Session = (function() {
+        function createWrapperCache(nodeProperty) {
+            var cache = new Cache();
+
+            return {
+                get: function(node) {
+                    var wrappersByProperty = cache.get(node[nodeProperty]);
+                    if (wrappersByProperty) {
+                        for (var i = 0, wrapper; wrapper = wrappersByProperty[i++]; ) {
+                            if (wrapper.node === node) {
+                                return wrapper;
+                            }
+                        }
+                    }
+                    return null;
+                },
+
+                set: function(nodeWrapper) {
+                    var property = nodeWrapper.node[nodeProperty];
+                    var wrappersByProperty = cache.get(property) || cache.set(property, []);
+                    wrappersByProperty.push(nodeWrapper);
+                }
+            };
+        }
+
+        var uniqueIDSupported = util.isHostProperty(document.documentElement, "uniqueID");
+
+        function Session() {
+            this.initCaches();
+        }
+
+        Session.prototype = {
+            initCaches: function() {
+                this.elementCache = uniqueIDSupported ? (function() {
+                    var elementsCache = new Cache();
+
+                    return {
+                        get: function(el) {
+                            return elementsCache.get(el.uniqueID);
+                        },
+
+                        set: function(elWrapper) {
+                            elementsCache.set(elWrapper.node.uniqueID, elWrapper);
+                        }
+                    };
+                })() : createWrapperCache("tagName");
+
+                // Store text nodes keyed by data, although we may need to truncate this
+                this.textNodeCache = createWrapperCache("data");
+                this.otherNodeCache = createWrapperCache("nodeName");
+            },
+
+            getNodeWrapper: function(node) {
+                var wrapperCache;
+                switch (node.nodeType) {
+                    case 1:
+                        wrapperCache = this.elementCache;
+                        break;
+                    case 3:
+                        wrapperCache = this.textNodeCache;
+                        break;
+                    default:
+                        wrapperCache = this.otherNodeCache;
+                        break;
+                }
+
+                var wrapper = wrapperCache.get(node);
+                if (!wrapper) {
+                    wrapper = new NodeWrapper(node, this);
+                    wrapperCache.set(wrapper);
+                }
+                return wrapper;
+            },
+
+            getPosition: function(node, offset) {
+                return this.getNodeWrapper(node).getPosition(offset);
+            },
+
+            getRangeBoundaryPosition: function(range, isStart) {
+                var prefix = isStart ? "start" : "end";
+                return this.getPosition(range[prefix + "Container"], range[prefix + "Offset"]);
+            },
+
+            detach: function() {
+                this.elementCache = this.textNodeCache = this.otherNodeCache = null;
+            }
+        };
+
+        return Session;
+    })();
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    function startSession() {
+        endSession();
+        return (currentSession = new Session());
+    }
+
+    function getSession() {
+        return currentSession || startSession();
+    }
+
+    function endSession() {
+        if (currentSession) {
+            currentSession.detach();
+        }
+        currentSession = null;
+    }
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    // Extensions to the rangy.dom utility object
+
+    extend(dom, {
+        nextNode: nextNode,
+        previousNode: previousNode
+    });
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    function createCharacterIterator(startPos, backward, endPos, characterOptions) {
+        log.info("createCharacterIterator called backwards " + backward + " and with endPos " + (endPos ? endPos.inspect() : ""));
+
+        // Adjust the end position to ensure that it is actually reached
+        if (endPos) {
+            if (backward) {
+                if (isCollapsedNode(endPos.node)) {
+                    endPos = startPos.previousVisible();
+                }
+            } else {
+                if (isCollapsedNode(endPos.node)) {
+                    endPos = endPos.nextVisible();
+                }
+            }
+        }
+        log.info("endPos now " + (endPos ? endPos.inspect() : "") + ", startPos " + startPos.inspect());
+
+        var pos = startPos, finished = false;
+
+        function next() {
+            log.debug("****** NEXT CALLED. FINISHED IS " + finished + ", pos is " + (pos ? pos.inspect() : "non-existent"));
+            var charPos = null;
+            if (backward) {
+                charPos = pos;
+                if (!finished) {
+                    pos = pos.previousVisible();
+                    finished = !pos || (endPos && pos.equals(endPos));
+                }
+            } else {
+                if (!finished) {
+                    charPos = pos = pos.nextVisible();
+                    finished = !pos || (endPos && pos.equals(endPos));
+                }
+            }
+            if (finished) {
+                pos = null;
+            }
+            log.info("Finished: " + finished);
+            return charPos;
+        }
+
+        var previousTextPos, returnPreviousTextPos = false;
+
+        return {
+            next: function() {
+                if (returnPreviousTextPos) {
+                    returnPreviousTextPos = false;
+                    return previousTextPos;
+                } else {
+                    var pos, character;
+                    while ( (pos = next()) ) {
+                        character = pos.getCharacter(characterOptions);
+                        if (character) {
+                            previousTextPos = pos;
+                            return pos;
+                        }
+                    }
+                    return null;
+                }
+            },
+
+            rewind: function() {
+                if (previousTextPos) {
+                    returnPreviousTextPos = true;
+                } else {
+                    throw module.createError("createCharacterIterator: cannot rewind. Only one position can be rewound.");
+                }
+            },
+
+            dispose: function() {
+                startPos = endPos = null;
+            }
+        };
+    }
+
+    var arrayIndexOf = Array.prototype.indexOf ?
+        function(arr, val) {
+            return arr.indexOf(val);
+        } :
+        function(arr, val) {
+            for (var i = 0, len = arr.length; i < len; ++i) {
+                if (arr[i] === val) {
+                    return i;
+                }
+            }
+            return -1;
+        };
+
+    // Provides a pair of iterators over text positions, tokenized. Transparently requests more text when next()
+    // is called and there is no more tokenized text
+    function createTokenizedTextProvider(pos, characterOptions, wordOptions) {
+        var forwardIterator = createCharacterIterator(pos, false, null, characterOptions);
+        var backwardIterator = createCharacterIterator(pos, true, null, characterOptions);
+        var tokenizer = wordOptions.tokenizer;
+
+        // Consumes a word and the whitespace beyond it
+        function consumeWord(forward) {
+            log.debug("consumeWord called, forward is " + forward);
+            var pos, textChar;
+            var newChars = [], it = forward ? forwardIterator : backwardIterator;
+
+            var passedWordBoundary = false, insideWord = false;
+
+            while ( (pos = it.next()) ) {
+                textChar = pos.character;
+                
+                log.debug("Testing char '" + textChar + "'")
+
+                if (allWhiteSpaceRegex.test(textChar)) {
+                    if (insideWord) {
+                        insideWord = false;
+                        passedWordBoundary = true;
+                    }
+                } else {
+                    log.debug("Got non-whitespace, passedWordBoundary is " + passedWordBoundary);
+                    if (passedWordBoundary) {
+                        it.rewind();
+                        break;
+                    } else {
+                        insideWord = true;
+                    }
+                }
+                newChars.push(pos);
+            }
+
+            log.debug("consumeWord done, pos is " + (pos ? pos.inspect() : "non-existent"));
+
+            log.debug("consumeWord got new chars " + newChars.join(""));
+            return newChars;
+        }
+
+        // Get initial word surrounding initial position and tokenize it
+        var forwardChars = consumeWord(true);
+        var backwardChars = consumeWord(false).reverse();
+        var tokens = tokenizer(backwardChars.concat(forwardChars), wordOptions);
+
+        // Create initial token buffers
+        var forwardTokensBuffer = forwardChars.length ?
+            tokens.slice(arrayIndexOf(tokens, forwardChars[0].token)) : [];
+
+        var backwardTokensBuffer = backwardChars.length ?
+            tokens.slice(0, arrayIndexOf(tokens, backwardChars.pop().token) + 1) : [];
+
+        function inspectBuffer(buffer) {
+            var textPositions = ["[" + buffer.length + "]"];
+            for (var i = 0; i < buffer.length; ++i) {
+                textPositions.push("(word: " + buffer[i] + ", is word: " + buffer[i].isWord + ")");
+            }
+            return textPositions;
+        }
+
+        log.info("Initial word: ", inspectBuffer(forwardTokensBuffer) + "", " and ", inspectBuffer(backwardTokensBuffer) + "", forwardChars, backwardChars);
+
+        return {
+            nextEndToken: function() {
+                var lastToken, forwardChars;
+
+                // If we're down to the last token, consume character chunks until we have a word or run out of
+                // characters to consume
+                while ( forwardTokensBuffer.length == 1 &&
+                    !(lastToken = forwardTokensBuffer[0]).isWord &&
+                    (forwardChars = consumeWord(true)).length > 0) {
+
+                    // Merge trailing non-word into next word and tokenize
+                    forwardTokensBuffer = tokenizer(lastToken.chars.concat(forwardChars), wordOptions);
+                }
+
+                return forwardTokensBuffer.shift();
+            },
+
+            previousStartToken: function() {
+                var lastToken, backwardChars;
+
+                // If we're down to the last token, consume character chunks until we have a word or run out of
+                // characters to consume
+                while ( backwardTokensBuffer.length == 1 &&
+                    !(lastToken = backwardTokensBuffer[0]).isWord &&
+                    (backwardChars = consumeWord(false)).length > 0) {
+
+                    // Merge leading non-word into next word and tokenize
+                    backwardTokensBuffer = tokenizer(backwardChars.reverse().concat(lastToken.chars), wordOptions);
+                }
+
+                return backwardTokensBuffer.pop();
+            },
+
+            dispose: function() {
+                forwardIterator.dispose();
+                backwardIterator.dispose();
+                forwardTokensBuffer = backwardTokensBuffer = null;
+            }
+        };
+    }
+
+    function movePositionBy(pos, unit, count, characterOptions, wordOptions) {
+        log.group("movePositionBy " + pos.inspect());
+        log.info("movePositionBy called " + count);
+        var unitsMoved = 0, currentPos, newPos = pos, charIterator, nextPos, absCount = Math.abs(count), token;
+        if (count !== 0) {
+            var backward = (count < 0);
+
+            switch (unit) {
+                case CHARACTER:
+                    charIterator = createCharacterIterator(pos, backward, null, characterOptions);
+                    while ( (currentPos = charIterator.next()) && unitsMoved < absCount ) {
+                        log.info("*** movePositionBy GOT CHAR " + currentPos.character + "[" + currentPos.character.charCodeAt(0) + "] at position " + currentPos.inspect());
+                        ++unitsMoved;
+                        newPos = currentPos;
+                        log.debug("unitsMoved: " + unitsMoved + ", absCount: " + absCount)
+                    }
+                    nextPos = currentPos;
+                    charIterator.dispose();
+                    break;
+                case WORD:
+                    var tokenizedTextProvider = createTokenizedTextProvider(pos, characterOptions, wordOptions);
+                    var next = backward ? tokenizedTextProvider.previousStartToken : tokenizedTextProvider.nextEndToken;
+
+                    while ( (token = next()) && unitsMoved < absCount ) {
+                        log.debug("token: " + token.chars.join(""), token.isWord);
+                        if (token.isWord) {
+                            ++unitsMoved;
+                            log.info("**** FOUND END OF WORD. unitsMoved NOW " + unitsMoved);
+                            newPos = backward ? token.chars[0] : token.chars[token.chars.length - 1];
+                        }
+                    }
+                    break;
+                default:
+                    throw new Error("movePositionBy: unit '" + unit + "' not implemented");
+            }
+
+            // Perform any necessary position tweaks
+            if (backward) {
+                log.debug("Adjusting position. Current newPos: " + newPos);
+                newPos = newPos.previousVisible();
+                log.debug("newPos now: " + newPos);
+                unitsMoved = -unitsMoved;
+            } else if (newPos && newPos.isLeadingSpace) {
+                // Tweak the position for the case of a leading space. The problem is that an uncollapsed leading space
+                // before a block element (for example, the line break between "1" and "2" in the following HTML:
+                // "1<p>2</p>") is considered to be attached to the position immediately before the block element, which
+                // corresponds with a different selection position in most browsers from the one we want (i.e. at the
+                // start of the contents of the block element). We get round this by advancing the position returned to
+                // the last possible equivalent visible position.
+                log.info("movePositionBy ended immediately after a leading space at " + newPos.inspect());
+                if (unit == WORD) {
+                    charIterator = createCharacterIterator(pos, false, null, characterOptions);
+                    nextPos = charIterator.next();
+                    charIterator.dispose();
+                }
+                if (nextPos) {
+                    newPos = nextPos.previousVisible();
+                    log.info("movePositionBy adjusted leading space position to " + newPos.inspect());
+                }
+            }
+        }
+
+        log.groupEnd();
+
+        return {
+            position: newPos,
+            unitsMoved: unitsMoved
+        };
+    }
+
+    function createRangeCharacterIterator(session, range, characterOptions, backward) {
+        var rangeStart = session.getRangeBoundaryPosition(range, true);
+        var rangeEnd = session.getRangeBoundaryPosition(range, false);
+        var itStart = backward ? rangeEnd : rangeStart;
+        var itEnd = backward ? rangeStart : rangeEnd;
+
+        return createCharacterIterator(itStart, !!backward, itEnd, characterOptions);
+    }
+
+    function getRangeCharacters(session, range, characterOptions) {
+        log.info("getRangeCharacters called on range " + range.inspect());
+
+        var chars = [], it = createRangeCharacterIterator(session, range, characterOptions), pos;
+        while ( (pos = it.next()) ) {
+            log.info("*** GOT CHAR " + pos.character + "[" + pos.character.charCodeAt(0) + "] for " + pos.inspect());
+            chars.push(pos);
+        }
+
+        it.dispose();
+        return chars;
+    }
+
+    function isWholeWord(startPos, endPos, wordOptions) {
+        var range = api.createRange(startPos.node);
+        range.setStartAndEnd(startPos.node, startPos.offset, endPos.node, endPos.offset);
+        var returnVal = !range.expand("word", wordOptions);
+        return returnVal;
+    }
+
+    function findTextFromPosition(initialPos, searchTerm, isRegex, searchScopeRange, findOptions) {
+        log.debug("findTextFromPosition called with search term " + searchTerm + ", initialPos " + initialPos.inspect() + " within range " + searchScopeRange.inspect());
+        var backward = isDirectionBackward(findOptions.direction);
+        var it = createCharacterIterator(
+            initialPos,
+            backward,
+            initialPos.session.getRangeBoundaryPosition(searchScopeRange, backward),
+            findOptions.characterOptions
+        );
+        var text = "", chars = [], pos, currentChar, matchStartIndex, matchEndIndex;
+        var result, insideRegexMatch;
+        var returnValue = null;
+
+        function handleMatch(startIndex, endIndex) {
+            var startPos = chars[startIndex].previousVisible();
+            var endPos = chars[endIndex - 1];
+            var valid = (!findOptions.wholeWordsOnly || isWholeWord(startPos, endPos, findOptions.wordOptions));
+
+            return {
+                startPos: startPos,
+                endPos: endPos,
+                valid: valid
+            };
+        }
+
+        while ( (pos = it.next()) ) {
+            currentChar = pos.character;
+            if (!isRegex && !findOptions.caseSensitive) {
+                currentChar = currentChar.toLowerCase();
+            }
+
+            if (backward) {
+                chars.unshift(pos);
+                text = currentChar + text;
+            } else {
+                chars.push(pos);
+                text += currentChar;
+            }
+            
+            //console.log("text " + text)
+
+            if (isRegex) {
+                result = searchTerm.exec(text);
+                if (result) {
+                    if (insideRegexMatch) {
+                        // Check whether the match is now over
+                        matchStartIndex = result.index;
+                        matchEndIndex = matchStartIndex + result[0].length;
+                        if ((!backward && matchEndIndex < text.length) || (backward && matchStartIndex > 0)) {
+                            returnValue = handleMatch(matchStartIndex, matchEndIndex);
+                            break;
+                        }
+                    } else {
+                        insideRegexMatch = true;
+                    }
+                }
+            } else if ( (matchStartIndex = text.indexOf(searchTerm)) != -1 ) {
+                returnValue = handleMatch(matchStartIndex, matchStartIndex + searchTerm.length);
+                break;
+            }
+            log.debug(text.replace(/\s/g, function(m) { return "[" + m.charCodeAt(0) + "]"}), matchStartIndex);
+        }
+
+        // Check whether regex match extends to the end of the range
+        if (insideRegexMatch) {
+            returnValue = handleMatch(matchStartIndex, matchEndIndex);
+        }
+        it.dispose();
+
+        return returnValue;
+    }
+
+    function createEntryPointFunction(func) {
+        return function() {
+            var sessionRunning = !!currentSession;
+            var session = getSession();
+            var args = [session].concat( util.toArray(arguments) );
+            var returnValue = func.apply(this, args);
+            if (!sessionRunning) {
+                endSession();
+            }
+            return returnValue;
+        };
+    }
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    // Extensions to the Rangy Range object
+
+    function createRangeBoundaryMover(isStart, collapse) {
+        /*
+         Unit can be "character" or "word"
+         Options:
+
+         - includeTrailingSpace
+         - wordRegex
+         - tokenizer
+         - collapseSpaceBeforeLineBreak
+         */
+        return createEntryPointFunction(
+            function(session, unit, count, moveOptions) {
+                if (typeof count == "undefined") {
+                    count = unit;
+                    unit = CHARACTER;
+                }
+                moveOptions = createOptions(moveOptions, defaultMoveOptions);
+                var characterOptions = createCharacterOptions(moveOptions.characterOptions);
+                var wordOptions = createWordOptions(moveOptions.wordOptions);
+                log.debug("** moving boundary. start: " + isStart + ", unit: " + unit + ", count: " + count);
+
+                var boundaryIsStart = isStart;
+                if (collapse) {
+                    boundaryIsStart = (count >= 0);
+                    this.collapse(!boundaryIsStart);
+                }
+                var moveResult = movePositionBy(session.getRangeBoundaryPosition(this, boundaryIsStart), unit, count, characterOptions, wordOptions);
+                var newPos = moveResult.position;
+                this[boundaryIsStart ? "setStart" : "setEnd"](newPos.node, newPos.offset);
+                log.debug("*** MOVED " + moveResult.unitsMoved, newPos.inspect())
+                return moveResult.unitsMoved;
+            }
+        );
+    }
+
+    function createRangeTrimmer(isStart) {
+        return createEntryPointFunction(
+            function(session, characterOptions) {
+                characterOptions = createCharacterOptions(characterOptions);
+                var pos;
+                var it = createRangeCharacterIterator(session, this, characterOptions, !isStart);
+                var trimCharCount = 0;
+                while ( (pos = it.next()) && allWhiteSpaceRegex.test(pos.character) ) {
+                    ++trimCharCount;
+                }
+                it.dispose();
+                var trimmed = (trimCharCount > 0);
+                if (trimmed) {
+                    this[isStart ? "moveStart" : "moveEnd"](
+                        "character",
+                        isStart ? trimCharCount : -trimCharCount,
+                        { characterOptions: characterOptions }
+                    );
+                }
+                return trimmed;
+            }
+        );
+    }
+
+    extend(api.rangePrototype, {
+        moveStart: createRangeBoundaryMover(true, false),
+
+        moveEnd: createRangeBoundaryMover(false, false),
+
+        move: createRangeBoundaryMover(true, true),
+
+        trimStart: createRangeTrimmer(true),
+
+        trimEnd: createRangeTrimmer(false),
+
+        trim: createEntryPointFunction(
+            function(session, characterOptions) {
+                var startTrimmed = this.trimStart(characterOptions), endTrimmed = this.trimEnd(characterOptions);
+                return startTrimmed || endTrimmed;
+            }
+        ),
+
+        expand: createEntryPointFunction(
+            function(session, unit, expandOptions) {
+                var moved = false;
+                expandOptions = createOptions(expandOptions, defaultExpandOptions);
+                var characterOptions = createCharacterOptions(expandOptions.characterOptions);
+                if (!unit) {
+                    unit = CHARACTER;
+                }
+                if (unit == WORD) {
+                    var wordOptions = createWordOptions(expandOptions.wordOptions);
+                    var startPos = session.getRangeBoundaryPosition(this, true);
+                    var endPos = session.getRangeBoundaryPosition(this, false);
+
+                    var startTokenizedTextProvider = createTokenizedTextProvider(startPos, characterOptions, wordOptions);
+                    var startToken = startTokenizedTextProvider.nextEndToken();
+                    var newStartPos = startToken.chars[0].previousVisible();
+                    var endToken, newEndPos;
+
+                    if (this.collapsed) {
+                        endToken = startToken;
+                    } else {
+                        var endTokenizedTextProvider = createTokenizedTextProvider(endPos, characterOptions, wordOptions);
+                        endToken = endTokenizedTextProvider.previousStartToken();
+                    }
+                    newEndPos = endToken.chars[endToken.chars.length - 1];
+
+                    if (!newStartPos.equals(startPos)) {
+                        this.setStart(newStartPos.node, newStartPos.offset);
+                        moved = true;
+                    }
+                    if (newEndPos && !newEndPos.equals(endPos)) {
+                        this.setEnd(newEndPos.node, newEndPos.offset);
+                        moved = true;
+                    }
+
+                    if (expandOptions.trim) {
+                        if (expandOptions.trimStart) {
+                            moved = this.trimStart(characterOptions) || moved;
+                        }
+                        if (expandOptions.trimEnd) {
+                            moved = this.trimEnd(characterOptions) || moved;
+                        }
+                    }
+
+                    return moved;
+                } else {
+                    return this.moveEnd(CHARACTER, 1, expandOptions);
+                }
+            }
+        ),
+
+        text: createEntryPointFunction(
+            function(session, characterOptions) {
+                log.info("text. Transaction: " + session + ", characterOptions:", characterOptions);
+                return this.collapsed ?
+                    "" : getRangeCharacters(session, this, createCharacterOptions(characterOptions)).join("");
+            }
+        ),
+
+        selectCharacters: createEntryPointFunction(
+            function(session, containerNode, startIndex, endIndex, characterOptions) {
+                var moveOptions = { characterOptions: characterOptions };
+                if (!containerNode) {
+                    containerNode = getBody( this.getDocument() );
+                }
+                this.selectNodeContents(containerNode);
+                this.collapse(true);
+                this.moveStart("character", startIndex, moveOptions);
+                this.collapse(true);
+                this.moveEnd("character", endIndex - startIndex, moveOptions);
+            }
+        ),
+
+        // Character indexes are relative to the start of node
+        toCharacterRange: createEntryPointFunction(
+            function(session, containerNode, characterOptions) {
+                if (!containerNode) {
+                    containerNode = getBody( this.getDocument() );
+                }
+                var parent = containerNode.parentNode, nodeIndex = dom.getNodeIndex(containerNode);
+                var rangeStartsBeforeNode = (dom.comparePoints(this.startContainer, this.endContainer, parent, nodeIndex) == -1);
+                var rangeBetween = this.cloneRange();
+                var startIndex, endIndex;
+                if (rangeStartsBeforeNode) {
+                    rangeBetween.setStartAndEnd(this.startContainer, this.startOffset, parent, nodeIndex);
+                    startIndex = -rangeBetween.text(characterOptions).length;
+                } else {
+                    rangeBetween.setStartAndEnd(parent, nodeIndex, this.startContainer, this.startOffset);
+                    startIndex = rangeBetween.text(characterOptions).length;
+                }
+                endIndex = startIndex + this.text(characterOptions).length;
+    
+                return {
+                    start: startIndex,
+                    end: endIndex
+                };
+            }
+        ),
+
+        findText: createEntryPointFunction(
+            function(session, searchTermParam, findOptions) {
+                // Set up options
+                findOptions = createFindOptions(findOptions);
+    
+                // Create word options if we're matching whole words only
+                if (findOptions.wholeWordsOnly) {
+                    findOptions.wordOptions = createWordOptions(findOptions.wordOptions);
+    
+                    // We don't ever want trailing spaces for search results
+                    findOptions.wordOptions.includeTrailingSpace = false;
+                }
+    
+                var backward = isDirectionBackward(findOptions.direction);
+    
+                // Create a range representing the search scope if none was provided
+                var searchScopeRange = findOptions.withinRange;
+                if (!searchScopeRange) {
+                    searchScopeRange = api.createRange();
+                    searchScopeRange.selectNodeContents(this.getDocument());
+                }
+    
+                // Examine and prepare the search term
+                var searchTerm = searchTermParam, isRegex = false;
+                if (typeof searchTerm == "string") {
+                    if (!findOptions.caseSensitive) {
+                        searchTerm = searchTerm.toLowerCase();
+                    }
+                } else {
+                    isRegex = true;
+                }
+    
+                var initialPos = session.getRangeBoundaryPosition(this, !backward);
+    
+                // Adjust initial position if it lies outside the search scope
+                var comparison = searchScopeRange.comparePoint(initialPos.node, initialPos.offset);
+                
+                if (comparison === -1) {
+                    initialPos = session.getRangeBoundaryPosition(searchScopeRange, true);
+                } else if (comparison === 1) {
+                    initialPos = session.getRangeBoundaryPosition(searchScopeRange, false);
+                }
+    
+                var pos = initialPos;
+                var wrappedAround = false;
+    
+                // Try to find a match and ignore invalid ones
+                var findResult;
+                while (true) {
+                    findResult = findTextFromPosition(pos, searchTerm, isRegex, searchScopeRange, findOptions);
+    
+                    if (findResult) {
+                        if (findResult.valid) {
+                            this.setStartAndEnd(findResult.startPos.node, findResult.startPos.offset, findResult.endPos.node, findResult.endPos.offset);
+                            return true;
+                        } else {
+                            // We've found a match that is not a whole word, so we carry on searching from the point immediately
+                            // after the match
+                            pos = backward ? findResult.startPos : findResult.endPos;
+                        }
+                    } else if (findOptions.wrap && !wrappedAround) {
+                        // No result found but we're wrapping around and limiting the scope to the unsearched part of the range
+                        searchScopeRange = searchScopeRange.cloneRange();
+                        pos = session.getRangeBoundaryPosition(searchScopeRange, !backward);
+                        searchScopeRange.setBoundary(initialPos.node, initialPos.offset, backward);
+                        log.debug("Wrapping search. New search range is " + searchScopeRange.inspect());
+                        wrappedAround = true;
+                    } else {
+                        // Nothing found and we can't wrap around, so we're done
+                        return false;
+                    }
+                }
+            }
+        ),
+
+        pasteHtml: function(html) {
+            this.deleteContents();
+            if (html) {
+                var frag = this.createContextualFragment(html);
+                var lastChild = frag.lastChild;
+                this.insertNode(frag);
+                this.collapseAfter(lastChild);
+            }
+        }
+    });
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    // Extensions to the Rangy Selection object
+
+    function createSelectionTrimmer(methodName) {
+        return createEntryPointFunction(
+            function(session, characterOptions) {
+                var trimmed = false;
+                this.changeEachRange(function(range) {
+                    trimmed = range[methodName](characterOptions) || trimmed;
+                });
+                return trimmed;
+            }
+        );
+    }
+
+    extend(api.selectionPrototype, {
+        expand: createEntryPointFunction(
+            function(session, unit, expandOptions) {
+                this.changeEachRange(function(range) {
+                    range.expand(unit, expandOptions);
+                });
+            }
+        ),
+
+        move: createEntryPointFunction(
+            function(session, unit, count, options) {
+                var unitsMoved = 0;
+                if (this.focusNode) {
+                    this.collapse(this.focusNode, this.focusOffset);
+                    var range = this.getRangeAt(0);
+                    if (!options) {
+                        options = {};
+                    }
+                    options.characterOptions = createCaretCharacterOptions(options.characterOptions);
+                    unitsMoved = range.move(unit, count, options);
+                    log.debug("Selection move setting range " + range.inspect());
+                    this.setSingleRange(range);
+                    log.debug("Selection now " + this.inspect());
+                }
+                return unitsMoved;
+            }
+        ),
+
+        trimStart: createSelectionTrimmer("trimStart"),
+        trimEnd: createSelectionTrimmer("trimEnd"),
+        trim: createSelectionTrimmer("trim"),
+
+        selectCharacters: createEntryPointFunction(
+            function(session, containerNode, startIndex, endIndex, direction, characterOptions) {
+                var range = api.createRange(containerNode);
+                range.selectCharacters(containerNode, startIndex, endIndex, characterOptions);
+                this.setSingleRange(range, direction);
+            }
+        ),
+
+        saveCharacterRanges: createEntryPointFunction(
+            function(session, containerNode, characterOptions) {
+                var ranges = this.getAllRanges(), rangeCount = ranges.length;
+                var rangeInfos = [];
+    
+                var backward = rangeCount == 1 && this.isBackward();
+    
+                for (var i = 0, len = ranges.length; i < len; ++i) {
+                    rangeInfos[i] = {
+                        characterRange: ranges[i].toCharacterRange(containerNode, characterOptions),
+                        backward: backward,
+                        characterOptions: characterOptions
+                    };
+                }
+    
+                return rangeInfos;
+            }
+        ),
+
+        restoreCharacterRanges: createEntryPointFunction(
+            function(session, containerNode, saved) {
+                this.removeAllRanges();
+                for (var i = 0, len = saved.length, range, rangeInfo, characterRange; i < len; ++i) {
+                    rangeInfo = saved[i];
+                    characterRange = rangeInfo.characterRange;
+                    range = api.createRange(containerNode);
+                    range.selectCharacters(containerNode, characterRange.start, characterRange.end, rangeInfo.characterOptions);
+                    log.info("New selected range: " + range.inspect());
+                    this.addRange(range, rangeInfo.backward);
+                }
+            }
+        ),
+
+        text: createEntryPointFunction(
+            function(session, characterOptions) {
+                var rangeTexts = [];
+                for (var i = 0, len = this.rangeCount; i < len; ++i) {
+                    rangeTexts[i] = this.getRangeAt(i).text(characterOptions);
+                }
+                return rangeTexts.join("");
+            }
+        )
+    });
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+
+    // Extensions to the core rangy object
+
+    api.innerText = function(el, characterOptions) {
+        var range = api.createRange(el);
+        range.selectNodeContents(el);
+        var text = range.text(characterOptions);
+        log.debug("innerText is '" + text.replace(/\s/g, function(matched) { return "[" + matched.charCodeAt(0) + "]"; }) + "'");
+        return text;
+    };
+
+    api.createWordIterator = function(startNode, startOffset, iteratorOptions) {
+        var session = getSession();
+        iteratorOptions = createOptions(iteratorOptions, defaultWordIteratorOptions);
+        var characterOptions = createCharacterOptions(iteratorOptions.characterOptions);
+        var wordOptions = createWordOptions(iteratorOptions.wordOptions);
+        var startPos = session.getPosition(startNode, startOffset);
+        var tokenizedTextProvider = createTokenizedTextProvider(startPos, characterOptions, wordOptions);
+        var backward = isDirectionBackward(iteratorOptions.direction);
+
+        return {
+            next: function() {
+                return backward ? tokenizedTextProvider.previousStartToken() : tokenizedTextProvider.nextEndToken();
+            },
+
+            dispose: function() {
+                tokenizedTextProvider.dispose();
+                this.next = function() {};
+            }
+        };
+    };
+
+    /*----------------------------------------------------------------------------------------------------------------*/
+    
+    api.noMutation = function(func) {
+        var session = getSession();
+        func(session);
+        endSession();
+    };
+
+    api.noMutation.createEntryPointFunction = createEntryPointFunction;
+
+    api.textRange = {
+        isBlockNode: isBlockNode,
+        isCollapsedWhitespaceNode: isCollapsedWhitespaceNode,
+
+        createPosition: createEntryPointFunction(
+            function(session, node, offset) {
+                return session.getPosition(node, offset);
+            }
+        )
+    };
+});
 /* build:modularizeEnd */
\ No newline at end of file
diff --git a/src/js/modules/rangy-util.js b/src/modules/rangy-util.js
similarity index 96%
rename from src/js/modules/rangy-util.js
rename to src/modules/rangy-util.js
index bc36526c..658da9d5 100644
--- a/src/js/modules/rangy-util.js
+++ b/src/modules/rangy-util.js
@@ -1,106 +1,106 @@
-/**
- * Utilities module for Rangy.
- * A collection of common selection and range-related tasks, using Rangy.
- *
- * Part of Rangy, a cross-browser JavaScript range and selection library
- * http://code.google.com/p/rangy/
- *
- * Depends on Rangy core.
- *
- * Copyright %%build:year%%, Tim Down
- * Licensed under the MIT license.
- * Version: %%build:version%%
- * Build date: %%build:date%%
- */
-/* build:modularizeWithDependencies(["./rangy-core"]) */
-rangy.createModule("Util", ["WrappedSelection"], function(api, module) {
-    var rangeProto = api.rangePrototype;
-    var selProto = api.selectionPrototype;
-
-    selProto.pasteText = function(text) {
-        this.deleteFromDocument();
-        var range = this.getRangeAt(0);
-        var textNode = range.getDocument().createTextNode(text);
-        range.insertNode(textNode);
-        this.setSingleRange(range);
-    };
-
-    rangeProto.pasteText = function(text) {
-        this.deleteContents();
-        var textNode = this.getDocument().createTextNode(text);
-        this.insertNode(textNode);
-    };
-
-    selProto.pasteHtml = function(html) {
-        this.deleteFromDocument();
-        var range = this.getRangeAt(0);
-        var frag = this.createContextualFragment(html);
-        var lastNode = frag.lastChild;
-        range.insertNode(frag);
-        if (lastNode) {
-            range.setStartAfter(lastNode)
-        }
-        this.setSingleRange(range);
-    };
-
-    rangeProto.pasteHtml = function(html) {
-        this.deleteContents();
-        var frag = this.createContextualFragment(html);
-        this.insertNode(frag);
-    };
-
-    selProto.selectNodeContents = function(node) {
-        var range = api.createRange(this.win);
-        range.selectNodeContents(node);
-        this.setSingleRange(range);
-    };
-
-    api.createRangeFromNode = function(node) {
-        var range = api.createRange(node);
-        range.selectNode(node);
-        return range;
-    };
-
-    api.createRangeFromNodeContents = function(node) {
-        var range = api.createRange(node);
-        range.selectNodeContents(node);
-        return range;
-    };
-
-    api.selectNodeContents = function(node) {
-        api.getSelection().selectNodeContents(node);
-    };
-
-    rangeProto.selectSelectedTextElements = (function() {
-        function isInlineElement(node) {
-            return node.nodeType == 1 && api.dom.getComputedStyleProperty(node, "display") == "inline";
-        }
-
-        function getOutermostNodeContainingText(range, node) {
-            var outerNode = null;
-            var nodeRange = range.cloneRange();
-            nodeRange.selectNode(node);
-            if (nodeRange.toString() !== "") {
-                while ( (node = node.parentNode) && isInlineElement(node) && range.containsNodeText(node) ) {
-                    outerNode = node;
-                }
-            }
-            return outerNode;
-        }
-
-        return function() {
-            var startNode = getOutermostNodeContainingText(this, this.startContainer);
-            if (startNode) {
-                this.setStartBefore(startNode);
-            }
-
-            var endNode = getOutermostNodeContainingText(this, this.endContainer);
-            if (endNode) {
-                this.setEndAfter(endNode);
-            }
-        };
-    })();
-
-    // TODO: simple selection save/restore
-});
+/**
+ * Utilities module for Rangy.
+ * A collection of common selection and range-related tasks, using Rangy.
+ *
+ * Part of Rangy, a cross-browser JavaScript range and selection library
+ * http://code.google.com/p/rangy/
+ *
+ * Depends on Rangy core.
+ *
+ * Copyright %%build:year%%, Tim Down
+ * Licensed under the MIT license.
+ * Version: %%build:version%%
+ * Build date: %%build:date%%
+ */
+/* build:modularizeWithDependencies(["./rangy-core"]) */
+rangy.createModule("Util", ["WrappedSelection"], function(api, module) {
+    var rangeProto = api.rangePrototype;
+    var selProto = api.selectionPrototype;
+
+    selProto.pasteText = function(text) {
+        this.deleteFromDocument();
+        var range = this.getRangeAt(0);
+        var textNode = range.getDocument().createTextNode(text);
+        range.insertNode(textNode);
+        this.setSingleRange(range);
+    };
+
+    rangeProto.pasteText = function(text) {
+        this.deleteContents();
+        var textNode = this.getDocument().createTextNode(text);
+        this.insertNode(textNode);
+    };
+
+    selProto.pasteHtml = function(html) {
+        this.deleteFromDocument();
+        var range = this.getRangeAt(0);
+        var frag = this.createContextualFragment(html);
+        var lastNode = frag.lastChild;
+        range.insertNode(frag);
+        if (lastNode) {
+            range.setStartAfter(lastNode)
+        }
+        this.setSingleRange(range);
+    };
+
+    rangeProto.pasteHtml = function(html) {
+        this.deleteContents();
+        var frag = this.createContextualFragment(html);
+        this.insertNode(frag);
+    };
+
+    selProto.selectNodeContents = function(node) {
+        var range = api.createRange(this.win);
+        range.selectNodeContents(node);
+        this.setSingleRange(range);
+    };
+
+    api.createRangeFromNode = function(node) {
+        var range = api.createRange(node);
+        range.selectNode(node);
+        return range;
+    };
+
+    api.createRangeFromNodeContents = function(node) {
+        var range = api.createRange(node);
+        range.selectNodeContents(node);
+        return range;
+    };
+
+    api.selectNodeContents = function(node) {
+        api.getSelection().selectNodeContents(node);
+    };
+
+    rangeProto.selectSelectedTextElements = (function() {
+        function isInlineElement(node) {
+            return node.nodeType == 1 && api.dom.getComputedStyleProperty(node, "display") == "inline";
+        }
+
+        function getOutermostNodeContainingText(range, node) {
+            var outerNode = null;
+            var nodeRange = range.cloneRange();
+            nodeRange.selectNode(node);
+            if (nodeRange.toString() !== "") {
+                while ( (node = node.parentNode) && isInlineElement(node) && range.containsNodeText(node) ) {
+                    outerNode = node;
+                }
+            }
+            return outerNode;
+        }
+
+        return function() {
+            var startNode = getOutermostNodeContainingText(this, this.startContainer);
+            if (startNode) {
+                this.setStartBefore(startNode);
+            }
+
+            var endNode = getOutermostNodeContainingText(this, this.endContainer);
+            if (endNode) {
+                this.setEndAfter(endNode);
+            }
+        };
+    })();
+
+    // TODO: simple selection save/restore
+});
 /* build:modularizeEnd */
\ No newline at end of file
diff --git a/test/boldifier.html b/test/boldifier.html
index 2071b877..83f4e792 100644
--- a/test/boldifier.html
+++ b/test/boldifier.html
@@ -11,15 +11,15 @@
         log4javascript.setShowStackTraces(true);
     </script>
 <!--
-    <script type="text/javascript" src="../src/js/rangy.js"></script>
+    <script type="text/javascript" src="../src/rangy.js"></script>
 -->
-    <script type="text/javascript" src="../src/js/core/core.js"></script>
-    <script type="text/javascript" src="../src/js/core/dom.js"></script>
-    <script type="text/javascript" src="../src/js/core/domrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedselection.js"></script>
-    <script type="text/javascript" src="../src/js/modules/textmutation.js"></script>
-    <script type="text/javascript" src="../src/js/modules/boldifier.js"></script>
+    <script type="text/javascript" src="../src/core/core.js"></script>
+    <script type="text/javascript" src="../src/core/dom.js"></script>
+    <script type="text/javascript" src="../src/core/domrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedselection.js"></script>
+    <script type="text/javascript" src="../src/modules/textmutation.js"></script>
+    <script type="text/javascript" src="../src/modules/boldifier.js"></script>
     <script type="text/javascript">
 
         var cssClassMutator1, cssClassMutator2, boldifier;
diff --git a/test/classapplier.html b/test/classapplier.html
index fc69a83e..497e5127 100644
--- a/test/classapplier.html
+++ b/test/classapplier.html
@@ -10,12 +10,12 @@
         var log = log4javascript.getRootLogger();
         log4javascript.setShowStackTraces(true);
     </script>
-    <script type="text/javascript" src="../src/js/core/core.js"></script>
-    <script type="text/javascript" src="../src/js/core/dom.js"></script>
-    <script type="text/javascript" src="../src/js/core/domrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedselection.js"></script>
-    <script type="text/javascript" src="../src/js/modules/rangy-classapplier.js"></script>
+    <script type="text/javascript" src="../src/core/core.js"></script>
+    <script type="text/javascript" src="../src/core/dom.js"></script>
+    <script type="text/javascript" src="../src/core/domrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedselection.js"></script>
+    <script type="text/javascript" src="../src/modules/rangy-classapplier.js"></script>
     <script type="text/javascript">
 
         var highlightApplier, idApplier;
diff --git a/test/classappliertests.html b/test/classappliertests.html
index a80a2837..c1fc8361 100644
--- a/test/classappliertests.html
+++ b/test/classappliertests.html
@@ -20,12 +20,12 @@
             xn.test.enableStackTraces = true;
         </script>
 
-        <script type="text/javascript" src="../src/js/core/core.js"></script>
-        <script type="text/javascript" src="../src/js/core/dom.js"></script>
-        <script type="text/javascript" src="../src/js/core/domrange.js"></script>
-        <script type="text/javascript" src="../src/js/core/wrappedrange.js"></script>
-        <script type="text/javascript" src="../src/js/core/wrappedselection.js"></script>
-        <script type="text/javascript" src="../src/js/modules/rangy-classapplier.js"></script>
+        <script type="text/javascript" src="../src/core/core.js"></script>
+        <script type="text/javascript" src="../src/core/dom.js"></script>
+        <script type="text/javascript" src="../src/core/domrange.js"></script>
+        <script type="text/javascript" src="../src/core/wrappedrange.js"></script>
+        <script type="text/javascript" src="../src/core/wrappedselection.js"></script>
+        <script type="text/javascript" src="../src/modules/rangy-classapplier.js"></script>
         <script type="text/javascript" src="classappliertests.js"></script>
         <link rel="stylesheet" type="text/css" href="tests.css"/>
     </head>
diff --git a/test/commandnewtests.html b/test/commandnewtests.html
index 0768028c..823baa23 100644
--- a/test/commandnewtests.html
+++ b/test/commandnewtests.html
@@ -19,13 +19,13 @@
 			xn.test.enableStackTraces = true;
 		</script>
 
-        <script type="text/javascript" src="../src/js/core/core.js"></script>
-        <script type="text/javascript" src="../src/js/core/dom.js"></script>
-        <script type="text/javascript" src="../src/js/core/domrange.js"></script>
-        <script type="text/javascript" src="../src/js/core/wrappedrange.js"></script>
-        <script type="text/javascript" src="../src/js/core/wrappedselection.js"></script>
-        <script type="text/javascript" src="../src/js/modules/rangy-commands_new.js"></script>
-        <script type="text/javascript" src="../src/js/modules/commands/rangy-bold_new.js"></script>
+        <script type="text/javascript" src="../src/core/core.js"></script>
+        <script type="text/javascript" src="../src/core/dom.js"></script>
+        <script type="text/javascript" src="../src/core/domrange.js"></script>
+        <script type="text/javascript" src="../src/core/wrappedrange.js"></script>
+        <script type="text/javascript" src="../src/core/wrappedselection.js"></script>
+        <script type="text/javascript" src="../src/modules/rangy-commands_new.js"></script>
+        <script type="text/javascript" src="../src/modules/commands/rangy-bold_new.js"></script>
         <script type="text/javascript" src="implementation.js"></script>
         <script type="text/javascript" src="commandnewtests.js"></script>
 		<link rel="stylesheet" type="text/css" href="tests.css"/>
diff --git a/test/commandtests.html b/test/commandtests.html
index 950f6ade..d7eb3017 100644
--- a/test/commandtests.html
+++ b/test/commandtests.html
@@ -18,13 +18,13 @@
 			xn.test.enableStackTraces = true;
 		</script>
 
-        <script type="text/javascript" src="../src/js/core/core.js"></script>
-        <script type="text/javascript" src="../src/js/core/dom.js"></script>
-        <script type="text/javascript" src="../src/js/core/domrange.js"></script>
-        <script type="text/javascript" src="../src/js/core/wrappedrange.js"></script>
-        <script type="text/javascript" src="../src/js/core/wrappedselection.js"></script>
-        <script type="text/javascript" src="../src/js/modules/rangy-commands.js"></script>
-        <script type="text/javascript" src="../src/js/modules/commands/rangy-bold.js"></script>
+        <script type="text/javascript" src="../src/core/core.js"></script>
+        <script type="text/javascript" src="../src/core/dom.js"></script>
+        <script type="text/javascript" src="../src/core/domrange.js"></script>
+        <script type="text/javascript" src="../src/core/wrappedrange.js"></script>
+        <script type="text/javascript" src="../src/core/wrappedselection.js"></script>
+        <script type="text/javascript" src="../src/modules/rangy-commands.js"></script>
+        <script type="text/javascript" src="../src/modules/commands/rangy-bold.js"></script>
         <script type="text/javascript" src="implementation.js"></script>
         <script type="text/javascript" src="commandtests.js"></script>
 		<link rel="stylesheet" type="text/css" href="tests.css"/>
diff --git a/test/controlrange.html b/test/controlrange.html
index 289afca5..f8e48e35 100644
--- a/test/controlrange.html
+++ b/test/controlrange.html
@@ -11,11 +11,11 @@
         //log4javascript.setEnabled(false);
     </script>
 
-    <script type="text/javascript" src="../src/js/core/core.js"></script>
-    <script type="text/javascript" src="../src/js/core/dom.js"></script>
-    <script type="text/javascript" src="../src/js/core/domrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedselection.js"></script>
+    <script type="text/javascript" src="../src/core/core.js"></script>
+    <script type="text/javascript" src="../src/core/dom.js"></script>
+    <script type="text/javascript" src="../src/core/domrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedselection.js"></script>
     <script type="text/javascript">
         //document.selection.empty();
 
diff --git a/test/controlrange2.html b/test/controlrange2.html
index 8756e53e..f9a8cb26 100644
--- a/test/controlrange2.html
+++ b/test/controlrange2.html
@@ -11,11 +11,11 @@
         //log4javascript.setEnabled(false);
     </script>
 
-    <script type="text/javascript" src="../src/js/core/core.js"></script>
-    <script type="text/javascript" src="../src/js/core/dom.js"></script>
-    <script type="text/javascript" src="../src/js/core/domrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedselection.js"></script>
+    <script type="text/javascript" src="../src/core/core.js"></script>
+    <script type="text/javascript" src="../src/core/dom.js"></script>
+    <script type="text/javascript" src="../src/core/domrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedselection.js"></script>
     <script type="text/javascript">
         document.selection.empty();
 
diff --git a/test/domrange.html b/test/domrange.html
index 85e9dc66..19ad9290 100644
--- a/test/domrange.html
+++ b/test/domrange.html
@@ -16,11 +16,11 @@
         });*/
     </script>
 
-    <script type="text/javascript" src="../src/js/core/core.js"></script>
-    <script type="text/javascript" src="../src/js/core/dom.js"></script>
-    <script type="text/javascript" src="../src/js/core/domrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedselection.js"></script>
+    <script type="text/javascript" src="../src/core/core.js"></script>
+    <script type="text/javascript" src="../src/core/dom.js"></script>
+    <script type="text/javascript" src="../src/core/domrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedselection.js"></script>
 <!--
     <script type="text/javascript" src="../build/rangy-core.js"></script>
 -->
diff --git a/test/featuretests.html b/test/featuretests.html
index 5e4592e9..baeaabe8 100644
--- a/test/featuretests.html
+++ b/test/featuretests.html
@@ -21,11 +21,11 @@
         <script type="text/javascript">
             //log4javascript.setEnabled(false);
         </script>
-        <script type="text/javascript" src="../src/js/core/core.js"></script>
-        <script type="text/javascript" src="../src/js/core/dom.js"></script>
-        <script type="text/javascript" src="../src/js/core/domrange.js"></script>
-        <script type="text/javascript" src="../src/js/core/wrappedrange.js"></script>
-        <script type="text/javascript" src="../src/js/core/wrappedselection.js"></script>
+        <script type="text/javascript" src="../src/core/core.js"></script>
+        <script type="text/javascript" src="../src/core/dom.js"></script>
+        <script type="text/javascript" src="../src/core/domrange.js"></script>
+        <script type="text/javascript" src="../src/core/wrappedrange.js"></script>
+        <script type="text/javascript" src="../src/core/wrappedselection.js"></script>
         <script type="text/javascript" src="featuretests.js"></script>
         <link rel="stylesheet" type="text/css" href="tests.css"/>
     </head>
diff --git a/test/highlightertests.html b/test/highlightertests.html
index cec579c7..6f07cf80 100644
--- a/test/highlightertests.html
+++ b/test/highlightertests.html
@@ -20,13 +20,13 @@
             xn.test.enableStackTraces = true;
         </script>
 
-        <script type="text/javascript" src="../src/js/core/core.js"></script>
-        <script type="text/javascript" src="../src/js/core/dom.js"></script>
-        <script type="text/javascript" src="../src/js/core/domrange.js"></script>
-        <script type="text/javascript" src="../src/js/core/wrappedrange.js"></script>
-        <script type="text/javascript" src="../src/js/core/wrappedselection.js"></script>
-        <script type="text/javascript" src="../src/js/modules/rangy-classapplier.js"></script>
-        <script type="text/javascript" src="../src/js/modules/rangy-highlighter.js"></script>
+        <script type="text/javascript" src="../src/core/core.js"></script>
+        <script type="text/javascript" src="../src/core/dom.js"></script>
+        <script type="text/javascript" src="../src/core/domrange.js"></script>
+        <script type="text/javascript" src="../src/core/wrappedrange.js"></script>
+        <script type="text/javascript" src="../src/core/wrappedselection.js"></script>
+        <script type="text/javascript" src="../src/modules/rangy-classapplier.js"></script>
+        <script type="text/javascript" src="../src/modules/rangy-highlighter.js"></script>
         <script type="text/javascript" src="highlightertests.js"></script>
         <link rel="stylesheet" type="text/css" href="tests.css"/>
     </head>
diff --git a/test/mutator.html b/test/mutator.html
index 3a3f2e71..aa4ea722 100644
--- a/test/mutator.html
+++ b/test/mutator.html
@@ -11,14 +11,14 @@
         log4javascript.setShowStackTraces(true);
     </script>
 <!--
-    <script type="text/javascript" src="../src/js/rangy.js"></script>
+    <script type="text/javascript" src="../src/rangy.js"></script>
 -->
-    <script type="text/javascript" src="../src/js/core/core.js"></script>
-    <script type="text/javascript" src="../src/js/core/dom.js"></script>
-    <script type="text/javascript" src="../src/js/core/domrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedselection.js"></script>
-    <script type="text/javascript" src="../src/js/modules/textmutation.js"></script>
+    <script type="text/javascript" src="../src/core/core.js"></script>
+    <script type="text/javascript" src="../src/core/dom.js"></script>
+    <script type="text/javascript" src="../src/core/domrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedselection.js"></script>
+    <script type="text/javascript" src="../src/modules/textmutation.js"></script>
     <script type="text/javascript">
 
         var cssClassMutator1, cssClassMutator2;
diff --git a/test/mylib.html b/test/mylib.html
index 172d8f60..b6177906 100644
--- a/test/mylib.html
+++ b/test/mylib.html
@@ -8,7 +8,7 @@
         //log4javascript.getRootLogger().addAppender(new log4javascript.InPageAppender());
     </script>
 
-    <script type="text/javascript" src="../src/js/complete.js"></script>
+    <script type="text/javascript" src="../src/complete.js"></script>
     <script type="text/javascript" src="mylib.js"></script>
     <script type="text/javascript" src="mylib_ranges.js"></script>
     <script type="text/javascript">
diff --git a/test/rangetests.html b/test/rangetests.html
index 2f546703..39e39343 100644
--- a/test/rangetests.html
+++ b/test/rangetests.html
@@ -21,10 +21,10 @@
             log4javascript.setEnabled(false);
         </script>
         <![endif]-->
-        <script type="text/javascript" src="../src/js/core/core.js"></script>
-        <script type="text/javascript" src="../src/js/core/dom.js"></script>
-        <script type="text/javascript" src="../src/js/core/domrange.js"></script>
-        <script type="text/javascript" src="../src/js/core/wrappedrange.js"></script>
+        <script type="text/javascript" src="../src/core/core.js"></script>
+        <script type="text/javascript" src="../src/core/dom.js"></script>
+        <script type="text/javascript" src="../src/core/domrange.js"></script>
+        <script type="text/javascript" src="../src/core/wrappedrange.js"></script>
         <script type="text/javascript" src="rangetests.js"></script>
         <link rel="stylesheet" type="text/css" href="tests.css"/>
     </head>
diff --git a/test/saverestore.html b/test/saverestore.html
index c6a23324..90d1a641 100644
--- a/test/saverestore.html
+++ b/test/saverestore.html
@@ -10,12 +10,12 @@
         var log = log4javascript.getRootLogger();
         log4javascript.setShowStackTraces(true);
     </script>
-    <script type="text/javascript" src="../src/js/core/core.js"></script>
-    <script type="text/javascript" src="../src/js/core/dom.js"></script>
-    <script type="text/javascript" src="../src/js/core/domrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedselection.js"></script>
-    <script type="text/javascript" src="../src/js/modules/rangy-selectionsaverestore.js"></script>
+    <script type="text/javascript" src="../src/core/core.js"></script>
+    <script type="text/javascript" src="../src/core/dom.js"></script>
+    <script type="text/javascript" src="../src/core/domrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedselection.js"></script>
+    <script type="text/javascript" src="../src/modules/rangy-selectionsaverestore.js"></script>
     <script type="text/javascript">
         var saveSelection = function() {
             alert("Your browser does not support the required features")
diff --git a/test/selectionsaverestoretests.html b/test/selectionsaverestoretests.html
index 43d29b06..e1faba0f 100644
--- a/test/selectionsaverestoretests.html
+++ b/test/selectionsaverestoretests.html
@@ -20,12 +20,12 @@
             xn.test.enableStackTraces = true;
         </script>
 
-        <script type="text/javascript" src="../src/js/core/core.js"></script>
-        <script type="text/javascript" src="../src/js/core/dom.js"></script>
-        <script type="text/javascript" src="../src/js/core/domrange.js"></script>
-        <script type="text/javascript" src="../src/js/core/wrappedrange.js"></script>
-        <script type="text/javascript" src="../src/js/core/wrappedselection.js"></script>
-        <script type="text/javascript" src="../src/js/modules/rangy-selectionsaverestore.js"></script>
+        <script type="text/javascript" src="../src/core/core.js"></script>
+        <script type="text/javascript" src="../src/core/dom.js"></script>
+        <script type="text/javascript" src="../src/core/domrange.js"></script>
+        <script type="text/javascript" src="../src/core/wrappedrange.js"></script>
+        <script type="text/javascript" src="../src/core/wrappedselection.js"></script>
+        <script type="text/javascript" src="../src/modules/rangy-selectionsaverestore.js"></script>
         <script type="text/javascript" src="selectionsaverestoretests.js"></script>
         <link rel="stylesheet" type="text/css" href="tests.css"/>
     </head>
diff --git a/test/selectiontests.html b/test/selectiontests.html
index 650156b6..97596cbb 100644
--- a/test/selectiontests.html
+++ b/test/selectiontests.html
@@ -20,11 +20,11 @@
             xn.test.enableStackTraces = true;
         </script>
 
-        <script type="text/javascript" src="../src/js/core/core.js"></script>
-        <script type="text/javascript" src="../src/js/core/dom.js"></script>
-        <script type="text/javascript" src="../src/js/core/domrange.js"></script>
-        <script type="text/javascript" src="../src/js/core/wrappedrange.js"></script>
-        <script type="text/javascript" src="../src/js/core/wrappedselection.js"></script>
+        <script type="text/javascript" src="../src/core/core.js"></script>
+        <script type="text/javascript" src="../src/core/dom.js"></script>
+        <script type="text/javascript" src="../src/core/domrange.js"></script>
+        <script type="text/javascript" src="../src/core/wrappedrange.js"></script>
+        <script type="text/javascript" src="../src/core/wrappedselection.js"></script>
 
         <script type="text/javascript" src="selectiontests.js"></script>
         <link rel="stylesheet" type="text/css" href="tests.css"/>
diff --git a/test/serializer.html b/test/serializer.html
index f3b9e648..1105ceff 100644
--- a/test/serializer.html
+++ b/test/serializer.html
@@ -4,12 +4,12 @@
 <head>
     <title>Serializer Test</title>
     <script type="text/javascript" src="../external/log4javascript.js"></script>
-    <script type="text/javascript" src="../src/js/core/core.js"></script>
-    <script type="text/javascript" src="../src/js/core/dom.js"></script>
-    <script type="text/javascript" src="../src/js/core/domrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedselection.js"></script>
-    <script type="text/javascript" src="../src/js/modules/rangy-serializer.js"></script>
+    <script type="text/javascript" src="../src/core/core.js"></script>
+    <script type="text/javascript" src="../src/core/dom.js"></script>
+    <script type="text/javascript" src="../src/core/domrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedselection.js"></script>
+    <script type="text/javascript" src="../src/modules/rangy-serializer.js"></script>
     <script type="text/javascript">
         function restoreSelection() {
             rangy.init();
diff --git a/test/serializertests.html b/test/serializertests.html
index 7a1ce2c5..9c4852a2 100644
--- a/test/serializertests.html
+++ b/test/serializertests.html
@@ -20,12 +20,12 @@
             xn.test.enableStackTraces = true;
         </script>
 
-        <script type="text/javascript" src="../src/js/core/core.js"></script>
-        <script type="text/javascript" src="../src/js/core/dom.js"></script>
-        <script type="text/javascript" src="../src/js/core/domrange.js"></script>
-        <script type="text/javascript" src="../src/js/core/wrappedrange.js"></script>
-        <script type="text/javascript" src="../src/js/core/wrappedselection.js"></script>
-        <script type="text/javascript" src="../src/js/modules/rangy-serializer.js"></script>
+        <script type="text/javascript" src="../src/core/core.js"></script>
+        <script type="text/javascript" src="../src/core/dom.js"></script>
+        <script type="text/javascript" src="../src/core/domrange.js"></script>
+        <script type="text/javascript" src="../src/core/wrappedrange.js"></script>
+        <script type="text/javascript" src="../src/core/wrappedselection.js"></script>
+        <script type="text/javascript" src="../src/modules/rangy-serializer.js"></script>
         <script type="text/javascript" src="serializertests.js"></script>
         <link rel="stylesheet" type="text/css" href="tests.css"/>
     </head>
diff --git a/test/textrangeperformance.html b/test/textrangeperformance.html
index d9aaa04f..e7baad3d 100644
--- a/test/textrangeperformance.html
+++ b/test/textrangeperformance.html
@@ -6,12 +6,12 @@
         <script type="text/javascript" src="../external/log4javascript_stub.js"></script>
         <script type="text/javascript" src="../external/jshashtable.js"></script>
 
-        <script type="text/javascript" src="../src/js/core/core.js"></script>
-        <script type="text/javascript" src="../src/js/core/dom.js"></script>
-        <script type="text/javascript" src="../src/js/core/domrange.js"></script>
-        <script type="text/javascript" src="../src/js/core/wrappedrange.js"></script>
-        <script type="text/javascript" src="../src/js/core/wrappedselection.js"></script>
-        <script type="text/javascript" src="../src/js/modules/rangy-textrange.js"></script>
+        <script type="text/javascript" src="../src/core/core.js"></script>
+        <script type="text/javascript" src="../src/core/dom.js"></script>
+        <script type="text/javascript" src="../src/core/domrange.js"></script>
+        <script type="text/javascript" src="../src/core/wrappedrange.js"></script>
+        <script type="text/javascript" src="../src/core/wrappedselection.js"></script>
+        <script type="text/javascript" src="../src/modules/rangy-textrange.js"></script>
         <script type="text/javascript" src="textrangetests.js"></script>
         <link rel="stylesheet" type="text/css" href="tests.css"/>
         <script>
diff --git a/test/textrangeperformancetests.html b/test/textrangeperformancetests.html
index fa311f31..36e9b71c 100644
--- a/test/textrangeperformancetests.html
+++ b/test/textrangeperformancetests.html
@@ -20,11 +20,11 @@
         <script type="text/javascript">
             //log4javascript.setEnabled(false);
         </script>
-        <script type="text/javascript" src="../src/js/core/core.js"></script>
-        <script type="text/javascript" src="../src/js/core/dom.js"></script>
-        <script type="text/javascript" src="../src/js/core/domrange.js"></script>
-        <script type="text/javascript" src="../src/js/core/wrappedrange.js"></script>
-        <script type="text/javascript" src="../src/js/core/wrappedselection.js"></script>
+        <script type="text/javascript" src="../src/core/core.js"></script>
+        <script type="text/javascript" src="../src/core/dom.js"></script>
+        <script type="text/javascript" src="../src/core/domrange.js"></script>
+        <script type="text/javascript" src="../src/core/wrappedrange.js"></script>
+        <script type="text/javascript" src="../src/core/wrappedselection.js"></script>
         <script type="text/javascript" src="textrangeperformancetests.js"></script>
         <link rel="stylesheet" type="text/css" href="tests.css"/>
     </head>
diff --git a/test/textranges.html b/test/textranges.html
index 82869628..75115e37 100644
--- a/test/textranges.html
+++ b/test/textranges.html
@@ -9,11 +9,11 @@
         var log = log4javascript.getRootLogger();
         log4javascript.setShowStackTraces(true);
     </script>
-    <script type="text/javascript" src="../src/js/core/core.js"></script>
-    <script type="text/javascript" src="../src/js/core/dom.js"></script>
-    <script type="text/javascript" src="../src/js/core/domrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedrange.js"></script>
-    <script type="text/javascript" src="../src/js/core/wrappedselection.js"></script>
+    <script type="text/javascript" src="../src/core/core.js"></script>
+    <script type="text/javascript" src="../src/core/dom.js"></script>
+    <script type="text/javascript" src="../src/core/domrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedrange.js"></script>
+    <script type="text/javascript" src="../src/core/wrappedselection.js"></script>
     <script type="text/javascript">
         window.onload = function() {
             rangy.init();
diff --git a/test/textrangetests-old.html b/test/textrangetests-old.html
index 1430c0b7..944fdf19 100644
--- a/test/textrangetests-old.html
+++ b/test/textrangetests-old.html
@@ -20,12 +20,12 @@
             xn.test.enableStackTraces = true;
         </script>
 
-        <script type="text/javascript" src="../src/js/core/core.js"></script>
-        <script type="text/javascript" src="../src/js/core/dom.js"></script>
-        <script type="text/javascript" src="../src/js/core/domrange.js"></script>
-        <script type="text/javascript" src="../src/js/core/wrappedrange.js"></script>
-        <script type="text/javascript" src="../src/js/core/wrappedselection.js"></script>
-        <script type="text/javascript" src="../src/js/modules/rangy-textrange-old.js"></script>
+        <script type="text/javascript" src="../src/core/core.js"></script>
+        <script type="text/javascript" src="../src/core/dom.js"></script>
+        <script type="text/javascript" src="../src/core/domrange.js"></script>
+        <script type="text/javascript" src="../src/core/wrappedrange.js"></script>
+        <script type="text/javascript" src="../src/core/wrappedselection.js"></script>
+        <script type="text/javascript" src="../src/modules/rangy-textrange-old.js"></script>
         <script type="text/javascript" src="textrangetests-old.js"></script>
         <link rel="stylesheet" type="text/css" href="tests.css"/>
     </head>
diff --git a/test/textrangetests.html b/test/textrangetests.html
index e366efda..dfeebab8 100644
--- a/test/textrangetests.html
+++ b/test/textrangetests.html
@@ -21,12 +21,12 @@
             //xn.test.disableLogging = true;
         </script>
 
-        <script type="text/javascript" src="../src/js/core/core.js"></script>
-        <script type="text/javascript" src="../src/js/core/dom.js"></script>
-        <script type="text/javascript" src="../src/js/core/domrange.js"></script>
-        <script type="text/javascript" src="../src/js/core/wrappedrange.js"></script>
-        <script type="text/javascript" src="../src/js/core/wrappedselection.js"></script>
-        <script type="text/javascript" src="../src/js/modules/rangy-textrange.js"></script>
+        <script type="text/javascript" src="../src/core/core.js"></script>
+        <script type="text/javascript" src="../src/core/dom.js"></script>
+        <script type="text/javascript" src="../src/core/domrange.js"></script>
+        <script type="text/javascript" src="../src/core/wrappedrange.js"></script>
+        <script type="text/javascript" src="../src/core/wrappedselection.js"></script>
+        <script type="text/javascript" src="../src/modules/rangy-textrange.js"></script>
         <script type="text/javascript" src="textrangetests.js"></script>
         <link rel="stylesheet" type="text/css" href="tests.css"/>
     </head>