From: Georg Baum <Georg.Baum@post.rwth-aachen.de>
Date: Wed, 1 Jun 2005 14:01:18 +0000 (+0000)
Subject: add diagnostic messages by Jean-Pierre Chr��tien and skip some more {} pairs
X-Git-Tag: 1.6.10~14257
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=166979d030509486ee08dd85ec93f6dc97b29067;p=features.git

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
---

diff --git a/src/tex2lyx/ChangeLog b/src/tex2lyx/ChangeLog
index 3dd349551c..90d48bf286 100644
--- a/src/tex2lyx/ChangeLog
+++ b/src/tex2lyx/ChangeLog
@@ -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
diff --git a/src/tex2lyx/tex2lyx.C b/src/tex2lyx/tex2lyx.C
index 519e5acd6c..a4045a32ff 100644
--- a/src/tex2lyx/tex2lyx.C
+++ b/src/tex2lyx/tex2lyx.C
@@ -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()) {
diff --git a/src/tex2lyx/text.C b/src/tex2lyx/text.C
index b8033fe8ab..88fa5dad4a 100644
--- a/src/tex2lyx/text.C
+++ b/src/tex2lyx/text.C
@@ -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() == "\\") {