[LyX/master] GuiCharacter: Consider default settings for underline, strikeout and language

[Juergen Spitzmueller]

commit bf2bf2eaedadf39a6398db624c8b6c52099ca31d
Author: Juergen Spitzmueller <sp...@lyx.org>
Date:   Mon Dec 17 10:12:02 2018 +0100

    GuiCharacter: Consider default settings for underline, strikeout and 
language
---
 src/frontends/qt4/GuiCharacter.cpp |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/frontends/qt4/GuiCharacter.cpp 
b/src/frontends/qt4/GuiCharacter.cpp
index c77b9bf..aaacb0c 100644
--- a/src/frontends/qt4/GuiCharacter.cpp
+++ b/src/frontends/qt4/GuiCharacter.cpp
@@ -348,6 +348,9 @@ FontState getBar(FontInfo const & fi)
        if (fi.underbar() == FONT_IGNORE)
                return IGNORE;
 
+       if (fi.underbar() == FONT_INHERIT)
+               return INHERIT;
+
        return NONE;
 }
 
@@ -363,6 +366,9 @@ FontState getStrike(FontInfo const & fi)
        if (fi.strikeout() == FONT_IGNORE)
                return IGNORE;
 
+       if (fi.strikeout() == FONT_INHERIT)
+               return INHERIT;
+
        return NONE;
 }
 
@@ -447,6 +453,10 @@ void GuiCharacter::updateContents()
        } else
                font_ = bufferview()->cursor().current_font;
 
+       // If we use the buffer language, display "Default"
+       if (font_.language() == buffer().params().language)
+               font_.setLanguage(reset_language);
+
        paramsToDialog(font_);
 }