X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiCharacter.cpp;h=53ca720d2f2ac129451d935ffa76fa5d8bd1ff3c;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=8aad329218e80a3759bb5edb25974c973b6164f9;hpb=381b86788d382ffe26a1f24427a668b9ee1d061e;p=lyx.git

diff --git a/src/frontends/qt4/GuiCharacter.cpp b/src/frontends/qt4/GuiCharacter.cpp
index 8aad329218..53ca720d2f 100644
--- a/src/frontends/qt4/GuiCharacter.cpp
+++ b/src/frontends/qt4/GuiCharacter.cpp
@@ -76,6 +76,8 @@ static QList<BarPair> barData()
 	bars << BarPair(qt_("No change"), IGNORE);
 	bars << BarPair(qt_("Emph"),      EMPH_TOGGLE);
 	bars << BarPair(qt_("Underbar"),  UNDERBAR_TOGGLE);
+	bars << BarPair(qt_("Double underbar"),  UULINE_TOGGLE);
+	bars << BarPair(qt_("Wavy underbar"),  UWAVE_TOGGLE);
 	bars << BarPair(qt_("Strikeout"),  STRIKEOUT_TOGGLE);
 	bars << BarPair(qt_("Noun"),      NOUN_TOGGLE);
 	bars << BarPair(qt_("Reset"),     INHERIT);
@@ -280,6 +282,12 @@ static FontState getBar(FontInfo const & fi)
 	if (fi.strikeout() == FONT_TOGGLE)
 		return STRIKEOUT_TOGGLE;
 
+	if (fi.uuline() == FONT_TOGGLE)
+		return UULINE_TOGGLE;
+
+	if (fi.uwave() == FONT_TOGGLE)
+		return UWAVE_TOGGLE;
+
 	if (fi.noun() == FONT_TOGGLE)
 		return NOUN_TOGGLE;
 
@@ -314,6 +322,14 @@ static void setBar(FontInfo & fi, FontState val)
 		fi.setStrikeout(FONT_TOGGLE);
 		break;
 
+	case UULINE_TOGGLE:
+		fi.setUuline(FONT_TOGGLE);
+		break;
+
+	case UWAVE_TOGGLE:
+		fi.setUwave(FONT_TOGGLE);
+		break;
+
 	case NOUN_TOGGLE:
 		fi.setNoun(FONT_TOGGLE);
 		break;
@@ -322,6 +338,8 @@ static void setBar(FontInfo & fi, FontState val)
 		fi.setEmph(FONT_INHERIT);
 		fi.setUnderbar(FONT_INHERIT);
 		fi.setStrikeout(FONT_INHERIT);
+		fi.setUuline(FONT_INHERIT);
+		fi.setUwave(FONT_INHERIT);
 		fi.setNoun(FONT_INHERIT);
 		break;
 	}