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

diff --git a/src/lyx_main.C b/src/lyx_main.C
index 97f71100ff..b881f3d78f 100644
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -58,7 +58,6 @@
 #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>
@@ -150,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
@@ -172,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_;
 
@@ -331,12 +327,6 @@ Converters & LyX::systemConverters()
 }
 
 
-IconvProcessor & LyX::iconvProcessor()
-{
-	return pimpl_->iconv;
-}
-
-
 kb_keymap const & LyX::topLevelKeymap() const
 {
 	BOOST_ASSERT(pimpl_->toplevel_keymap_.get());
@@ -880,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;
@@ -1247,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 enc_path = libFileSearch(string(), name);
+	FileName const symbols_path = libFileSearch(string(), symbols_name);
+	if (symbols_path.empty()) {
+		showFileError(symbols_name);
+		return false;
+	}
+
+	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;
 }
 
@@ -1525,12 +1523,6 @@ Movers & theSystemMovers()
 }
 
 
-IconvProcessor & utf8ToUcs4()
-{
-	return LyX::ref().iconvProcessor();
-}
-
-
 Messages & getMessages(std::string const & language)
 {
 	return LyX::ref().getMessages(language);