From: Lars Gullik Bjønnes <larsbj@gullik.org>
Date: Sun, 8 Dec 2002 22:33:55 +0000 (+0000)
Subject: use floatname instead of floattype
X-Git-Tag: 1.6.10~17829
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=59565140713f9c08e17fcc94cd4b2375974e2b62;p=features.git

use floatname instead of floattype


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

diff --git a/src/ChangeLog b/src/ChangeLog
index dfda1c2be8..553c87816c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,12 @@
+2002-12-08  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+	* MenuBackend.C (expandToc): gettext on float names.
+
 2002-12-03  Juergen Spitzmueller  <j.spitzmueller@gmx.de>
- 
- 	* lyxlength.[Ch]: set default unit to UNIT_NONE,
- 	implement bool empty() [bug 490]
- 
+
+	* lyxlength.[Ch]: set default unit to UNIT_NONE,
+	implement bool empty() [bug 490]
+
 2002-12-02  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
 	* text2.C, CutAndPaste.C: use BoostFormat.h not boost/format.hpp
diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index 7d118317f8..0305c9558e 100644
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -505,7 +505,7 @@ void expandToc(Menu & tomenu, Buffer const * buf)
 					   label, ccit->action()));
 		}
 		MenuItem item(MenuItem::Submenu,
-			      floats[cit->first]->second.name());
+			      _(floats[cit->first]->second.name()));
 		item.submenu(menu);
 		tomenu.add(item);
 	}
diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 15f699fb8d..9c2b24d39f 100644
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-08  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+	* insetfloat.C (addToToc): use the floats name not its type
+	* insetwrap.C (addToToc): ditto
+
 2002-12-04  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
 	* insetnote.C (init): make label font smaller
@@ -5,7 +10,7 @@
 2002-12-04  John Levon  <levon@movementarian.org>
 
 	* insetinclude.C: ressurect setting of command name
- 
+
 2002-12-02  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
 	* insetquotes.C (dispString): disambiguate insert call
diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C
index 3c9c62784b..e5610ea8c8 100644
--- a/src/insets/insetfloat.C
+++ b/src/insets/insetfloat.C
@@ -348,11 +348,12 @@ void InsetFloat::addToToc(toc::TocList & toclist, Buffer const * buf) const
 		Paragraph * tmp = *pit;
 
 		if (tmp->layout()->name() == caplayout) {
+			string const name = floatname(type(), buf->params);
 			string const str =
-				tostr(toclist[type()].size() + 1)
+				tostr(toclist[name].size() + 1)
 				+ ". " + tmp->asString(buf, false);
 			toc::TocItem const item(tmp, 0 , str);
-			toclist[type()].push_back(item);
+			toclist[name].push_back(item);
 		}
 	}
 }
diff --git a/src/insets/insetwrap.C b/src/insets/insetwrap.C
index 43dc8afd50..b33e2f3d32 100644
--- a/src/insets/insetwrap.C
+++ b/src/insets/insetwrap.C
@@ -260,11 +260,12 @@ void InsetWrap::addToToc(toc::TocList & toclist, Buffer const * buf) const
 	Paragraph * tmp = inset.paragraph();
 	while (tmp) {
 		if (tmp->layout()->name() == caplayout) {
+			string const name = floatname(type(), buf->params);
 			string const str =
-				tostr(toclist[type()].size() + 1)
+				tostr(toclist[name].size() + 1)
 				+ ". " + tmp->asString(buf, false);
 			toc::TocItem const item(tmp, 0 , str);
-			toclist[type()].push_back(item);
+			toclist[name].push_back(item);
 		}
 		tmp = tmp->next();
 	}