revert r27209

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27229 a592a061-630c-0410-9148-cb99ea01b6c8

lib/layouts/stdinsets.inc

@@ -228,26 +228,7 @@ InsetLayout Box:Shaded
 	MultiPar              true
 End
 
-InsetLayout figure
+InsetLayout Float
-	LabelString           Figure
-	LabelFont
-	  Color               collapsable
-	  Size                Small
-	EndFont
-	MultiPar              true
-End
-
-InsetLayout table
-	LabelString           Table
-	LabelFont
-	  Color               collapsable
-	  Size                Small
-	EndFont
-	MultiPar              true
-End
-
-InsetLayout algorithm
-	LabelString           Algorithm
 	LabelFont
 	  Color               collapsable
 	  Size                Small

src/Buffer.cpp

@@ -2391,7 +2391,7 @@ bool Buffer::doExport(string const & format, bool put_in_tempdir,
 		makeDocBookFile(FileName(filename), runparams);
 	}
 	// LaTeX backend
-	else if (!put_in_tempdir) {
+	else if (backend_format == format) {
 		runparams.nice = true;
 		if (!makeLaTeXFile(FileName(filename), string(), runparams))
 			return false;

src/frontends/qt4/GuiKeySymbol.cpp

@@ -694,9 +694,25 @@ docstring const KeySymbol::print(KeyModifier mod, bool forgui) const
 		tmpkey += Qt::AltModifier;
 
 	QKeySequence seq(tmpkey);
+	QString str;
+	
+	if (forgui)
+		str = seq.toString(QKeySequence::NativeText);
+	else {
+#ifdef Q_WS_MACX
+		// Qt/Mac does not use Command and friends in the
+		// portable case, but the windows-like Control+x (bug 5421).
+		str = seq.toString(QKeySequence::NativeText);
+		str.replace(QChar(0x21E7), qt_("Shift-"));
+		str.replace(QChar(0x2303), qt_("Control-"));
+		str.replace(QChar(0x2325), qt_("Option-"));
+		str.replace(QChar(0x2318), qt_("Command-"));
+#else
+		str = seq.toString(QKeySequence::PortableText);	
+#endif
+	}
 
-	return qstring_to_ucs4(seq.toString(forgui ? QKeySequence::NativeText
+	return qstring_to_ucs4(str);
-					    : QKeySequence::PortableText));
 }
 
 

src/insets/InsetFloat.cpp

@@ -127,6 +127,12 @@ InsetFloat::~InsetFloat()
 }
 
 
+docstring InsetFloat::name() const 
+{ 
+	return "Float:" + name_; 
+}
+
+
 docstring InsetFloat::toolTip(BufferView const & bv, int x, int y) const
 {
 	if (InsetCollapsable::toolTip(bv, x, y).empty() || isOpen())

src/insets/InsetFloat.h

@@ -71,7 +71,7 @@ public:
 	InsetFloatParams const & params() const { return params_; }
 private:
 	///
-	docstring name() const { return name_; }
+	docstring name() const;
 	///
 	docstring toolTip(BufferView const & bv, int x, int y) const;
 	///