X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FEncoding.cpp;h=9dde12d1213fc6d06e80ba0d28d27345605e1c39;hb=9926927fb1a38f15ec4fa1334075720925a3295e;hp=1c74f0c60458955797938b202ee69a15609590b4;hpb=d5aaee1f6b9a95e8eb3ae7b1e28cb4d3f11085f7;p=lyx.git

diff --git a/src/Encoding.cpp b/src/Encoding.cpp
index 1c74f0c604..9dde12d121 100644
--- a/src/Encoding.cpp
+++ b/src/Encoding.cpp
@@ -19,13 +19,15 @@
 #include "support/debug.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
+#include "support/mutex.h"
 #include "support/textutils.h"
 #include "support/unicode.h"
 
 #include <boost/cstdint.hpp>
 
-#include <sstream>
+#include <iterator>
 #include <algorithm>
+#include <sstream>
 
 using namespace std;
 using namespace lyx::support;
@@ -105,10 +107,28 @@ Encoding::Encoding(string const & n, string const & l, string const & g,
 
 void Encoding::init() const
 {
+	// Since the the constructor is the only method which sets complete_
+	// to false the test for complete_ is thread-safe without mutex.
 	if (complete_)
 		return;
 
-	start_encodable_ = 0;
+	static Mutex mutex;
+	Mutex::Locker lock(&mutex);
+
+	// We need to test again for complete_, since another thread could
+	// have set it to true while we were waiting for the lock and we must
+	// not modify an encoding which is already complete.
+	if (complete_)
+		return;
+
+	// We do not make any member mutable  so that it can be easily verified
+	// that all const methods are thread-safe: init() is the only const
+	// method which changes complete_, encodable_ and start_encodable_, and
+	// it uses a mutex to ensure thread-safety.
+	CharSet & encodable = const_cast<Encoding *>(this)->encodable_;
+	char_type & start_encodable = const_cast<Encoding *>(this)->start_encodable_;
+
+	start_encodable = 0;
 	// temporarily switch off lyxerr, since we will generate iconv errors
 	lyxerr.disable();
 	if (fixedwidth_) {
@@ -122,10 +142,10 @@ void Encoding::init() const
 			char_type const uc = ucs4[0];
 			CharInfoMap::const_iterator const it = unicodesymbols.find(uc);
 			if (it == unicodesymbols.end())
-				encodable_.insert(uc);
+				encodable.insert(uc);
 			else if (!it->second.force()) {
 				if (forced_->empty() || forced_->find(uc) == forced_->end())
-					encodable_.insert(uc);
+					encodable.insert(uc);
 			}
 		}
 	} else {
@@ -138,22 +158,22 @@ void Encoding::init() const
 			if (!eightbit.empty()) {
 				CharInfoMap::const_iterator const it = unicodesymbols.find(c);
 				if (it == unicodesymbols.end())
-					encodable_.insert(c);
+					encodable.insert(c);
 				else if (!it->second.force()) {
 					if (forced_->empty() || forced_->find(c) == forced_->end())
-						encodable_.insert(c);
+						encodable.insert(c);
 				}
 			}
 		}
 	}
 	lyxerr.enable();
-	CharSet::iterator it = encodable_.find(start_encodable_);
-	while (it != encodable_.end()) {
-		encodable_.erase(it);
-		++start_encodable_;
-		it = encodable_.find(start_encodable_);
+	CharSet::iterator it = encodable.find(start_encodable);
+	while (it != encodable.end()) {
+		encodable.erase(it);
+		++start_encodable;
+		it = encodable.find(start_encodable);
 	}
-	complete_ = true;
+	const_cast<Encoding *>(this)->complete_ = true;
 }
 
 
@@ -240,16 +260,15 @@ vector<char_type> Encoding::symbolsList() const
 	// assure the used encoding is properly initialized
 	init();
 
-	// first all encodable characters
-	vector<char_type> symbols(encodable_.begin(), encodable_.end());
-	// add those below start_encodable_
+	// first all those below start_encodable_
+	vector<char_type> symbols;
 	for (char_type c = 0; c < start_encodable_; ++c)
 		symbols.push_back(c);
+	//add all encodable characters
+	copy(encodable_.begin(), encodable_.end(), back_inserter(symbols));
 	// now the ones from the unicodesymbols file
-	CharInfoMap::const_iterator const end = unicodesymbols.end();
-	CharInfoMap::const_iterator it = unicodesymbols.begin();
-	for (; it != end; ++it)
-		symbols.push_back(it->first);
+	for (pair<char_type, CharInfo> const & elem : unicodesymbols)
+		symbols.push_back(elem.first);
 	return symbols;
 }
 
@@ -298,6 +317,8 @@ char_type Encodings::fromLaTeXCommand(docstring const & cmd, int cmdtype,
 	CharInfoMap::const_iterator const end = unicodesymbols.end();
 	CharInfoMap::const_iterator it = unicodesymbols.begin();
 	for (combining = false; it != end; ++it) {
+		if (it->second.deprecated())
+			continue;
 		docstring const math = it->second.mathcommand();
 		docstring const text = it->second.textcommand();
 		if ((cmdtype & MATH_CMD) && math == cmd) {
@@ -383,6 +404,8 @@ docstring Encodings::fromLaTeXCommand(docstring const & cmd, int cmdtype,
 		size_t unicmd_size = 0;
 		char_type c = 0;
 		for (; it != uniend; ++it) {
+			if (it->second.deprecated())
+				continue;
 			docstring const math = mathmode ? it->second.mathcommand()
 							: docstring();
 			docstring const text = textmode ? it->second.textcommand()
@@ -578,13 +601,25 @@ bool Encodings::isMathAlpha(char_type c)
 }
 
 
+bool Encodings::isUnicodeTextOnly(char_type c)
+{
+	if (isASCII(c) || isMathAlpha(c))
+		return false;
+
+	CharInfoMap::const_iterator const it = unicodesymbols.find(c);
+	return it == unicodesymbols.end() || it->second.mathcommand().empty();
+}
+
+
 Encoding const *
 Encodings::fromLyXName(string const & name, bool allowUnsafe) const
 {
 	EncodingList::const_iterator const it = encodinglist.find(name);
+	if (it == encodinglist.end())
+		return 0;
 	if (!allowUnsafe && it->second.unsafe())
 		return 0;
-	return it != encodinglist.end() ? &it->second : 0;
+	return &it->second;
 }
 
 
@@ -701,6 +736,8 @@ void Encodings::read(FileName const & encfile, FileName const & symbolsfile)
 				flags &= ~CharInfoMathNoTermination;
 			} else if (contains(flag, "tipashortcut=")) {
 				tipashortcut = split(flag, '=');
+			} else if (flag == "deprecated") {
+				flags |= CharInfoDeprecated;
 			} else {
 				lyxerr << "Ignoring unknown flag `" << flag
 				       << "' for symbol `0x"