#include "debug.h"
#include "trans_mgr.h"
+using std::endl;
+
// KmodInfo
KmodInfo::KmodInfo()
Trans::Trans()
{
- int i;
-
- for(i = 0; i < 256; ++i)
+ int i = 0;
+ for(; i < 256; ++i)
keymap_[i] = 0;
for(i = 0; i < TEX_MAX_ACCENT + 1; ++i)
void Trans::InsertException(Trans::keyexc & exclist, char c,
string const & data, bool flag, tex_accent accent)
{
- keyexc p;
-
- p = new Keyexc;
+ keyexc p = new Keyexc;
p->next = exclist;
p->c = c;
void Trans::FreeException(Trans::keyexc & exclist)
{
- Trans::keyexc p;
-
- p = exclist;
+ Trans::keyexc p = exclist;
while (p) {
p = exclist->next;
delete exclist;
void Trans::FreeKeymap()
{
- int i;
-
- for(i = 0; i < 256; ++i)
+ int i = 0;
+ for(; i < 256; ++i)
if (keymap_[i]) {
delete keymap_[i];
keymap_[i] = 0;
};
-struct keyword_item kmapTags[K_LAST-1] = {
+struct keyword_item kmapTags[K_LAST - 1] = {
{"\\kcomb", KCOMB },
{ "\\kmap", KMAP },
{ "\\kmod", KMOD },
}
for(string::size_type i = 0; i < keys.length(); ++i) {
- char * temp;
- temp = keymap_[static_cast<unsigned char>(keys[i])] = new char[2];
+ char * temp =
+ keymap_[static_cast<unsigned char>(keys[i])] =
+ new char[2];
temp[0] = 0; temp[1] = accent;
}
kmod_list_[accent]->exception_list = 0;
} else
return -1;
- tex_accent accent_1= getkeymod(str);
+ tex_accent accent_1 = getkeymod(str);
if (accent_1 == TEX_NOACCENT) return -1;
if (lex.next(true)) {
- str= lex.text();
+ str = lex.text();
lyxerr[Debug::KBMAP] << str << endl;
} else
return -1;
tex_accent accent_2= getkeymod(str);
if (accent_2 == TEX_NOACCENT) return -1;
- if (kmod_list_[accent_1] == 0 || kmod_list_[accent_2] == 0)
+ if (kmod_list_[accent_1] == 0
+ || kmod_list_[accent_2] == 0)
return -1;
- // Find what key accent_2 is on - should check about accent_1 also
- int key;
-
- for(key = 0; key < 256; ++key) {
+ // Find what key accent_2 is on - should
+ // check about accent_1 also
+ int key = 0;
+ for(; key < 256; ++key) {
if (keymap_[key] && keymap_[key][0] == 0
&& keymap_[key][1] == accent_2)
break;
} else
return -1;
- InsertException(kmod_list_[accent_1]->exception_list,(char)key, allowed, true, accent_2);
+ InsertException(kmod_list_[accent_1]->exception_list,
+ static_cast<char>(key), allowed,
+ true, accent_2);
}
break;
case KMAP: {
unsigned char key_from;
- char * string_to;
if (lyxerr.debugging(Debug::KBMAP))
lyxerr << "KMAP:\t" << lex.text() << endl;
if (lex.next(true)) {
- key_from= lex.text()[0];
+ key_from = lex.text()[0];
if (lyxerr.debugging(Debug::KBMAP))
lyxerr << "\t`" << lex.text() << "'"
<< endl;
if (lex.next(true)) {
char const * t = lex.text();
- string_to = strcpy(new char[strlen(t)+1], t);
+ char * string_to =
+ strcpy(new char[strlen(t)+1], t);
keymap_[key_from] = string_to;
if (lyxerr.debugging(Debug::KBMAP))
lyxerr << "\t`" << string_to << "'"
} else
return -1;
- InsertException(kmod_list_[accent]->exception_list, key, str);
+ InsertException(kmod_list_[accent]->exception_list,
+ key, str);
break;
}
case LyXLex::LEX_FEOF:
{
char dummy[2] = "?";
char * dt = dummy;
- char * t = Match(c);
+ char * t = Match(static_cast<unsigned char>(c));
if ((t == 0 && (*dt = c)) || (t[0] != 0 && (dt = t)) ){
return k.normalkey(c, dt);
} else {
- return k.deadkey(c, *kmod_list_[(tex_accent)t[1]]);
+ return k.deadkey(c,
+ *kmod_list_[static_cast<tex_accent>(t[1])]);
}
}
if (res == 0) {
name_ = language;
} else
- name_.clear();
+ name_.erase();
return res;
}
<< "].name = `" << lyx_accent_table[i].name
<< "'" << endl;
- if ( lyx_accent_table[i].name && contains(p, lyx_accent_table[i].name)) {
+ if ( lyx_accent_table[i].name
+ && contains(p, lyx_accent_table[i].name)) {
lyxerr[Debug::KBMAP] << "Found it!" << endl;
- return (tex_accent)i;
+ return static_cast<tex_accent>(i);
}
}
return TEX_NOACCENT;