commit 0f72029c9b46f58ab6014def21c5169011bb7043
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Sun Jul 7 18:01:59 2013 +0200
Fix toggling of 'misc' font options (bug #8764)
diff --git a/src/frontends/qt4/GuiCharacter.cpp
b/src/frontends/qt4/GuiCharacter.cpp
index 53ca720..32f42ea 100644
--- a/src/frontends/qt4/GuiCharacter.cpp
+++ b/src/frontends/qt4/GuiCharacter.cpp
@@ -307,30 +307,38 @@ static void setBar(FontInfo & fi, FontState val)
fi.setEmph(FONT_IGNORE);
fi.setUnderbar(FONT_IGNORE);
fi.setStrikeout(FONT_IGNORE);
+ fi.setUuline(FONT_IGNORE);
+ fi.setUwave(FONT_IGNORE);
fi.setNoun(FONT_IGNORE);
break;
case EMPH_TOGGLE:
+ setBar(fi, INHERIT);
fi.setEmph(FONT_TOGGLE);
break;
case UNDERBAR_TOGGLE:
+ setBar(fi, INHERIT);
fi.setUnderbar(FONT_TOGGLE);
break;
case STRIKEOUT_TOGGLE:
+ setBar(fi, INHERIT);
fi.setStrikeout(FONT_TOGGLE);
break;
case UULINE_TOGGLE:
+ setBar(fi, INHERIT);
fi.setUuline(FONT_TOGGLE);
break;
case UWAVE_TOGGLE:
+ setBar(fi, INHERIT);
fi.setUwave(FONT_TOGGLE);
break;
case NOUN_TOGGLE:
+ setBar(fi, INHERIT);
fi.setNoun(FONT_TOGGLE);
break;
diff --git a/status.20x b/status.20x
index 6559268..c3905fa 100644
--- a/status.20x
+++ b/status.20x
@@ -68,6 +68,8 @@ What's new
- Fix display of appendix counters in some classes (bug 8666).
+- Fix toggling of "misc" font options (bug 8764).
+
- Handle undo correctly when a branch is (de)activated.
- Update a bibliography entry's label when it is emptied.
