Protected separator patch

[Dekel Tsur]

The following patch changes the file format:
 Use "\SpecialChar ~" instead of "\SpecialChar \protected_separator"


Index: ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/ChangeLog,v
retrieving revision 1.272
diff -u -p -r1.272 ChangeLog
--- ChangeLog   2000/04/11 22:55:28     1.272
+++ ChangeLog   2000/04/12 12:39:53
@@ -1,3 +1,9 @@
+2000-04-12  Dekel Tsur <[EMAIL PROTECTED]>
+
+       * src/buffer.C (parseSingleLyXformat2Token)
+       * src/insets/insetspecialchar.C (Read,Write): Use \SpecialChar ~
+       instead of \SpecialChar \protected_separator
+
 2000-04-11  Lars Gullik Bj&resh;nnes  <[EMAIL PROTECTED]>
 
        * src/lyx_cb.[Ch]: made several functions take a BufferView* arg
Index: src/buffer.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/buffer.C,v
retrieving revision 1.67
diff -u -p -r1.67 buffer.C
--- src/buffer.C        2000/04/11 22:55:29     1.67
+++ src/buffer.C        2000/04/12 12:39:54
@@ -1002,7 +1002,8 @@ bool Buffer::parseSingleLyXformat2Token(
                                if (next_token == "\\-") {
                                        par->InsertChar(pos, '-');
                                        par->SetFont(pos, font);
-                               } else if (next_token == "\\protected_separator") {
+                               } else if (next_token == "~" ||
+                                          next_token == "\\protected_separator") {
                                        par->InsertChar(pos, ' ');
                                        par->SetFont(pos, font);
                                } else {
Index: src/insets/insetspecialchar.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetspecialchar.C,v
retrieving revision 1.20
diff -u -p -r1.20 insetspecialchar.C
--- src/insets/insetspecialchar.C       2000/04/04 00:19:13     1.20
+++ src/insets/insetspecialchar.C       2000/04/12 12:39:54
@@ -163,7 +163,7 @@ void InsetSpecialChar::Write(ostream & o
        case NEWLINE:           command = "\\newline";  break;
 #endif
        case PROTECTED_SEPARATOR:
-                               command = "\\protected_separator";          break;
+                               command = "~";          break;
        }
        os << "\\SpecialChar " << command << "\n";
 }
@@ -183,7 +183,7 @@ void InsetSpecialChar::Read(LyXLex & lex
                kind = LDOTS;
        else if (command == "\\menuseparator")
                kind = MENU_SEPARATOR;
-       else if (command == "\\protected_separator")
+       else if (command == "~" || command == "\\protected_separator")
                kind = PROTECTED_SEPARATOR;
        else
                lex.printError("InsetSpecialChar: Unknown kind: `$$Token'");