add diagnostic messages by Jean-Pierre Chr��tien and skip some more {} pairs

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9991 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2005-06-01 14:01:18 +00:00
parent 620d390c2d
commit 166979d030
3 changed files with 18 additions and 3 deletions

View File

@ -1,3 +1,8 @@
2005-06-01 Georg Baum <Georg.Baum@post.rwth-aachen.de>
* text.C (parse_text): eat {} after \ss, \i and \j
* tex2lyx.C (tex2lyx): add diagnostic message about created files
2005-05-25 Georg Baum <Georg.Baum@post.rwth-aachen.de>
* text.C (fix_relative_filename): new

View File

@ -403,9 +403,17 @@ bool tex2lyx(string const &infilename, std::ostream &os)
bool tex2lyx(string const &infilename, string const &outfilename)
{
if (!overwrite_files && IsFileReadable(outfilename)) {
cerr << "Not overwriting existing file " << outfilename << "\n";
return false;
if (IsFileReadable(outfilename)) {
if (overwrite_files) {
cerr << "Overwriting existing file "
<< outfilename << endl;
} else {
cerr << "Not overwriting existing file "
<< outfilename << endl;
return false;
}
} else {
cerr << "Creating file " << outfilename << endl;
}
ofstream os(outfilename.c_str());
if (!os.good()) {

View File

@ -1851,11 +1851,13 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
else if (t.cs() == "ss") {
context.check_layout(os);
os << "ß";
skip_braces(p); // eat {}
}
else if (t.cs() == "i" || t.cs() == "j") {
context.check_layout(os);
os << "\\" << t.cs() << ' ';
skip_braces(p); // eat {}
}
else if (t.cs() == "\\") {