Another warning.

[lyx.git] / src / mathed / InsetMathHull.cpp

diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index 4f63949458a44caa08e32d13f5eef57f4907d5a8..6bbd83a931653a17a0522ab6f105c0840b8f41d5 100644 (file)
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -737,7 +737,7 @@ void InsetMathHull::header_write(WriteStream & os) const
                break;
 
        default:
-               os << "\\begin{unknown" << star(n) << '}';
+               os << "\\begin{unknown" << star(n) << "}\n";
                break;
        }
 }
@@ -758,9 +758,9 @@ void InsetMathHull::footer_write(WriteStream & os) const
 
        case hullEquation:
                if (n)
-                       os << "\\end{equation" << star(n) << "}\n";
+                       os << "\n\\end{equation" << star(n) << "}\n";
                else
-                       os << "\\]\n";
+                       os << "\n\\]\n";
                break;
 
        case hullEqnArray:
@@ -770,11 +770,11 @@ void InsetMathHull::footer_write(WriteStream & os) const
        case hullXAlignAt:
        case hullGather:
        case hullMultline:
-               os << "\\end{" << hullName(type_) << star(n) << "}\n";
+               os << "\n\\end{" << hullName(type_) << star(n) << "}\n";
                break;
 
        case hullXXAlignAt:
-               os << "\\end{" << hullName(type_) << "}\n";
+               os << "\n\\end{" << hullName(type_) << "}\n";
                break;
 
        case hullRegexp:
@@ -782,7 +782,7 @@ void InsetMathHull::footer_write(WriteStream & os) const
                break;
 
        default:
-               os << "\\end{unknown" << star(n) << '}';
+               os << "\n\\end{unknown" << star(n) << "}\n";
                break;
        }
 }
@@ -1120,19 +1120,23 @@ void InsetMathHull::mutate(HullType newtype)
 }
 
 
-docstring InsetMathHull::eolString(row_type row, bool fragile, bool last_eoln) const
+docstring InsetMathHull::eolString(row_type row, bool fragile, bool latex,
+               bool last_eoln) const
 {
        docstring res;
        if (numberedType()) {
-               if (label_[row] && numbered_[row])
-                       res += "\\label{" +
-                           escape(label_[row]->getParam("name")) + '}';
+               if (label_[row] && numbered_[row]) {
+                       docstring const name =
+                               latex ? escape(label_[row]->getParam("name"))
+                                     : label_[row]->getParam("name");
+                       res += "\\label{" + name + '}';
+               }
                if (!numbered_[row] && (type_ != hullMultline))
                        res += "\\nonumber ";
        }
        // Never add \\ on the last empty line of eqnarray and friends
        last_eoln = false;
-       return res + InsetMathGrid::eolString(row, fragile, last_eoln);
+       return res + InsetMathGrid::eolString(row, fragile, latex, last_eoln);
 }
 
 
@@ -1318,7 +1322,7 @@ void InsetMathHull::doDispatch(Cursor & cur, FuncRequest & cmd)
 
                InsetCommandParams p(LABEL_CODE);
                p["name"] = cmd.argument().empty() ? old_label : cmd.argument();
-               string const data = InsetCommand::params2string("label", p);
+               string const data = InsetCommand::params2string(p);
 
                if (cmd.argument().empty())
                        cur.bv().showDialog("label", data);
@@ -1382,7 +1386,7 @@ void InsetMathHull::doDispatch(Cursor & cur, FuncRequest & cmd)
                string const name = cmd.getArg(0);
                if (name == "label") {
                        InsetCommandParams p(LABEL_CODE);
-                       InsetCommand::string2params(name, to_utf8(cmd.argument()), p);
+                       InsetCommand::string2params(to_utf8(cmd.argument()), p);
                        docstring str = p["name"];
                        cur.recordUndoInset();
                        row_type const r = (type_ == hullMultline) ? nrows() - 1 : cur.row();