X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTrans.cpp;h=ed73c7719b397699db193c51efc127059df18577;hb=0c7bd9a57f2a308bb9659200eda3b7e45f8d5d3c;hp=d646156dcf5b9afa8d2609bc9dc47bc84386d795;hpb=8f3acbb4842ff31d1229eec8fba4890be743f2d9;p=lyx.git

diff --git a/src/Trans.cpp b/src/Trans.cpp
index d646156dcf..ed73c7719b 100644
--- a/src/Trans.cpp
+++ b/src/Trans.cpp
@@ -71,7 +71,9 @@ static TeXAccent lyx_accent_table[] = {
 	{TEX_GRAVE,      0x0300, "grave",           LFUN_ACCENT_GRAVE},
 	{TEX_MACRON,     0x0304, "macron",          LFUN_ACCENT_MACRON},
 	{TEX_TILDE,      0x0303, "tilde",           LFUN_ACCENT_TILDE},
-	{TEX_UNDERBAR,   0x0320, "underbar",        LFUN_ACCENT_UNDERBAR},
+	{TEX_PERISPOMENI, 0x0342, "perispomeni",    LFUN_ACCENT_PERISPOMENI},
+	{TEX_UNDERBAR,   0x0320, "underbar",        LFUN_ACCENT_UNDERBAR}, // COMBINING MINUS SIGN BELOW or 0x0331 COMBINING MACRON BELOW ?
+
 	{TEX_CEDILLA,    0x0327, "cedilla",         LFUN_ACCENT_CEDILLA},
 	{TEX_UNDERDOT,   0x0323, "underdot",        LFUN_ACCENT_UNDERDOT},
 	{TEX_CIRCUMFLEX, 0x0302, "circumflex",      LFUN_ACCENT_CIRCUMFLEX},
@@ -170,7 +172,7 @@ enum {
 	KCOMB = 1,
 	KMOD,
 	KMAP,
-	KXMOD,
+	KXMOD
 };
 
 
@@ -285,6 +287,10 @@ int Trans::load(Lexer & lex)
 			allowed = lex.getDocString();
 			LYXERR(Debug::KBMAP, "allowed: " << to_utf8(allowed));
 
+			// FIXME Coverity
+			// This is being flagged because we could in principle fail
+			// ever to hit the break above, in which case we exit the loop
+			// when it == end. Then this crashes.
 			insertException(kmod_list_[accent_1].exception_list,
 					it->first, allowed, true, accent_2);
 		}
@@ -427,10 +433,9 @@ tex_accent getkeymod(string const & p)
 
 
 // TransFSMData
-TransFSMData::TransFSMData()
+TransFSMData::TransFSMData() : deadkey_(0), deadkey2_(0), init_state_(0),
+	deadkey_state_(0), combined_state_(0), currentState(0)
 {
-	deadkey_ = deadkey2_ = 0;
-	deadkey_info_.accent = deadkey2_info_.accent = TEX_NOACCENT;
 }
 
 
@@ -580,7 +585,7 @@ Trans TransManager::default_;
 
 
 TransManager::TransManager()
-	: active_(0)
+	: active_(&default_)
 {}