X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetSpace.cpp;h=90d171e2d40570c6330fd308565d115735d243f0;hb=3934f4a36f0402612206cfc0abe0b0b62166214b;hp=a419a684648477620ed6dbccd0a6f846ebe5f9f1;hpb=11e7cc23448610d17e998d3cc2ee6f284a330ba4;p=lyx.git

diff --git a/src/insets/InsetSpace.cpp b/src/insets/InsetSpace.cpp
index a419a68464..90d171e2d4 100644
--- a/src/insets/InsetSpace.cpp
+++ b/src/insets/InsetSpace.cpp
@@ -70,6 +70,9 @@ docstring InsetSpace::toolTip(BufferView const &, int, int) const
 	case InsetSpaceParams::PROTECTED:
 		message = _("Protected Space");
 		break;
+	case InsetSpaceParams::VISIBLE:
+		message = _("Visible Space");
+		break;
 	case InsetSpaceParams::THIN:
 		message = _("Thin Space");
 		break;
@@ -83,7 +86,7 @@ docstring InsetSpace::toolTip(BufferView const &, int, int) const
 		message = _("Quad Space");
 		break;
 	case InsetSpaceParams::QQUAD:
-		message = _(" Double Quad Space");
+		message = _("Double Quad Space");
 		break;
 	case InsetSpaceParams::ENSPACE:
 		message = _("Enspace");
@@ -144,6 +147,7 @@ void InsetSpace::doDispatch(Cursor & cur, FuncRequest & cmd)
 	switch (cmd.action()) {
 
 	case LFUN_INSET_MODIFY:
+		cur.recordUndo();
 		string2params(to_utf8(cmd.argument()), params_);
 		break;
 
@@ -168,8 +172,11 @@ bool InsetSpace::getStatus(Cursor & cur, FuncRequest const & cmd,
 			InsetSpaceParams params;
 			string2params(to_utf8(cmd.argument()), params);
 			status.setOnOff(params_.kind == params.kind);
-		}
-		// fall through
+			status.setEnabled(true);	
+		} else
+			status.setEnabled(false);
+		return true;
+
 	case LFUN_INSET_DIALOG_UPDATE:
 		status.setEnabled(true);
 		return true;
@@ -211,6 +218,7 @@ void InsetSpace::metrics(MetricsInfo & mi, Dimension & dim) const
 			dim.wid = fm.width(char_type('M')) / 2;
 			break;
 		case InsetSpaceParams::PROTECTED:
+		case InsetSpaceParams::VISIBLE:
 		case InsetSpaceParams::NORMAL:
 			dim.wid = fm.width(char_type(' '));
 			break;
@@ -345,7 +353,8 @@ void InsetSpace::draw(PainterInfo & pi, int x, int y) const
 	xp[0] = x;
 	yp[0] = y - max(h / 4, 1);
 	if (params_.kind == InsetSpaceParams::NORMAL ||
-	    params_.kind == InsetSpaceParams::PROTECTED) {
+	    params_.kind == InsetSpaceParams::PROTECTED ||
+	    params_.kind == InsetSpaceParams::VISIBLE) {
 		xp[1] = x;     yp[1] = y;
 		xp[2] = x + w; yp[2] = y;
 	} else {
@@ -355,15 +364,18 @@ void InsetSpace::draw(PainterInfo & pi, int x, int y) const
 	xp[3] = x + w;
 	yp[3] = y - max(h / 4, 1);
 
+	Color col = Color_special;
 	if (params_.kind == InsetSpaceParams::PROTECTED ||
 	    params_.kind == InsetSpaceParams::ENSPACE ||
 	    params_.kind == InsetSpaceParams::NEGTHIN ||
 	    params_.kind == InsetSpaceParams::NEGMEDIUM ||
 	    params_.kind == InsetSpaceParams::NEGTHICK ||
 	    params_.kind == InsetSpaceParams::CUSTOM_PROTECTED)
-		pi.pain.lines(xp, yp, 4, Color_latex);
-	else
-		pi.pain.lines(xp, yp, 4, Color_special);
+		col = Color_latex;
+	else if (params_.kind == InsetSpaceParams::VISIBLE)
+		col =  Color_foreground;
+
+	pi.pain.lines(xp, yp, 4, col);
 }
 
 
@@ -377,6 +389,9 @@ void InsetSpaceParams::write(ostream & os) const
 	case InsetSpaceParams::PROTECTED:
 		os <<  "~";
 		break;
+	case InsetSpaceParams::VISIBLE:
+		os <<  "\\textvisiblespace{}";
+		break;
 	case InsetSpaceParams::THIN:
 		os <<  "\\thinspace{}";
 		break;
@@ -455,6 +470,8 @@ void InsetSpaceParams::read(Lexer & lex)
 		kind = InsetSpaceParams::NORMAL;
 	else if (command == "~")
 		kind = InsetSpaceParams::PROTECTED;
+	else if (command == "\\textvisiblespace{}")
+		kind = InsetSpaceParams::VISIBLE;
 	else if (command == "\\thinspace{}")
 		kind = InsetSpaceParams::THIN;
 	else if (math && command == "\\medspace{}")
@@ -471,9 +488,9 @@ void InsetSpaceParams::read(Lexer & lex)
 		kind = InsetSpaceParams::ENSKIP;
 	else if (command == "\\negthinspace{}")
 		kind = InsetSpaceParams::NEGTHIN;
-	else if (math && command == "\\negmedspace{}")
+	else if (command == "\\negmedspace{}")
 		kind = InsetSpaceParams::NEGMEDIUM;
-	else if (math && command == "\\negthickspace{}")
+	else if (command == "\\negthickspace{}")
 		kind = InsetSpaceParams::NEGTHICK;
 	else if (command == "\\hfill{}")
 		kind = InsetSpaceParams::HFILL;
@@ -517,7 +534,7 @@ void InsetSpace::read(Lexer & lex)
 }
 
 
-int InsetSpace::latex(odocstream & os, OutputParams const & runparams) const
+void InsetSpace::latex(otexstream & os, OutputParams const & runparams) const
 {
 	switch (params_.kind) {
 	case InsetSpaceParams::NORMAL:
@@ -531,6 +548,9 @@ int InsetSpace::latex(odocstream & os, OutputParams const & runparams) const
 		else
 			os << (runparams.free_spacing ? ' ' : '~');
 		break;
+	case InsetSpaceParams::VISIBLE:
+		os << (runparams.free_spacing ? " " : "\\textvisiblespace{}");
+		break;
 	case InsetSpaceParams::THIN:
 		os << (runparams.free_spacing ? " " : "\\,");
 		break;
@@ -598,7 +618,6 @@ int InsetSpace::latex(odocstream & os, OutputParams const & runparams) const
 			os << "\\hspace*{" << from_ascii(params_.length.asLatexString()) << "}";
 		break;
 	}
-	return 0;
 }
 
 
@@ -627,6 +646,41 @@ int InsetSpace::plaintext(odocstream & os, OutputParams const &) const
 	case InsetSpaceParams::DOWNBRACEFILL:
 		os << "/-^-\\";
 		return 5;
+	case InsetSpaceParams::VISIBLE:
+		os.put(0x2423);
+		return 1;
+	case InsetSpaceParams::ENSKIP:
+		os.put(0x2002);
+		return 1;
+	case InsetSpaceParams::ENSPACE:
+		os.put(0x2060); // WORD JOINER, makes the breakable en space unbreakable
+		os.put(0x2002);
+		os.put(0x2060); // WORD JOINER, makes the breakable en space unbreakable
+		return 3;
+	case InsetSpaceParams::QUAD:
+		os.put(0x2003);
+		return 1;
+	case InsetSpaceParams::QQUAD:
+		os.put(0x2003);
+		os.put(0x2003);
+		return 2;
+	case InsetSpaceParams::THIN:
+		os.put(0x2009);
+		return 1;
+	case InsetSpaceParams::MEDIUM:
+		os.put(0x2005);
+		return 1;
+	case InsetSpaceParams::THICK:
+		os.put(0x2004);
+		return 1;
+	case InsetSpaceParams::PROTECTED:
+	case InsetSpaceParams::CUSTOM_PROTECTED:
+		os.put(0x00a0);
+		return 1;
+	case InsetSpaceParams::NEGTHIN:
+	case InsetSpaceParams::NEGMEDIUM:
+	case InsetSpaceParams::NEGTHICK:
+		return 0;
 	default:
 		os << ' ';
 		return 1;
@@ -643,8 +697,13 @@ int InsetSpace::docbook(odocstream & os, OutputParams const &) const
 	case InsetSpaceParams::ENSKIP:
 		os << " ";
 		break;
+	// FIXME For spaces and dashes look here:
+	// http://oreilly.com/catalog/docbook/book2/iso-pub.html
 	case InsetSpaceParams::PROTECTED:
+	// FIXME &blank; ?
+	case InsetSpaceParams::VISIBLE:
 	case InsetSpaceParams::ENSPACE:
+	// FIXME &thinsp; ?
 	case InsetSpaceParams::THIN:
 	case InsetSpaceParams::MEDIUM:
 	case InsetSpaceParams::THICK:
@@ -656,12 +715,15 @@ int InsetSpace::docbook(odocstream & os, OutputParams const &) const
 	case InsetSpaceParams::HFILL:
 	case InsetSpaceParams::HFILL_PROTECTED:
 		os << '\n';
+		break;
 	case InsetSpaceParams::DOTFILL:
 		// FIXME
 		os << '\n';
+		break;
 	case InsetSpaceParams::HRULEFILL:
 		// FIXME
 		os << '\n';
+		break;
 	case InsetSpaceParams::LEFTARROWFILL:
 	case InsetSpaceParams::RIGHTARROWFILL:
 	case InsetSpaceParams::UPBRACEFILL:
@@ -670,6 +732,7 @@ int InsetSpace::docbook(odocstream & os, OutputParams const &) const
 	case InsetSpaceParams::CUSTOM_PROTECTED:
 		// FIXME
 		os << '\n';
+		break;
 	}
 	return 0;
 }
@@ -683,25 +746,36 @@ docstring InsetSpace::xhtml(XHTMLStream & xs, OutputParams const &) const
 		output = " ";
 		break;
 	case InsetSpaceParams::ENSKIP:
-	case InsetSpaceParams::ENSPACE:
 		output ="&ensp;";
 		break;
+	case InsetSpaceParams::ENSPACE:
+		output ="&#x2060;&ensp;&#x2060;";
+		break;
 	case InsetSpaceParams::QQUAD:
-		output ="&emsp;";
+		output ="&emsp;&emsp;";
+		break;
 	case InsetSpaceParams::THICK:
+		output ="&#x2004;";
+		break;
 	case InsetSpaceParams::QUAD:
 		output ="&emsp;";
 		break;
+	case InsetSpaceParams::MEDIUM:
+		output ="&#x2005;";
+		break;
 	case InsetSpaceParams::THIN:
 		output ="&thinsp;";
 		break;
 	case InsetSpaceParams::PROTECTED:
-	case InsetSpaceParams::MEDIUM:
 	case InsetSpaceParams::NEGTHIN:
 	case InsetSpaceParams::NEGMEDIUM:
 	case InsetSpaceParams::NEGTHICK:
 		output ="&nbsp;";
 		break;
+	// no XHTML entity, only unicode code for space character exists
+	case InsetSpaceParams::VISIBLE:
+		output ="&#x2423;";
+		break;
 	case InsetSpaceParams::HFILL:
 	case InsetSpaceParams::HFILL_PROTECTED:
 	case InsetSpaceParams::DOTFILL:
@@ -714,13 +788,17 @@ docstring InsetSpace::xhtml(XHTMLStream & xs, OutputParams const &) const
 		// Can we do anything with those in HTML?
 		break;
 	case InsetSpaceParams::CUSTOM:
+		// FIXME XHTML
+		// Probably we could do some sort of blank span?
+		break;
 	case InsetSpaceParams::CUSTOM_PROTECTED:
 		// FIXME XHTML
 		// Probably we could do some sort of blank span?
+		output ="&nbsp;";
 		break;
 	}
 	// don't escape the entities!
-	xs << XHTMLStream::NextRaw() << from_ascii(output);
+	xs << XHTMLStream::ESCAPE_NONE << from_ascii(output);
 	return docstring();
 }
 
@@ -733,12 +811,19 @@ void InsetSpace::validate(LaTeXFeatures & features) const
 }
 
 
-void InsetSpace::tocString(odocstream & os) const
+void InsetSpace::toString(odocstream & os) const
 {
 	plaintext(os, OutputParams(0));
 }
 
 
+void InsetSpace::forToc(docstring & os, size_t) const
+{
+	// There's no need to be cute here.
+	os += " ";
+}
+
+
 bool InsetSpace::isStretchableSpace() const
 {
 	return params_.kind == InsetSpaceParams::HFILL
@@ -752,9 +837,9 @@ bool InsetSpace::isStretchableSpace() const
 }
 
 
-docstring InsetSpace::contextMenu(BufferView const &, int, int) const
+string InsetSpace::contextMenuName() const
 {
-	return from_ascii("context-space");
+	return "context-space";
 }