* 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
*
#include "Encoding.h"
+#include "Buffer.h"
+#include "BufferList.h"
+#include "InsetIterator.h"
#include "LaTeXFeatures.h"
#include "Lexer.h"
#include "LyXRC.h"
#include "support/debug.h"
#include "support/FileName.h"
#include "support/lstrings.h"
+#include "support/textutils.h"
#include "support/unicode.h"
#include <boost/cstdint.hpp>
typedef std::set<char_type> CharSet;
CharSet forced;
+typedef std::set<char_type> MathAlphaSet;
+MathAlphaSet mathalpha;
+
/// The highest code point in UCS4 encoding (1<<20 + 1<<16)
char_type const max_ucs4 = 0x110000;
if (!encoding || command.empty()) {
command = it->second.textcommand;
addTextCmd(c);
- } else if (mathmode)
+ }
+ if (mathmode)
addMathSym(c);
}
return use_math;
{
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) {
}
-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();
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
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;
}
+void Encodings::initUnicodeMath(Buffer const & buffer, bool clear_sets)
+{
+#ifdef TEX2LYX
+ // The code below is not needed in tex2lyx and requires additional stuff
+ (void)buffer;
+ (void)clear_sets;
+#else
+ if (clear_sets) {
+ mathcmd.clear();
+ textcmd.clear();
+ mathsym.clear();
+ }
+
+ // Check master
+ Inset & inset = buffer.inset();
+ InsetIterator it = inset_iterator_begin(inset);
+ InsetIterator const end = inset_iterator_end(inset);
+ for (; it != end; ++it)
+ it->initUnicodeMath();
+
+ // Check children
+ BufferList::iterator bit = theBufferList().begin();
+ BufferList::iterator const bend = theBufferList().end();
+ for (; bit != bend; ++bit)
+ if (buffer.isChild(*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
(!for_mathed && !it->second.textcommand.empty());
if (use_math) {
if (!it->second.mathpreamble.empty()) {
- if (it->second.mathfeature)
- features.require(it->second.mathpreamble);
- else
+ if (it->second.mathfeature) {
+ string feats = it->second.mathpreamble;
+ while (!feats.empty()) {
+ string feat;
+ feats = split(feats, feat, ',');
+ features.require(feat);
+ }
+ } else
features.addPreambleSnippet(it->second.mathpreamble);
}
}
if (use_text) {
if (!it->second.textpreamble.empty()) {
- if (it->second.textfeature)
- features.require(it->second.textpreamble);
- else
+ if (it->second.textfeature) {
+ string feats = it->second.textpreamble;
+ while (!feats.empty()) {
+ string feat;
+ feats = split(feats, feat, ',');
+ features.require(feat);
+ }
+ } else
features.addPreambleSnippet(it->second.textpreamble);
}
}
}
if (for_mathed && isMathSym(c)) {
- features.require("relsize");
+ features.require("amstext");
features.require("lyxmathsym");
}
+#endif
}
}
+bool Encodings::isMathAlpha(char_type c)
+{
+ return mathalpha.count(c);
+}
+
+
Encoding const * Encodings::fromLyXName(string const & name) const
{
EncodingList::const_iterator const it = encodinglist.find(name);
}
-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.
while (!flags.empty()) {
string flag;
flags = split(flags, flag, ',');
- if (flag == "combining")
+ if (flag == "combining") {
info.combining = true;
- else if (flag == "force") {
+ } else if (flag == "force") {
info.force = true;
forced.insert(symbol);
- } else
+ } else if (flag == "mathalpha") {
+ mathalpha.insert(symbol);
+ } else {
lyxerr << "Ignoring unknown flag `" << flag
<< "' for symbol `0x"
<< hex << symbol << dec
<< "'." << endl;
+ }
}
// mathcommand and mathpreamble have been added for 1.6.0.
// make them optional so that old files still work.