-#include <config.h>
+/**
+ * \file trans.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ * \author Matthias Ettrich
+ *
+ * Full author contact details are available in file CREDITS.
+ */
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <config.h>
-#include "frontends/LyXView.h"
#include "trans.h"
#include "support/filetools.h"
#include "support/lstrings.h"
-#include "tex-strings.h"
#include "lyxlex.h"
#include "debug.h"
#include "trans_mgr.h"
-using std::map;
+
+namespace lyx {
+
+using support::contains;
+using support::libFileSearch;
+
using std::endl;
+using std::string;
+using std::map;
// KmodInfo
Trans::~Trans()
{
- FreeKeymap();
+ freeKeymap();
}
-void Trans::InsertException(KmodException & exclist, char c,
- string const & data, bool flag, tex_accent accent)
+void Trans::insertException(KmodException & exclist, char_type c,
+ docstring const & data, bool flag, tex_accent accent)
{
Keyexc p;
p.c = c;
}
-void Trans::FreeException(KmodException & exclist)
+void Trans::freeException(KmodException & exclist)
{
exclist.clear();
}
-void Trans::FreeKeymap()
+void Trans::freeKeymap()
{
kmod_list_.clear();
keymap_.clear();
}
-bool Trans::IsDefined() const
+bool Trans::isDefined() const
{
return !name_.empty();
}
-string const & Trans::GetName() const
+string const & Trans::getName() const
{
return name_;
}
tex_accent getkeymod(string const &);
-void Trans::AddDeadkey(tex_accent accent, string const & keys)
+void Trans::addDeadkey(tex_accent accent, docstring const & keys)
{
KmodInfo tmp;
tmp.data = keys;
tmp.accent = accent;
kmod_list_[accent] = tmp;
- for (string::size_type i = 0; i < keys.length(); ++i) {
- string tmp;
- tmp += char(0);
- tmp += char(accent);
+ for (docstring::size_type i = 0; i < keys.length(); ++i) {
+ // FIXME This is a hack.
+ // tmp is no valid UCS4 string, but misused to store the
+ // accent.
+ docstring tmp;
+ tmp += char_type(0);
+ tmp += char_type(accent);
keymap_[keys[i]] = tmp;
}
}
-int Trans::Load(LyXLex & lex)
+int Trans::load(LyXLex & lex)
{
bool error = false;
case KMOD:
{
if (lyxerr.debugging(Debug::KBMAP))
- lyxerr << "KMOD:\t" << lex.text() << endl;
+ lyxerr << "KMOD:\t" << lex.getString() << endl;
if (lex.next(true)) {
if (lyxerr.debugging(Debug::KBMAP))
- lyxerr << "key\t`" << lex.text()
- << "'" << endl;
+ lyxerr << "key\t`" << lex.getString()
+ << '\'' << endl;
} else
return -1;
- string const keys = lex.getString();
+ docstring const keys = lex.getDocString();
if (lex.next(true)) {
if (lyxerr.debugging(Debug::KBMAP))
- lyxerr << "accent\t`" << lex.text()
- << "'" << endl;
+ lyxerr << "accent\t`" << lex.getString()
+ << '\'' << endl;
} else
return -1;
// so that this field is not present anymore.
if (lex.next(true)) {
if (lyxerr.debugging(Debug::KBMAP))
- lyxerr << "allowed\t`" << lex.text()
- << "'" << endl;
+ lyxerr << "allowed\t`" << lex.getString()
+ << '\'' << endl;
} else
return -1;
/* string const allowed = lex.getString(); */
- AddDeadkey(accent, keys /*, allowed*/);
+ addDeadkey(accent, keys /*, allowed*/);
#else
- AddDeadkey(accent, keys);
+ addDeadkey(accent, keys);
#endif
break;
}
case KCOMB: {
string str;
- lyxerr[Debug::KBMAP] << "KCOMB:" << endl;
+ LYXERR(Debug::KBMAP) << "KCOMB:" << endl;
if (lex.next(true)) {
- str= lex.text();
- lyxerr[Debug::KBMAP] << str << endl;
+ str = lex.getString();
+ LYXERR(Debug::KBMAP) << str << endl;
} else
return -1;
if (accent_1 == TEX_NOACCENT) return -1;
if (lex.next(true)) {
- str = lex.text();
- lyxerr[Debug::KBMAP] << str << endl;
+ str = lex.getString();
+ LYXERR(Debug::KBMAP) << str << endl;
} else
return -1;
tex_accent accent_2= getkeymod(str);
if (accent_2 == TEX_NOACCENT) return -1;
- map<int, KmodInfo>::iterator it1 =
+ map<tex_accent, KmodInfo>::iterator it1 =
kmod_list_.find(accent_1);
- map<int, KmodInfo>::iterator it2 =
+ map<tex_accent, KmodInfo>::iterator it2 =
kmod_list_.find(accent_2);
if (it1 == kmod_list_.end()
|| it2 == kmod_list_.end()) {
// Find what key accent_2 is on - should
// check about accent_1 also
- map<int, string>::iterator it = keymap_.begin();
- map<int, string>::iterator end = keymap_.end();
+ map<char_type, docstring>::iterator it = keymap_.begin();
+ map<char_type, docstring>::iterator end = keymap_.end();
for (; it != end; ++it) {
if (!it->second.empty()
&& it->second[0] == 0
&& it->second[1] == accent_2)
break;
}
- string allowed;
+ docstring allowed;
if (lex.next()) {
- allowed = lex.getString();
- lyxerr[Debug::KBMAP] << "allowed: "
- << allowed << endl;
+ allowed = lex.getDocString();
+ LYXERR(Debug::KBMAP) << "allowed: "
+ << to_utf8(allowed) << endl;
} else {
return -1;
}
- InsertException(kmod_list_[accent_1].exception_list,
- static_cast<char>(it->first), allowed,
+ insertException(kmod_list_[accent_1].exception_list,
+ it->first, allowed,
true, accent_2);
}
break;
unsigned char key_from;
if (lyxerr.debugging(Debug::KBMAP))
- lyxerr << "KMAP:\t" << lex.text() << endl;
+ lyxerr << "KMAP:\t" << lex.getString() << endl;
if (lex.next(true)) {
- key_from = lex.text()[0];
+ key_from = lex.getString()[0];
if (lyxerr.debugging(Debug::KBMAP))
- lyxerr << "\t`" << lex.text() << "'"
+ lyxerr << "\t`" << lex.getString() << '\''
<< endl;
} else
return -1;
if (lex.next(true)) {
- string string_to = lex.text();
+ docstring const string_to = lex.getDocString();
keymap_[key_from] = string_to;
if (lyxerr.debugging(Debug::KBMAP))
- lyxerr << "\t`" << string_to << "'"
+ lyxerr << "\t`" << to_utf8(string_to) << '\''
<< endl;
} else
return -1;
}
case KXMOD: {
tex_accent accent;
- char key;
- string str;
+ char_type key;
+ docstring str;
if (lyxerr.debugging(Debug::KBMAP))
- lyxerr << "KXMOD:\t" << lex.text() << endl;
+ lyxerr << "KXMOD:\t" << lex.getString() << endl;
if (lex.next(true)) {
if (lyxerr.debugging(Debug::KBMAP))
- lyxerr << "\t`" << lex.text() << "'"
+ lyxerr << "\t`" << lex.getString() << '\''
<< endl;
accent = getkeymod(lex.getString());
} else
if (lex.next(true)) {
if (lyxerr.debugging(Debug::KBMAP))
- lyxerr << "\t`" << lex.text() << "'"
+ lyxerr << "\t`" << lex.getString() << '\''
<< endl;
- key = lex.text()[0];
+ key = lex.getDocString()[0];
} else
return -1;
if (lex.next(true)) {
if (lyxerr.debugging(Debug::KBMAP))
- lyxerr << "\t`" << lex.text() << "'"
+ lyxerr << "\t`" << lex.getString() << '\''
<< endl;
- str = lex.text();
+ str = lex.getDocString();
} else
return -1;
- InsertException(kmod_list_[accent].exception_list,
+ insertException(kmod_list_[accent].exception_list,
key, str);
break;
}
case LyXLex::LEX_FEOF:
- lyxerr[Debug::PARSER] << "End of parsing" << endl;
+ LYXERR(Debug::PARSER) << "End of parsing" << endl;
break;
default:
lex.printError("ParseKeymapFile: "
bool Trans::isAccentDefined(tex_accent accent, KmodInfo & i) const
{
- map<int, KmodInfo>::const_iterator cit = kmod_list_.find(accent);
+ map<tex_accent, KmodInfo>::const_iterator cit = kmod_list_.find(accent);
if (cit != kmod_list_.end()) {
i = cit->second;
return true;
}
-string const Trans::process(char c, TransManager & k)
+docstring const Trans::process(char_type c, TransManager & k)
{
- string const t = Match(static_cast<unsigned char>(c));
+ docstring const t = match(c);
if (t.empty() && c != 0) {
return k.normalkey(c);
- } else if (!t.empty() && t[0] != char(0)) {
+ } else if (!t.empty() && t[0] != 0) {
//return k.normalkey(c);
return t;
} else {
}
-int Trans::Load(string const & language)
+int Trans::load(string const & language)
{
- string const filename = LibFileSearch("kbd", language, "kmap");
+ support::FileName const filename = libFileSearch("kbd", language, "kmap");
if (filename.empty())
return -1;
- FreeKeymap();
- LyXLex lex(kmapTags, K_LAST-1);
+ freeKeymap();
+ LyXLex lex(kmapTags, K_LAST - 1);
lex.setFile(filename);
- int const res = Load(lex);
+ int const res = load(lex);
if (res == 0) {
name_ = language;
lyxerr << "p = " << p
<< ", lyx_accent_table[" << i
<< "].name = `" << lyx_accent_table[i].name
- << "'" << endl;
+ << '\'' << endl;
if (lyx_accent_table[i].name
&& contains(p, lyx_accent_table[i].name)) {
- lyxerr[Debug::KBMAP] << "Found it!" << endl;
+ LYXERR(Debug::KBMAP) << "Found it!" << endl;
return static_cast<tex_accent>(i);
}
}
return TEX_NOACCENT;
}
+
+
+} // namespace lyx