X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2Ftex2lyx.cpp;h=4c1366d85bee49791371f7a0a0f02db8e004f983;hb=e4c9689906e05c94116feea53ff29ad00a0e5a0b;hp=5e4a55b888cc3a26c2526ce52d35b12d6b9f77c2;hpb=e7bb71ff4ebf16351ab238b5cb7514173dd4f84d;p=lyx.git

diff --git a/src/tex2lyx/tex2lyx.cpp b/src/tex2lyx/tex2lyx.cpp
index 5e4a55b888..4c1366d85b 100644
--- a/src/tex2lyx/tex2lyx.cpp
+++ b/src/tex2lyx/tex2lyx.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -13,11 +13,12 @@
 #include <config.h>
 
 #include "tex2lyx.h"
-#include "Context.h"
 
+#include "Context.h"
 #include "TextClass.h"
 #include "Layout.h"
 
+#include "support/lassert.h"
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/ExceptionMessage.h"
@@ -25,8 +26,8 @@
 #include "support/lstrings.h"
 #include "support/os.h"
 #include "support/Package.h"
-#include "support/unicode.h"
 
+#include <cstdlib>
 #include <fstream>
 #include <iostream>
 #include <string>
@@ -40,13 +41,9 @@ using namespace lyx::support::os;
 
 namespace lyx {
 
-// Hacks to allow the thing to link in the lyxlayout stuff
-LayoutPtr captionlayout;
-
-
 string const trim(string const & a, char const * p)
 {
-	// BOOST_ASSERT(p);
+	// LASSERT(p, /**/);
 
 	if (a.empty() || !*p)
 		return a;
@@ -398,8 +395,8 @@ void tex2lyx(istream & is, ostream & os)
 	//p.dump();
 
 	stringstream ss;
-	TextClass textclass = parse_preamble(p, ss, documentclass);
-	captionlayout = LayoutPtr(Layout::forCaption());
+	TeX2LyXDocClass textclass;
+	parse_preamble(p, ss, documentclass, textclass);
 
 	active_environments.push_back("document");
 	Context context(true, textclass);
@@ -475,6 +472,8 @@ int main(int argc, char * argv[])
 {
 	using namespace lyx;
 
+	//setlocale(LC_CTYPE, "");
+
 	lyxerr.setStream(cerr);
 
 	easyParse(argc, argv);
@@ -487,7 +486,8 @@ int main(int argc, char * argv[])
 
 	os::init(argc, argv);
 
-	try { init_package(internal_path(to_utf8(from_local8bit(argv[0]))),
+	try {
+		init_package(internal_path(to_utf8(from_local8bit(argv[0]))),
 		cl_system_support, cl_user_support,
 		top_build_dir_is_two_levels_up);
 	} catch (ExceptionMessage const & message) {
@@ -496,12 +496,12 @@ int main(int argc, char * argv[])
 		if (message.type_ == ErrorException)
 			exit(1);
 	}
-	
+
 	// Now every known option is parsed. Look for input and output
 	// file name (the latter is optional).
 	string infilename = internal_path(to_utf8(from_local8bit(argv[1])));
 	infilename = makeAbsPath(infilename).absFilename();
-	
+
 	string outfilename;
 	if (argc > 2) {
 		outfilename = internal_path(to_utf8(from_local8bit(argv[2])));