X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FEncoding.cpp;h=a8846527b44727d14d04131358a3e888ef5b5282;hb=0c1c13bbd0bd6b70ccec79f7ae68e230d3e46a57;hp=41f96420cb36d90d4773ad4d04b512c7f6d4430e;hpb=5ca3be4d672dc1e6edc4ff6b547a240adae23290;p=lyx.git

diff --git a/src/Encoding.cpp b/src/Encoding.cpp
index 41f96420cb..a8846527b4 100644
--- a/src/Encoding.cpp
+++ b/src/Encoding.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Jean-Marc Lasgouttes
  * \author Dekel Tsur
  *
@@ -15,6 +15,7 @@
 #include "Encoding.h"
 
 #include "Buffer.h"
+#include "BufferList.h"
 #include "InsetIterator.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
@@ -23,6 +24,7 @@
 #include "support/debug.h"
 #include "support/FileName.h"
 #include "support/lstrings.h"
+#include "support/textutils.h"
 #include "support/unicode.h"
 
 #include <boost/cstdint.hpp>
@@ -342,7 +344,7 @@ void Encoding::init() const
 }
 
 
-docstring Encoding::latexChar(char_type c, bool for_mathed) const
+docstring Encoding::latexChar(char_type c, bool no_commands) const
 {
 	// assure the used encoding is properly initialized
 	init();
@@ -353,7 +355,7 @@ docstring Encoding::latexChar(char_type c, bool for_mathed) const
 		return docstring(1, c);
 	if (encodable_.find(c) != encodable_.end())
 		return docstring(1, c);
-	if (for_mathed)
+	if (no_commands)
 		return docstring();
 
 	// c cannot (or should not) be encoded in this encoding
@@ -410,7 +412,8 @@ bool Encodings::latexMathChar(char_type c, bool mathmode,
 		if (!encoding || command.empty()) {
 			command = it->second.textcommand;
 			addTextCmd(c);
-		} else if (mathmode)
+		}
+		if (mathmode)
 			addMathSym(c);
 	}
 	return use_math;
@@ -421,7 +424,7 @@ char_type Encodings::fromLaTeXCommand(docstring const & cmd, bool & combining)
 {
 	CharInfoMap::const_iterator const end = unicodesymbols.end();
 	CharInfoMap::const_iterator it = unicodesymbols.begin();
-	for (; it != end; ++it) {
+	for (combining = false; it != end; ++it) {
 		docstring const math = it->second.mathcommand;
 		docstring const text = it->second.textcommand;
 		if (math == cmd || text == cmd) {
@@ -433,8 +436,11 @@ char_type Encodings::fromLaTeXCommand(docstring const & cmd, bool & combining)
 }
 
 
-docstring Encodings::fromLaTeXCommand(docstring const & cmd, docstring & rem)
+docstring Encodings::fromLaTeXCommand(docstring const & cmd, docstring & rem,
+				      int cmdtype)
 {
+	bool const mathmode = cmdtype & MATH_CMD;
+	bool const textmode = cmdtype & TEXT_CMD;
 	docstring symbols;
 	size_t i = 0;
 	size_t const cmdend = cmd.size();
@@ -465,8 +471,10 @@ docstring Encodings::fromLaTeXCommand(docstring const & cmd, docstring & rem)
 		size_t unicmd_size = 0;
 		char_type c = 0;
 		for (; it != uniend; ++it) {
-			docstring const math = it->second.mathcommand;
-			docstring const text = it->second.textcommand;
+			docstring const math = mathmode ? it->second.mathcommand
+							: docstring();
+			docstring const text = textmode ? it->second.textcommand
+							: docstring();
 			size_t cur_size = max(math.size(), text.size());
 			// The current math or text unicode command cannot
 			// match, or we already matched a longer one
@@ -492,8 +500,23 @@ docstring Encodings::fromLaTeXCommand(docstring const & cmd, docstring & rem)
 				tmp.resize(tmp.size() - 1);
 
 			// If this is an exact match, we found a (longer)
-			// matching command in the unicodesymbols file
-			if (math == tmp || text == tmp) {
+			// matching entry in the unicodesymbols file.
+			// If the entry doesn't start with '\', we take note
+			// of the match and continue (this is not a ultimate
+			// acceptance, as some other entry may match a longer
+			// portion of the cmd string). However, if the entry
+			// does start with '\', we accept the match only if
+			// this is a valid macro, i.e., either it is a single
+			// (nonletter) char macro, or nothing else follows,
+			// or what follows is a nonletter char, or the last
+			// character is a }.
+			if ((math == tmp || text == tmp)
+			    && (tmp[0] != '\\'
+				   || (tmp.size() == 2 && !isAlphaASCII(tmp[1]))
+				   || k == cmdend 
+				   || !isAlphaASCII(cmd[k])
+				   || tmp[tmp.size() - 1] == '}')
+				 ) {
 				c = it->first;
 				j = k - 1;
 				i = j + 1;
@@ -510,23 +533,47 @@ docstring Encodings::fromLaTeXCommand(docstring const & cmd, docstring & rem)
 }
 
 
-void Encodings::initUnicodeMath(Buffer const & buffer)
+void Encodings::initUnicodeMath(Buffer const & buffer, bool for_master)
 {
-	mathcmd.clear();
-	textcmd.clear();
-	mathsym.clear();
+#ifdef TEX2LYX
+	// The code below is not needed in tex2lyx and requires additional stuff
+	(void)buffer;
+	(void)for_master;
+#else
+	if (for_master) {
+		mathcmd.clear();
+		textcmd.clear();
+		mathsym.clear();
+	}
 
+	// Check this buffer
 	Inset & inset = buffer.inset();
 	InsetIterator it = inset_iterator_begin(inset);
 	InsetIterator const end = inset_iterator_end(inset);
-
 	for (; it != end; ++it)
 		it->initUnicodeMath();
+
+	if (!for_master)
+		return;
+
+	// Check children
+	ListOfBuffers blist = buffer.getDescendents();
+	ListOfBuffers::const_iterator bit = blist.begin();
+	ListOfBuffers::const_iterator const bend = blist.end();
+	for (; bit != bend; ++bit)
+		initUnicodeMath(**bit, false);
+#endif
 }
 
 
 void Encodings::validate(char_type c, LaTeXFeatures & features, bool for_mathed)
 {
+#ifdef TEX2LYX
+	// The code below is not needed in tex2lyx and requires additional stuff
+	(void)c;
+	(void)features;
+	(void)for_mathed;
+#else
 	CharInfoMap::const_iterator const it = unicodesymbols.find(c);
 	if (it != unicodesymbols.end()) {
 		// In mathed, c could be used both in textmode and mathmode
@@ -559,16 +606,13 @@ void Encodings::validate(char_type c, LaTeXFeatures & features, bool for_mathed)
 				} else
 					features.addPreambleSnippet(it->second.textpreamble);
 			}
-			if (for_mathed) {
-				features.require("relsize");
-				features.require("lyxmathsym");
-			}
 		}
 	}
 	if (for_mathed && isMathSym(c)) {
-		features.require("relsize");
+		features.require("amstext");
 		features.require("lyxmathsym");
 	}
+#endif
 }
 
 
@@ -655,8 +699,14 @@ Encoding const * Encodings::fromLyXName(string const & name) const
 }
 
 
-Encoding const * Encodings::fromLaTeXName(string const & name) const
+Encoding const * Encodings::fromLaTeXName(string const & n) const
 {
+	string name = n;
+	// FIXME: if we have to test for too many of these synonyms,
+	// we should instead extend the format of lib/encodings
+	if (n == "ansinew")
+		name = "cp1252";
+
 	// We don't use find_if because it makes copies of the pairs in
 	// the map.
 	// This linear search is OK since we don't have many encodings.
@@ -756,6 +806,10 @@ void Encodings::read(FileName const & encfile, FileName const & symbolsfile)
 			breakout = true;
 		}
 
+		// backward compatibility
+		if (info.mathpreamble == "esintoramsmath")
+			info.mathpreamble = "esint|amsmath";
+
 		if (!info.textpreamble.empty())
 			info.textfeature = info.textpreamble[0] != '\\';
 		if (!info.mathpreamble.empty())
@@ -778,7 +832,7 @@ void Encodings::read(FileName const & encfile, FileName const & symbolsfile)
 	// Now read the encodings
 	enum {
 		et_encoding = 1,
-		et_end,
+		et_end
 	};
 
 	LexerKeyword encodingtags[] = {