X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_main.C;h=b881f3d78f55f3c383c1ffbaa09bfe24008f2650;hb=ba62665f966508db5a4de6864f4aa7374c5a5356;hp=a98d69f3dd3ad36de7570566dd67a7e4c4305efe;hpb=77b9dbd5570e9da3cf7644f93de821b58d97368b;p=lyx.git

diff --git a/src/lyx_main.C b/src/lyx_main.C
index a98d69f3dd..b881f3d78f 100644
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -53,11 +53,11 @@
 #include "support/filetools.h"
 #include "support/lyxlib.h"
 #include "support/convert.h"
+#include "support/ExceptionMessage.h"
 #include "support/os.h"
 #include "support/package.h"
 #include "support/path.h"
 #include "support/systemcall.h"
-#include "support/unicode.h"
 
 #include <boost/bind.hpp>
 #include <boost/filesystem/operations.hpp>
@@ -74,6 +74,7 @@ namespace lyx {
 using support::addName;
 using support::addPath;
 using support::bformat;
+using support::changeExtension;
 using support::createDirectory;
 using support::createLyXTmpDir;
 using support::destroyDir;
@@ -148,7 +149,7 @@ void reconfigureUserLyXDir()
 /// The main application class private implementation.
 struct LyX::Singletons 
 {
-	Singletons(): iconv(ucs4_codeset, "UTF-8")
+	Singletons()
 	{
 		// Set the default User Interface language as soon as possible.
 		// The language used will be derived from the environment
@@ -170,9 +171,6 @@ struct LyX::Singletons
 	/// lyx session, containing lastfiles, lastfilepos, and lastopened
 	boost::scoped_ptr<Session> session_;
 
-	///
-	IconvProcessor iconv;
-
 	/// Files to load at start.
 	vector<FileName> files_to_load_;
 
@@ -196,7 +194,7 @@ struct LyX::Singletons
 frontend::Application * theApp()
 {
 	if (singleton_)
-		return &singleton_->application();
+		return singleton_->pimpl_->application_.get();
 	else
 		return 0;
 }
@@ -329,12 +327,6 @@ Converters & LyX::systemConverters()
 }
 
 
-IconvProcessor & LyX::iconvProcessor()
-{
-	return pimpl_->iconv;
-}
-
-
 kb_keymap const & LyX::topLevelKeymap() const
 {
 	BOOST_ASSERT(pimpl_->toplevel_keymap_.get());
@@ -394,9 +386,17 @@ int LyX::exec(int & argc, char * argv[])
 	// we need to parse for "-dbg" and "-help"
 	easyParse(argc, argv);
 
-	support::init_package(to_utf8(from_local8bit(argv[0])),
+	try { support::init_package(to_utf8(from_local8bit(argv[0])),
 	                      cl_system_support, cl_user_support,
 	                      support::top_build_dir_is_one_level_up);
+	} catch (support::ExceptionMessage const & message) {
+		if (message.type_ == support::ErrorException) {
+			Alert::error(message.title_, message.details_);
+			exit(1);
+		} else if (message.type_ == support::WarningException) {
+			Alert::warning(message.title_, message.details_);
+		}
+	}
 
 	if (!use_gui) {
 		// FIXME: create a ConsoleApplication
@@ -870,7 +870,7 @@ bool LyX::init()
 	if (!readRcFile("preferences"))
 		return false;
 
-	if (!readEncodingsFile("encodings"))
+	if (!readEncodingsFile("encodings", "unicodesymbols"))
 		return false;
 	if (!readLanguagesFile("languages"))
 		return false;
@@ -1126,7 +1126,7 @@ bool LyX::readRcFile(string const & name)
 
 
 // Read the ui file `name'
-bool LyX::readUIFile(string const & name)
+bool LyX::readUIFile(string const & name, bool include)
 {
 	enum Uitags {
 		ui_menuset = 1,
@@ -1158,13 +1158,23 @@ bool LyX::readUIFile(string const & name)
 
 	lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
 
-	FileName const ui_path = libFileSearch("ui", name, "ui");
-
+	
+	FileName ui_path;
+	if (include) {
+		ui_path = libFileSearch("ui", name, "inc");
+		if (ui_path.empty())
+			ui_path = libFileSearch("ui",
+						changeExtension(name, "inc"));
+	}
+	else
+		ui_path = libFileSearch("ui", name, "ui");
+	
 	if (ui_path.empty()) {
 		lyxerr[Debug::INIT] << "Could not find " << name << endl;
 		showFileError(name);
 		return false;
 	}
+
 	uifiles.push_back(name);
 
 	lyxerr[Debug::INIT] << "Found " << name
@@ -1184,7 +1194,7 @@ bool LyX::readUIFile(string const & name)
 		case ui_include: {
 			lex.next(true);
 			string const file = lex.getString();
-			if (!readUIFile(file))
+			if (!readUIFile(file, true))
 				return false;
 			break;
 		}
@@ -1227,16 +1237,24 @@ bool LyX::readLanguagesFile(string const & name)
 
 
 // Read the encodings file `name'
-bool LyX::readEncodingsFile(string const & name)
+bool LyX::readEncodingsFile(string const & enc_name,
+                            string const & symbols_name)
 {
-	lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
+	lyxerr[Debug::INIT] << "About to read " << enc_name << " and "
+	                    << symbols_name << "..." << endl;
+
+	FileName const symbols_path = libFileSearch(string(), symbols_name);
+	if (symbols_path.empty()) {
+		showFileError(symbols_name);
+		return false;
+	}
 
-	FileName const enc_path = libFileSearch(string(), name);
+	FileName const enc_path = libFileSearch(string(), enc_name);
 	if (enc_path.empty()) {
-		showFileError(name);
+		showFileError(enc_name);
 		return false;
 	}
-	encodings.read(enc_path);
+	encodings.read(enc_path, symbols_path);
 	return true;
 }
 
@@ -1302,7 +1320,8 @@ int parse_version(string const &, string const &)
 int parse_sysdir(string const & arg, string const &)
 {
 	if (arg.empty()) {
-		lyxerr << to_utf8(_("Missing directory for -sysdir switch")) << endl;
+		Alert::error(_("No system directory"),
+			_("Missing directory for -sysdir switch"));
 		exit(1);
 	}
 	cl_system_support = arg;
@@ -1312,7 +1331,8 @@ int parse_sysdir(string const & arg, string const &)
 int parse_userdir(string const & arg, string const &)
 {
 	if (arg.empty()) {
-		lyxerr << to_utf8(_("Missing directory for -userdir switch")) << endl;
+		Alert::error(_("No user directory"),
+			_("Missing directory for -userdir switch"));
 		exit(1);
 	}
 	cl_user_support = arg;
@@ -1322,7 +1342,8 @@ int parse_userdir(string const & arg, string const &)
 int parse_execute(string const & arg, string const &)
 {
 	if (arg.empty()) {
-		lyxerr << to_utf8(_("Missing command string after --execute switch")) << endl;
+		Alert::error(_("Incomplete command"),
+			_("Missing command string after --execute switch"));
 		exit(1);
 	}
 	batch = arg;
@@ -1502,12 +1523,6 @@ Movers & theSystemMovers()
 }
 
 
-IconvProcessor & utf8ToUcs4()
-{
-	return LyX::ref().iconvProcessor();
-}
-
-
 Messages & getMessages(std::string const & language)
 {
 	return LyX::ref().getMessages(language);