Better nbsp handling: visual nbsp + selection tools now paste space instead of nbsp if it was originally a space

butterfly/__init__.py

@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-__version__ = '1.5.9'
+__version__ = '1.5.10'
 
 
 import os

butterfly/sass/_term_styles.sass

@@ -38,3 +38,6 @@ $bg: #000 !default
 .blur .cursor.reverse-video
   background: none
 
+.nbsp
+  @extend .underline
+  @extend .fg-color-1

butterfly/static/ext.js

@@ -135,7 +135,7 @@
     };
 
     Selection.prototype.text = function() {
-      return this.selection.toString();
+      return this.selection.toString().replace(/\u00A0/g, ' ').replace(/\u2007/, ' ');
     };
 
     Selection.prototype.up = function() {

butterfly/static/main.css

@@ -186,10 +186,10 @@ html, body {
   .bg-color-1.reverse-video {
     color: #cc0000 !important; }
 
-.fg-color-1 {
+.fg-color-1, .nbsp {
   color: #cc0000;
   text-shadow: 0 0 6px rgba(204, 0, 0, 0.5); }
-  .fg-color-1.reverse-video {
+  .fg-color-1.reverse-video, .reverse-video.nbsp {
     background-color: #cc0000 !important; }
 
 .bg-color-2 {
@@ -3058,7 +3058,7 @@ html, body {
 .bold {
   font-weight: bold; }
 
-.underline {
+.underline, .nbsp {
   text-decoration: underline; }
 
 .blink {
@@ -3073,3 +3073,4 @@ html, body {
 
 .blur .cursor.reverse-video {
   background: none; }
+

butterfly/static/main.js

@@ -526,7 +526,9 @@
                 out += ">";
                 break;
               default:
-                if (ch <= " ") {
+                if (ch === " ") {
+                  out += '<span class="nbsp">\u2007</span>';
+                } else if (ch <= " ") {
                   out += "&nbsp;";
                 } else {
                   if (("\uff00" < ch && ch < "\uffef")) {

coffees/ext/selection.coffee

@@ -78,7 +78,7 @@ class Selection
     @clear()
 
   text: ->
-    @selection.toString()
+    @selection.toString().replace(/\u00A0/g, ' ').replace(/\u2007/, ' ')
 
   up: ->
     @go -1

coffees/term.coffee

@@ -453,7 +453,9 @@ class Terminal
             when ">"
               out += ">"
             else
-              if ch <= " "
+              if ch == " "
+                out += '<span class="nbsp">\u2007</span>'
+              else if ch <= " "
                 out += "&nbsp;"
               else
                 i++ if "\uff00" < ch < "\uffef"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "butterfly",
-  "version": "1.5.5",
+  "version": "1.5.10",
   "description": "A sleek web based terminal emulator",
   "repository": {
     "type": "git",