On Tue, Oct 15, 2002 at 08:14:57AM +0100, Jos� Ab�lio Oliveira Matos wrote:
> On Tuesday 15 October 2002 02:59, John Levon wrote:
> > Can we remove the code for it ?
>
> lyx2lyx takes care of it. So, yes.
OK to apply ?
john
Index: buffer.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/buffer.C,v
retrieving revision 1.387
diff -u -r1.387 buffer.C
--- buffer.C 25 Sep 2002 12:19:13 -0000 1.387
+++ buffer.C 15 Oct 2002 17:23:12 -0000
@@ -566,8 +566,7 @@
string next_token = lex.getString();
if (next_token == "\\-") {
par->insertChar(pos, '-', font);
- } else if (next_token == "\\protected_separator"
- || next_token == "~") {
+ } else if (next_token == "~") {
par->insertChar(pos, ' ', font);
} else {
lex.printError("Token `$$Token' "
@@ -914,19 +913,6 @@
++pos;
} else if (token == "\\hfill") {
par->insertChar(pos, Paragraph::META_HFILL, font);
- ++pos;
- } else if (token == "\\protected_separator") { // obsolete
- // This is a backward compability thingie. (Lgb)
- // Remove it later some time...introduced with fileformat
- // 2.16. (Lgb)
- LyXLayout_ptr const & layout = par->layout();
-
- if (layout->free_spacing || par->isFreeSpacing()) {
- par->insertChar(pos, ' ', font);
- } else {
- Inset * inset = new
InsetSpecialChar(InsetSpecialChar::PROTECTED_SEPARATOR);
- par->insertInset(pos, inset, font);
- }
++pos;
} else if (token == "\\bibitem") { // ale970302
if (!par->bibkey) {
Index: insets/insetspecialchar.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetspecialchar.C,v
retrieving revision 1.53
diff -u -r1.53 insetspecialchar.C
--- insets/insetspecialchar.C 25 Sep 2002 14:26:11 -0000 1.53
+++ insets/insetspecialchar.C 15 Oct 2002 17:24:41 -0000
@@ -185,7 +185,6 @@
command = "\\menuseparator";
break;
case PROTECTED_SEPARATOR:
- //command = "\\protected_separator";
command = "~";
break;
}
@@ -209,8 +208,7 @@
kind_ = LDOTS;
else if (command == "\\menuseparator")
kind_ = MENU_SEPARATOR;
- else if (command == "\\protected_separator"
- || command == "~")
+ else if (command == "~")
kind_ = PROTECTED_SEPARATOR;
else
lex.printError("InsetSpecialChar: Unknown kind: `$$Token'");
