[EMAIL PROTECTED] wrote: > Author: baum > Date: Thu Mar 22 13:29:12 2007 > New Revision: 17508 > > URL: http://www.lyx.org/trac/changeset/17508 > Log: > Fix bug 440 > > Modified: > lyx-devel/branches/personal/baum/BRANCH_1_4_X_GB/src/frontends/controllers/ControlCharacter.C > lyx-devel/branches/personal/baum/BRANCH_1_4_X_GB/src/frontends/controllers/ControlCharacter.h > > Modified: > lyx-devel/branches/personal/baum/BRANCH_1_4_X_GB/src/frontends/controllers/ControlCharacter.C > URL: > http://www.lyx.org/trac/file/lyx-devel/branches/personal/baum/BRANCH_1_4_X_GB/src/frontends/controllers/ControlCharacter.C?rev=17508 > ============================================================================== > --- > lyx-devel/branches/personal/baum/BRANCH_1_4_X_GB/src/frontends/controllers/ControlCharacter.C > (original) +++ > lyx-devel/branches/personal/baum/BRANCH_1_4_X_GB/src/frontends/controllers/ControlCharacter.C > Thu Mar 22 13:29:12 2007 @@ -29,7 +29,7 @@ > > ControlCharacter::ControlCharacter(Dialog & parent) > : Dialog::Controller(parent), > - font_(0), toggleall_(false) > + font_(0), toggleall_(false), reset_lang_(false) > {} > > > @@ -212,6 +212,8 @@ > > string ControlCharacter::getLanguage() const > { > + if (reset_lang_) > + return "reset"; > if (font_.get() && font_->language()) > return font_->language()->lang(); > return "ignore"; > @@ -222,11 +224,11 @@ > { > if (val == "ignore") > font_->setLanguage(ignore_language); > - > - else if (val == "reset") > + else if (val == "reset") { > + reset_lang_ = true; > + // Ignored in getLanguage, but needed for dispatchParams > font_->setLanguage(kernel().buffer().params().language); > - > - else > + } else > font_->setLanguage(languages.getLanguage(val)); > } > > > Modified: > lyx-devel/branches/personal/baum/BRANCH_1_4_X_GB/src/frontends/controllers/ControlCharacter.h > URL: > http://www.lyx.org/trac/file/lyx-devel/branches/personal/baum/BRANCH_1_4_X_GB/src/frontends/controllers/ControlCharacter.h?rev=17508 > ============================================================================== > --- > lyx-devel/branches/personal/baum/BRANCH_1_4_X_GB/src/frontends/controllers/ControlCharacter.h > (original) +++ > lyx-devel/branches/personal/baum/BRANCH_1_4_X_GB/src/frontends/controllers/ControlCharacter.h > Thu Mar 22 13:29:12 2007 @@ -75,6 +75,9 @@ > boost::scoped_ptr<LyXFont> font_; > /// > bool toggleall_; > + /// If true the language should be reset. > + /// If false the language of font_ is used. > + bool reset_lang_; > }; > > } // namespace frontend
This did annoy me so much today that I fixed it. The same patch should work in trunk, too. Shall I put it in? Georg
