From 5ba684315e7beb3f7a12da05d7e20c7df3bd24ee Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Fri, 7 Aug 2009 12:19:59 +0000 Subject: [PATCH] Work around bug 5702 a bit: Make tex2lyx treat the DefaultModule tag as an Input tag. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@30896 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/TextClass.cpp | 5 +++++ status.16x | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/TextClass.cpp b/src/TextClass.cpp index e957890e0b..6dfa3acd03 100644 --- a/src/TextClass.cpp +++ b/src/TextClass.cpp @@ -347,6 +347,9 @@ TextClass::ReturnValues TextClass::read(Lexer & lexrc, ReadType rt) readOutputType(lexrc); break; +#ifdef TEX2LYX + case TC_DEFAULTMODULE: +#endif case TC_INPUT: // Include file if (lexrc.next()) { string const inc = lexrc.getString(); @@ -493,6 +496,7 @@ TextClass::ReturnValues TextClass::read(Lexer & lexrc, ReadType rt) break; } +#ifndef TEX2LYX case TC_DEFAULTMODULE: { lexrc.next(); string const module = lexrc.getString(); @@ -500,6 +504,7 @@ TextClass::ReturnValues TextClass::read(Lexer & lexrc, ReadType rt) default_modules_.push_back(module); break; } +#endif case TC_PROVIDESMODULE: { lexrc.next(); diff --git a/status.16x b/status.16x index 361f1deb10..f677303170 100644 --- a/status.16x +++ b/status.16x @@ -34,6 +34,11 @@ What's new * the alternative LaTeX document language names "portuguese" and "brazilian" +- Partially resolve bug 5702, "tex2lyx cannot deal with modules". We + now treat the "DefaultModule" tag as if it were an "Input" tag. This + is not a general solution, but does deal with one of the most serious + cases of the bug. + * USER INTERFACE