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

Increase tex2lyx output format to 342.

Browse Source 
335:     Create space inset in new syntax
336:     Nothing to do (empty lyx2lyx conversion)
337:     Nothing to do (tex2lyx does use the display flag)
338-339: Nothing to do (empty lyx2lyx conversion)
340:     Nothing to do (tex2lyx does not output empty layout names)
341-342: Nothing to do (empty lyx2lyx conversion)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37013 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2010-12-27 18:14:55 +00:00
parent 5247a0ed1c
commit 4a54c581a2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tex2lyx/tex2lyx.h
View File

@ -114,7 +114,7 @@ extern CommandMap known_math_environments;
/// ///
extern bool noweb_mode; extern bool noweb_mode;
/// LyX format that is created by tex2lyx /// LyX format that is created by tex2lyx
int const LYX_FORMAT = 334; int const LYX_FORMAT = 342;
/// path of the master .tex file /// path of the master .tex file
extern std::string getMasterFilePath(); extern std::string getMasterFilePath();

10
src/tex2lyx/text.cpp
View File

@ -712,7 +712,7 @@ void parse_box(Parser & p, ostream & os, unsigned flags, bool outer,
p.skip_spaces(); p.skip_spaces();
// We add a protected space if something real follows // We add a protected space if something real follows
if (p.good() && p.next_token().cat() != catComment) { if (p.good() && p.next_token().cat() != catComment) {
begin_inset(os, "Space ~\n"); begin_inset(os, "space ~\n");
end_inset(os); end_inset(os);
} }
} }
@ -1464,7 +1464,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
if (context.layout->free_spacing) if (context.layout->free_spacing)
os << ' '; os << ' ';
else { else {
begin_inset(os, "Space ~\n"); begin_inset(os, "space ~\n");
end_inset(os); end_inset(os);
} }
} else } else
@ -2732,7 +2732,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
else if (is_known(t.cs(), known_spaces)) { else if (is_known(t.cs(), known_spaces)) {
char const * const * where = is_known(t.cs(), known_spaces); char const * const * where = is_known(t.cs(), known_spaces);
context.check_layout(os); context.check_layout(os);
begin_inset(os, "Space "); begin_inset(os, "space ");
os << '\\' << known_coded_spaces[where - known_spaces] os << '\\' << known_coded_spaces[where - known_spaces]
<< '\n'; << '\n';
end_inset(os); end_inset(os);
@ -2857,7 +2857,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
if (t.cs()[0] == 'h' && (known_unit || known_hspace)) { if (t.cs()[0] == 'h' && (known_unit || known_hspace)) {
// Literal horizontal length or known variable // Literal horizontal length or known variable
context.check_layout(os); context.check_layout(os);
begin_inset(os, "Space "); begin_inset(os, "space ");
os << name; os << name;
if (starred) if (starred)
os << '*'; os << '*';
@ -2880,7 +2880,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
os << '*'; os << '*';
end_inset(os); end_inset(os);
} else { } else {
// LyX can't handle other length variables in Inset V?Space // LyX can't handle other length variables in Inset VSpace/space
if (starred) if (starred)
name += '*'; name += '*';
if (valid) { if (valid) {