anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

whitespace

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26608 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2008-09-29 08:30:41 +00:00
parent f27d764e33
commit 1899c81d3e
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/tex2lyx/preamble.cpp
View File

@ -249,7 +249,7 @@ string const scale_as_percentage(string const & scale)
void handle_package(string const & name, string const & opts, void handle_package(string const & name, string const & opts,
bool in_lyx_preamble) bool in_lyx_preamble)
{ {
vector<string> options = split_options(opts); vector<string> options = split_options(opts);
add_package(name, options); add_package(name, options);
@ -507,19 +507,20 @@ void parse_preamble(Parser & p, ostream & os,
else if (t.cat() == catComment) { else if (t.cat() == catComment) {
// regex to parse comments // regex to parse comments
static regex const islyxfile("%% LyX .* created this file"); static regex const islyxfile("%% LyX .* created this file");
static regex const usercommands("User specified LaTeX commands"); static regex const usercommands("User specified LaTeX commands");
string const comment = t.asInput(); string const comment = t.asInput();
cerr << "Seen comment: " << comment << std::endl; cerr << "Seen comment: " << comment << std::endl;
smatch sub; smatch sub;
if (regex_search(comment, sub, islyxfile)) if (regex_search(comment, sub, islyxfile))
is_lyx_file = true; is_lyx_file = true;
else if (is_lyx_file else if (is_lyx_file
&& regex_search(comment, sub, usercommands)) && regex_search(comment, sub, usercommands))
in_lyx_preamble = false; in_lyx_preamble = false;
else if (!in_lyx_preamble) else if (!in_lyx_preamble)
h_preamble << t.asInput(); h_preamble << t.asInput();
cerr << "lyx_file: " << is_lyx_file << ", lyx_preamble " << in_lyx_preamble << std::endl; cerr << "lyx_file: " << is_lyx_file << ", lyx_preamble "
<< in_lyx_preamble << std::endl;
} }
else if (t.cs() == "pagestyle") else if (t.cs() == "pagestyle")
@ -527,14 +528,14 @@ void parse_preamble(Parser & p, ostream & os,
else if (t.cs() == "makeatletter") { else if (t.cs() == "makeatletter") {
if (!is_lyx_file || !in_lyx_preamble if (!is_lyx_file || !in_lyx_preamble
|| p.getCatCode('@') != catLetter) || p.getCatCode('@') != catLetter)
h_preamble << "\\makeatletter"; h_preamble << "\\makeatletter";
p.setCatCode('@', catLetter); p.setCatCode('@', catLetter);
} }
else if (t.cs() == "makeatother") { else if (t.cs() == "makeatother") {
if (!is_lyx_file || !in_lyx_preamble if (!is_lyx_file || !in_lyx_preamble
|| p.getCatCode('@') != catOther) || p.getCatCode('@') != catOther)
h_preamble << "\\makeatother"; h_preamble << "\\makeatother";
p.setCatCode('@', catOther); p.setCatCode('@', catOther);
} }
@ -658,8 +659,8 @@ void parse_preamble(Parser & p, ostream & os,
vector<string>::const_iterator it = vecnames.begin(); vector<string>::const_iterator it = vecnames.begin();
vector<string>::const_iterator end = vecnames.end(); vector<string>::const_iterator end = vecnames.end();
for (; it != end; ++it) for (; it != end; ++it)
handle_package(trim(*it), string(), handle_package(trim(*it), string(),
in_lyx_preamble); in_lyx_preamble);
} else { } else {
handle_package(name, options, in_lyx_preamble); handle_package(name, options, in_lyx_preamble);
} }
@ -683,7 +684,7 @@ void parse_preamble(Parser & p, ostream & os,
name += p.get_token().asString(); name += p.get_token().asString();
if (!in_lyx_preamble) if (!in_lyx_preamble)
h_preamble << "\\def\\" << name << '{' h_preamble << "\\def\\" << name << '{'
<< p.verbatim_item() << "}"; << p.verbatim_item() << "}";
} }
else if (t.cs() == "newcolumntype") { else if (t.cs() == "newcolumntype") {