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

tex2lyx/text.cpp: code optimization as also suggested by JMarc

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30087 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2009-06-13 15:34:31 +00:00
parent 51f9ee6155
commit 5858128386
1 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/tex2lyx/text.cpp
View File

@ -354,9 +354,11 @@ void begin_inset(ostream & os, string const & name)
os << "\n\\begin_inset " << name; os << "\n\\begin_inset " << name;
} }
void begin_Cinset(ostream & os, string const & name) void begin_command_inset(ostream & os, string const & name,
string const & latexname)
{ {
os << "\n\\begin_inset CommandInset " << name; os << "\n\\begin_inset CommandInset " << name;
os << "\nLatexCommand " << latexname << "\n";
} }
@ -365,11 +367,6 @@ void end_inset(ostream & os)
os << "\n\\end_inset\n\n"; os << "\n\\end_inset\n\n";
} }
void LatexCommand(ostream & os, string const & name)
{
os << "\nLatexCommand " << name << "\n";
}
void skip_braces(Parser & p) void skip_braces(Parser & p)
{ {
@ -1467,8 +1464,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
else if (t.cs() == "bibitem") { else if (t.cs() == "bibitem") {
context.set_item(); context.set_item();
context.check_layout(os); context.check_layout(os);
begin_Cinset(os, "bibitem"); begin_command_inset(os, "bibitem", "bibitem");
LatexCommand(os, "bibitem");
os << p.getOpt(); os << p.getOpt();
os << "key " << '"' << p.verbatim_item() << '"' << "\n"; os << "key " << '"' << p.verbatim_item() << '"' << "\n";
end_inset(os); end_inset(os);
@ -1788,8 +1784,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
else if (t.cs() == "tableofcontents") { else if (t.cs() == "tableofcontents") {
p.skip_spaces(); p.skip_spaces();
context.check_layout(os); context.check_layout(os);
begin_Cinset(os, "toc"); begin_command_inset(os, "toc", "tableofcontents");
LatexCommand(os, "tableofcontents");
end_inset(os); end_inset(os);
skip_braces(p); // swallow this skip_braces(p); // swallow this
} }
@ -1927,8 +1922,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
else if (is_known(t.cs(), known_ref_commands)) { else if (is_known(t.cs(), known_ref_commands)) {
context.check_layout(os); context.check_layout(os);
begin_Cinset(os, "ref"); begin_command_inset(os, "ref", t.cs());
LatexCommand(os, t.cs());
// lyx cannot handle newlines in a latex command // lyx cannot handle newlines in a latex command
// FIXME: Move the substitution into parser::getOpt()? // FIXME: Move the substitution into parser::getOpt()?
os << subst(p.getOpt(), "\n", " "); os << subst(p.getOpt(), "\n", " ");
@ -1984,8 +1978,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
before.erase(0, 1); before.erase(0, 1);
before.erase(before.length() - 1, 1); before.erase(before.length() - 1, 1);
} }
begin_Cinset(os, "citation"); begin_command_inset(os, "citation", command);
LatexCommand(os, command);
os << "after " << '"' << after << '"' << "\n"; os << "after " << '"' << after << '"' << "\n";
os << "before " << '"' << before << '"' << "\n"; os << "before " << '"' << before << '"' << "\n";
os << "key " << '"' << p.verbatim_item() << '"' << "\n"; os << "key " << '"' << p.verbatim_item() << '"' << "\n";
@ -2029,8 +2022,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
before.erase(0, 1); before.erase(0, 1);
before.erase(before.length() - 1, 1); before.erase(before.length() - 1, 1);
} }
begin_Cinset(os, "citation"); begin_command_inset(os, "citation", command);
LatexCommand(os, command);
os << "after " << '"' << after << '"' << "\n"; os << "after " << '"' << after << '"' << "\n";
os << "before " << '"' << before << '"' << "\n"; os << "before " << '"' << before << '"' << "\n";
os << "key " << '"' << citation << '"' << "\n"; os << "key " << '"' << citation << '"' << "\n";
@ -2045,8 +2037,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
after.erase(0, 1); after.erase(0, 1);
after.erase(after.length() - 1, 1); after.erase(after.length() - 1, 1);
} }
begin_Cinset(os, "citation"); begin_command_inset(os, "citation", t.cs());
LatexCommand(os, t.cs());
os << "after " << '"' << after << '"' << "\n"; os << "after " << '"' << after << '"' << "\n";
os << "key " << '"' << subst(p.verbatim_item(), "\n", " ") << '"' << "\n"; os << "key " << '"' << subst(p.verbatim_item(), "\n", " ") << '"' << "\n";
end_inset(os); end_inset(os);
@ -2063,8 +2054,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
else if (t.cs() == "label") { else if (t.cs() == "label") {
context.check_layout(os); context.check_layout(os);
begin_Cinset(os, t.cs()); begin_command_inset(os, t.cs(), t.cs());
LatexCommand(os, t.cs());
// lyx cannot handle newlines in a latex command // lyx cannot handle newlines in a latex command
os << "name " << '"' << subst(p.verbatim_item(), "\n", " ") << '"' << "\n"; os << "name " << '"' << subst(p.verbatim_item(), "\n", " ") << '"' << "\n";
end_inset(os); end_inset(os);
@ -2072,8 +2062,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
else if (t.cs() == "printindex") { else if (t.cs() == "printindex") {
context.check_layout(os); context.check_layout(os);
begin_Cinset(os, "index_print"); begin_command_inset(os, "index_print", t.cs());
LatexCommand(os, t.cs());
end_inset(os); end_inset(os);
skip_braces(p); skip_braces(p);
} }
@ -2412,8 +2401,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
else if (t.cs() == "bibliography") { else if (t.cs() == "bibliography") {
context.check_layout(os); context.check_layout(os);
begin_Cinset(os, "bibtex"); begin_command_inset(os, "bibtex", "bibtex");
LatexCommand(os, "bibtex");
os << "bibfiles " << '"' << p.verbatim_item() << '"' << "\n"; os << "bibfiles " << '"' << p.verbatim_item() << '"' << "\n";
// Do we have a bibliographystyle set? // Do we have a bibliographystyle set?
if (!bibliographystyle.empty()) if (!bibliographystyle.empty())