Jean-Pierre Chrétien wrote:
> I'd uploaded a sunos version on the wiki including these changes,
> without waiting for Georg to commit them if he founds appropriate,
Thanks. I simplified the logic a bit and committed the attached patch. BTW,
please use unified diffs (diff -u) the next time, it is easier to read.
I did not understand the change to text.C. What was it intended to do?
> texlyx remains mute about \verbatiminput file suffix.
I don't understand. What is wrong with \verbatiminput?
Georg
Index: src/tex2lyx/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/tex2lyx/ChangeLog,v
retrieving revision 1.94
diff -u -p -r1.94 ChangeLog
--- src/tex2lyx/ChangeLog 25 May 2005 16:01:19 -0000 1.94
+++ src/tex2lyx/ChangeLog 1 Jun 2005 13:50:48 -0000
@@ -1,3 +1,8 @@
+2005-06-01 Georg Baum <[EMAIL PROTECTED]>
+
+ * text.C (parse_text): eat {} after \ss, \i and \j
+ * tex2lyx.C (tex2lyx): add diagnostic message about created files
+
2005-05-25 Georg Baum <[EMAIL PROTECTED]>
* text.C (fix_relative_filename): new
Index: src/tex2lyx/tex2lyx.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/tex2lyx/tex2lyx.C,v
retrieving revision 1.69
diff -u -p -r1.69 tex2lyx.C
--- src/tex2lyx/tex2lyx.C 25 May 2005 16:01:19 -0000 1.69
+++ src/tex2lyx/tex2lyx.C 1 Jun 2005 13:50:48 -0000
@@ -401,9 +491,17 @@ bool tex2lyx(string const &infilename, s
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()) {
Index: src/tex2lyx/text.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/tex2lyx/text.C,v
retrieving revision 1.58
diff -u -p -r1.58 text.C
--- src/tex2lyx/text.C 25 May 2005 16:01:19 -0000 1.58
+++ src/tex2lyx/text.C 1 Jun 2005 13:50:49 -0000
@@ -1851,11 +2299,13 @@ void parse_text(Parser & p, ostream & os
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() == "\\") {
