anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-06 00:10:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove \\protected_separator.

Browse Source 
Tested with load/save a current lyx document, and lyx2lyxing of
klyx UserGuide


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5428 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2002-10-16 20:27:23 +00:00
parent efb34ae38c
commit d009cd4d93
4 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2002-10-16 John Levon <levon@movementarian.org>
* buffer.C: remove \\protected_separator parsing done by lyx2lyx now
2002-10-16 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2002-10-16 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* converter.C (view): add support for $$i (file name) and $$p * converter.C (view): add support for $$i (file name) and $$p

16
src/buffer.C
View File

@ -566,8 +566,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
string next_token = lex.getString(); string next_token = lex.getString();
if (next_token == "\\-") { if (next_token == "\\-") {
par->insertChar(pos, '-', font); par->insertChar(pos, '-', font);
} else if (next_token == "\\protected_separator" } else if (next_token == "~") {
|| next_token == "~") {
par->insertChar(pos, ' ', font); par->insertChar(pos, ' ', font);
} else { } else {
lex.printError("Token `$$Token' " lex.printError("Token `$$Token' "
@ -915,19 +914,6 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
} else if (token == "\\hfill") { } else if (token == "\\hfill") {
par->insertChar(pos, Paragraph::META_HFILL, font); par->insertChar(pos, Paragraph::META_HFILL, font);
++pos; ++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 } else if (token == "\\bibitem") { // ale970302
if (!par->bibkey) { if (!par->bibkey) {
InsetCommandParams p("bibitem", "dummy"); InsetCommandParams p("bibitem", "dummy");

4
src/insets/ChangeLog
View File

@ -1,3 +1,7 @@
2002-10-16 John Levon <levon@movementarian.org>
* insetspecialchar.C: remove \\protected_separator parsing
2002-09-25 Juergen Spitzmueller <j.spitzmueller@gmx.de> 2002-09-25 Juergen Spitzmueller <j.spitzmueller@gmx.de>
* insetquote.C: fix LaTeX output of quotation marks. * insetquote.C: fix LaTeX output of quotation marks.

4
src/insets/insetspecialchar.C
View File

@ -185,7 +185,6 @@ void InsetSpecialChar::write(Buffer const *, ostream & os) const
command = "\\menuseparator"; command = "\\menuseparator";
break; break;
case PROTECTED_SEPARATOR: case PROTECTED_SEPARATOR:
//command = "\\protected_separator";
command = "~"; command = "~";
break; break;
} }
@ -209,8 +208,7 @@ void InsetSpecialChar::read(Buffer const *, LyXLex & lex)
kind_ = LDOTS; kind_ = LDOTS;
else if (command == "\\menuseparator") else if (command == "\\menuseparator")
kind_ = MENU_SEPARATOR; kind_ = MENU_SEPARATOR;
else if (command == "\\protected_separator" else if (command == "~")
|| command == "~")
kind_ = PROTECTED_SEPARATOR; kind_ = PROTECTED_SEPARATOR;
else else
lex.printError("InsetSpecialChar: Unknown kind: `$$Token'"); lex.printError("InsetSpecialChar: Unknown kind: `$$Token'");