more changes, read the Changelog

[lyx.git] / src / lyx_cb.C

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 73d595d2f7bae9778cc2813ea64fa63446a5ad36..b8cbbb89a2e43cfbac7b5a15b946f49bbcad928e 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -743,7 +743,7 @@ void MenuMakeLinuxDoc(Buffer * buffer)
        ShowMessage(buffer, _("Building LinuxDoc SGML file `"),
                                          MakeDisplayPath(s),"'...");
        
-       buffer->makeLinuxDocFile(s, 65);
+       buffer->makeLinuxDocFile(s, true);
        buffer->redraw();
        ShowMessage(buffer, _("LinuxDoc SGML file save as"),
                                          MakeDisplayPath(s)); 
@@ -770,7 +770,7 @@ void MenuMakeDocBook(Buffer * buffer)
        ShowMessage(buffer, _("Building DocBook SGML file `"),
                                          MakeDisplayPath(s), "'..."); 
        
-       buffer->makeDocBookFile(s, 65);
+       buffer->makeDocBookFile(s, true);
        buffer->redraw();
        ShowMessage(buffer, _("DocBook SGML file save as"),
                                          MakeDisplayPath(s)); 
@@ -1212,7 +1212,7 @@ int RunLinuxDoc(BufferView * bv, int flag, string const & filename)
        
        if (!bv->available())
                return 0;
-       bv->buffer()->makeLinuxDocFile(name, 0);
+       bv->buffer()->makeLinuxDocFile(name, false);
 
        // CHECK remove this once we have a proper geometry class
 
@@ -1273,7 +1273,7 @@ int RunDocBook(int flag, string const & filename)
        if (!current_view->available())
                return 0;
        
-       current_view->buffer()->makeDocBookFile(name, 0);
+       current_view->buffer()->makeDocBookFile(name, false);
 
        // Shall this code go or should it stay? (Lgb)
        // This code is a placeholder for future implementation. (Jose')
@@ -1910,7 +1910,7 @@ void MenuLayoutSave()
 
 // This is both GUI and LyXFont dependent. Don't know where to put it. (Asger)
 // Well, it's mostly GUI dependent, so I guess it will stay here. (Asger)
-LyXFont UserFreeFont()
+LyXFont UserFreeFont(BufferParams const & params)
 {
        LyXFont font(LyXFont::ALL_IGNORE);
 
@@ -1992,20 +1992,18 @@ LyXFont UserFreeFont()
        case 11: font.setColor(LColor::inherit); break;
        }
 
-       string language = combo_language2->getline();
-       Languages::iterator lit = languages.find(language);
-       if (lit != languages.end()) 
-               font.setLanguage(&(*lit).second);
-       else
-               font.setLanguage(ignore_language);
-
+       int choice = combo_language2->get();
+       if (choice == 1)
+               font.setLanguage(ignore_language);
+       else if (choice == 2)
+               font.setLanguage(params.language_info);
+       else
+               font.setLanguage(&languages[combo_language2->getline()]);
 
        return font; 
 }
 
 
-
-
 /* callbacks for form form_title */
 extern "C" void TimerCB(FL_OBJECT *, long)
 {
@@ -2168,7 +2166,7 @@ extern "C" void CharacterApplyCB(FL_OBJECT *, long)
        // we set toggleall locally here, since it should be true for
        // all other uses of ToggleAndShow() (JMarc)
        toggleall = fl_get_button(fd_form_character->check_toggle_all);
-       ToggleAndShow(current_view, UserFreeFont());
+       ToggleAndShow(current_view, UserFreeFont(current_view->buffer()->params));
        current_view->setState();
        toggleall = true;
 }
@@ -2645,8 +2643,8 @@ extern "C" void TableApplyCB(FL_OBJECT *, long)
                current_view->text->cursor.par()->getParLanguage(current_view->buffer()->params);
        LyXFont font(LyXFont::ALL_INHERIT, lang);
        for (int i = 0; i < xsize * ysize - 1; ++i) {
-               current_view->text->cursor.par()->InsertChar(0, LyXParagraph::META_NEWLINE);
-               current_view->text->cursor.par()->SetFont(0, font);
+               current_view->text->cursor.par()
+                       ->InsertChar(0, LyXParagraph::META_NEWLINE, font);
        }
        current_view->text->RedoParagraph(current_view);