whitespace

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

View File

@ -249,7 +249,7 @@ string const scale_as_percentage(string const & scale)
void handle_package(string const & name, string const & opts,
bool in_lyx_preamble)
bool in_lyx_preamble)
{
vector<string> options = split_options(opts);
add_package(name, options);
@ -519,7 +519,8 @@ void parse_preamble(Parser & p, ostream & os,
in_lyx_preamble = false;
else if (!in_lyx_preamble)
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")
@ -527,14 +528,14 @@ void parse_preamble(Parser & p, ostream & os,
else if (t.cs() == "makeatletter") {
if (!is_lyx_file || !in_lyx_preamble
|| p.getCatCode('@') != catLetter)
|| p.getCatCode('@') != catLetter)
h_preamble << "\\makeatletter";
p.setCatCode('@', catLetter);
}
else if (t.cs() == "makeatother") {
if (!is_lyx_file || !in_lyx_preamble
|| p.getCatCode('@') != catOther)
|| p.getCatCode('@') != catOther)
h_preamble << "\\makeatother";
p.setCatCode('@', catOther);
}
@ -659,7 +660,7 @@ void parse_preamble(Parser & p, ostream & os,
vector<string>::const_iterator end = vecnames.end();
for (; it != end; ++it)
handle_package(trim(*it), string(),
in_lyx_preamble);
in_lyx_preamble);
} else {
handle_package(name, options, in_lyx_preamble);
}
@ -683,7 +684,7 @@ void parse_preamble(Parser & p, ostream & os,
name += p.get_token().asString();
if (!in_lyx_preamble)
h_preamble << "\\def\\" << name << '{'
<< p.verbatim_item() << "}";
<< p.verbatim_item() << "}";
}
else if (t.cs() == "newcolumntype") {