X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FSpacing.cpp;h=9ac8345ab4647077b42a92e1d5b0216c293677dc;hb=da67bde61af6dfecef7a237b72b878fe30638a81;hp=3290a6013c3b4c9c1cc90d478973e90e24385dc9;hpb=f1cba8ff64b369792fd49f5ddf90e8126ab476ac;p=lyx.git

diff --git a/src/Spacing.cpp b/src/Spacing.cpp
index 3290a6013c..9ac8345ab4 100644
--- a/src/Spacing.cpp
+++ b/src/Spacing.cpp
@@ -90,7 +90,7 @@ void Spacing::writeFile(ostream & os, bool para) const
 
 namespace {
 
-string envName(Spacing::Space space, bool useSetSpace) 
+string envName(Spacing::Space space, bool useSetSpace)
 {
 	static char const * const env_names[]
 		= { "SingleSpace", "OnehalfSpace", "DoubleSpace", "Spacing", ""};
@@ -99,14 +99,26 @@ string envName(Spacing::Space space, bool useSetSpace)
 	return useSetSpace ? name : support::ascii_lowercase(name);
 }
 
+string cmdName(Spacing::Space space, bool useSetSpace)
+{
+	static char const * const cmd_names[]
+		= { "SingleSpacing", "OnehalfSpacing", "DoubleSpacing", "SetStretch", ""};
+	string const name = cmd_names[space];
+
+	if (useSetSpace && name == "SetStretch")
+		return "setSpacing";
+
+	return useSetSpace ? name : support::ascii_lowercase(name);
 }
 
+} // namespace
+
 string const Spacing::writeEnvirBegin(bool useSetSpace) const
 {
 	string const name = envName(space, useSetSpace);
-	if (space == Other) 
+	if (space == Other)
 		return "\\begin{" + name + "}{" + getValueAsString() + '}';
-	else 
+	else
 		return name.empty() ? string() : "\\begin{" + name + '}';
 }
 
@@ -118,6 +130,16 @@ string const Spacing::writeEnvirEnd(bool useSetSpace) const
 }
 
 
+string const Spacing::writeCmd(bool useSetSpace) const
+{
+	string const name = cmdName(space, useSetSpace);
+	if (space == Other)
+		return "\\" + name + "{" + getValueAsString() + '}';
+	else
+		return name.empty() ? string() : "\\" + name + "{}";
+}
+
+
 string const Spacing::writePreamble(bool useSetSpace) const
 {
 	string preamble;
@@ -128,11 +150,11 @@ string const Spacing::writePreamble(bool useSetSpace) const
 		//return "\\singlespacing\n";
 		break;
 	case Onehalf:
-		preamble = useSetSpace ? "\\OnehalfSpacing\n" 
+		preamble = useSetSpace ? "\\OnehalfSpacing\n"
 			: "\\onehalfspacing\n";
 		break;
 	case Double:
-		preamble = useSetSpace ? "\\DoubleSpacing\n" 
+		preamble = useSetSpace ? "\\DoubleSpacing\n"
 			: "\\doublespacing\n";
 		break;
 	case Other: