* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-1999 The LyX Team.
+ * Copyright 1995-2000 The LyX Team.
*
* ====================================================== */
#include "lyxrc.h"
#include "trans_mgr.h"
#include "support/lstrings.h"
+#include "language.h"
-extern LyXRC * lyxrc;
+using std::endl;
// a wrapper around the callback static member.
extern "C" void C_Intl_DispatchCallback(FL_OBJECT * ob, long code);
Intl::Intl()
- : prim_lang(lyxrc->primary_kbmap),
- sec_lang(lyxrc->secondary_kbmap),
+ : prim_lang(lyxrc.primary_kbmap),
+ sec_lang(lyxrc.secondary_kbmap),
trans(new TransManager)
{
- keymapon = lyxrc->use_kbmap;
+ keymapon = lyxrc.use_kbmap;
chsetcode = 0;
primarykeymap = false;
curkeymap = 0;
/* read text from choice */
int i = Language->get();
-
- if (lyxerr.debugging(Debug::KBMAP))
- lyxerr << "Table: " << tex_babel[i-1] << endl;
string p;
if (i == otherkeymap)
/* read text from choice */
int i = Language2->get();
-
- if (lyxerr.debugging(Debug::KBMAP))
- lyxerr << "Table: " << tex_babel[i-1] << endl;
string p;
if (i == otherkeymap)
fl_hide_object(fd_form_keymap->KeymapErr);
fl_hide_object(fd_form_keymap->ChsetErr);
- fl_set_input(fd_form_keymap->Charset, lyxrc->font_norm.c_str());
+ fl_set_input(fd_form_keymap->Charset, lyxrc.font_norm.c_str());
// Adds two comboxes to the keyboard map
fl_addto_form(fd_form_keymap->KeyMap);
Language2->add(120, 110, 160, 30, 300); // Secondary
fl_end_form();
- int n = 0;
+ int n = 1;
+ // Default is not in the language map
+ Language->addto("default");
+ Language2->addto("default");
+ for (Languages::const_iterator cit = languages.begin();
+ cit != languages.end(); ++cit) {
+ Language->addto((*cit).second.lang().c_str());
+ Language2->addto((*cit).second.lang().c_str());
+ ++n;
+ }
- while (true)
- if (!strlen(tex_babel[n]))
- break;
- else {
- Language->addto(tex_babel[n]);
- Language2->addto(tex_babel[n]);
- n++;
- }
-
Language->addto(_("other..."));
Language2->addto(_("other..."));
otherkeymap = n + 1;
if (keymapon)
Keymap(23); // turn primary on
- trans->setCharset(lyxrc->font_norm.c_str());
+ trans->setCharset(lyxrc.font_norm.c_str());
}