X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTrans.h;h=4befc657402071db3f2755ba1f150efd5f0c835a;hb=88034d3d8987a9601b0779bf0115b5105b16fd6e;hp=a3eb93c2c1cfb4c135628f302cf42bb060816c13;hpb=4b5026c2e21316bdf008f310b535442f05110d4f;p=lyx.git

diff --git a/src/Trans.h b/src/Trans.h
index a3eb93c2c1..4befc65740 100644
--- a/src/Trans.h
+++ b/src/Trans.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Matthias Ettrich
  * \author John Levon
  *
@@ -14,7 +14,8 @@
 #ifndef TRANS_H
 #define TRANS_H
 
-#include "lfuns.h"
+#include "FuncCode.h"
+
 #include "support/docstring.h"
 
 #include <list>
@@ -41,6 +42,8 @@ enum tex_accent {
 	///
 	TEX_TILDE,
 	///
+	TEX_PERISPOMENI,
+	///
 	TEX_UNDERBAR,
 	///
 	TEX_CEDILLA,
@@ -70,7 +73,7 @@ enum tex_accent {
 };
 
 
-struct tex_accent_struct {
+struct TeXAccent {
 	///
 	tex_accent accent;
 	/// UCS4 code point of this accent
@@ -78,15 +81,17 @@ struct tex_accent_struct {
 	///
 	char const * name;
 	///
-	kb_action action;
+	FuncCode action;
 };
 
 ///
-extern tex_accent_struct get_accent(kb_action action);
+extern TeXAccent get_accent(FuncCode action);
 
 
 ///
 struct Keyexc {
+	///
+	Keyexc() : c('\0'), combined(false), accent(TEX_NOACCENT) {}
 	/// character to make exception
 	char_type c;
 	/// exception data
@@ -103,6 +108,8 @@ typedef std::list<Keyexc> KmodException;
 ///
 class KmodInfo {
 public:
+	///
+	KmodInfo() : accent(TEX_NOACCENT) {}
 	///
 	docstring data;
 	///
@@ -162,8 +169,7 @@ private:
 
 
 ///
-inline
-docstring const & Trans::match(char_type c)
+inline docstring const & Trans::match(char_type c)
 {
 	std::map<char_type, docstring>::iterator it = keymap_.find(c);
 	if (it != keymap_.end()) {