X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex-accent.C;h=bcbeff0399df1b73da3bdf0444c43e30545d39e2;hb=8d1c58af82d1fc356f470dff97878ab7c3e8a2fe;hp=81abac3f94a4865997941cd939bd2b59fda70f2e;hpb=4b2a999762c83627476428e595d3c1e3704a3da0;p=lyx.git

diff --git a/src/tex-accent.C b/src/tex-accent.C
index 81abac3f94..bcbeff0399 100644
--- a/src/tex-accent.C
+++ b/src/tex-accent.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -50,28 +50,27 @@
    */
 // I am not sure how some of the XWindows names coresponds to the TeX ones.
 
-//static
 tex_accent_struct lyx_accent_table[18] = {
-	{ static_cast<tex_accent>(0), "", "", "", static_cast<kb_action>(0)},
-	{TEX_ACUTE,      "\\'",  " AEIOUYaeiouySZszRLCNrlcn", "acute",   LFUN_ACUTE},
-	{TEX_GRAVE,      "\\`",  " aeiouAEIOU",           "grave",    LFUN_GRAVE},
-	{TEX_MACRON,     "\\=",  " EeAIOUaiou",           "macron",    LFUN_MACRON},
-	{TEX_TILDE,      "\\~",  " ANOanoIiUu",           "tilde",    LFUN_TILDE},
-	{TEX_UNDERBAR,   "\\b", " ",                     "underbar", LFUN_UNDERBAR},
-	{TEX_CEDILLA,    "\\c", " CcSsTtRLGrlgNKnk",     "cedilla",    LFUN_CEDILLA},
-	{TEX_UNDERDOT,   "\\d", " ",                     "underdot", LFUN_UNDERDOT},
-	{TEX_CIRCUMFLEX, "\\^",  " AEIOUaeiouHJhjCGScgs", "circumflex",  LFUN_CIRCUMFLEX},
-	{TEX_CIRCLE,     "\\r", " AaUu",                 "circle",  LFUN_CIRCLE},
-	{TEX_TIE,        "\\t", " ",                     "tie",    LFUN_TIE},
-	{TEX_BREVE,      "\\u", " AaGgUu",               "breve",    LFUN_BREVE},
-	{TEX_CARON,      "\\v", " LSTZlstzCEDNRcednr",   "caron",    LFUN_CARON},
+	{ static_cast<tex_accent>(0), "", /*"",*/ "", static_cast<kb_action>(0)},
+	{TEX_ACUTE,      "\\'",  /*" AEIOUYaeiouySZszRLCNrlcn",*/ "acute",   LFUN_ACUTE},
+	{TEX_GRAVE,      "\\`",  /*" aeiouAEIOU",*/           "grave",    LFUN_GRAVE},
+	{TEX_MACRON,     "\\=",  /*" EeAIOUaiou",*/           "macron",    LFUN_MACRON},
+	{TEX_TILDE,      "\\~",  /*" ANOanoIiUu",*/           "tilde",    LFUN_TILDE},
+	{TEX_UNDERBAR,   "\\b", /*" ",*/                     "underbar", LFUN_UNDERBAR},
+	{TEX_CEDILLA,    "\\c", /*" CcSsTtRLGrlgNKnk",*/     "cedilla",    LFUN_CEDILLA},
+	{TEX_UNDERDOT,   "\\d", /*" ",*/                     "underdot", LFUN_UNDERDOT},
+	{TEX_CIRCUMFLEX, "\\^",  /*" AEIOUaeiouHJhjCGScgs",*/ "circumflex",  LFUN_CIRCUMFLEX},
+	{TEX_CIRCLE,     "\\r", /*" AaUu",*/                 "circle",  LFUN_CIRCLE},
+	{TEX_TIE,        "\\t", /*" ",*/                     "tie",    LFUN_TIE},
+	{TEX_BREVE,      "\\u", /*" AaGgUu",*/               "breve",    LFUN_BREVE},
+	{TEX_CARON,      "\\v", /*" LSTZlstzCEDNRcednr",*/   "caron",    LFUN_CARON},
 //  {TEX_SPECIAL_CARON, "\\q", "", "ooo",  LFUN_SPECIAL_CARON},
-	{TEX_HUNGUML,    "\\H", " OUou",                 "hugarian_umlaut",    LFUN_HUNG_UMLAUT},
-	{TEX_UMLAUT,     "\\\"", " AEIOUaeiouy",          "umlaut",    LFUN_UMLAUT},
-	{TEX_DOT,        "\\.",  " ZzICGicgEe",           "dot",    LFUN_DOT},
-	{TEX_OGONEK,     "\\k",  " AaEe",                 "ogonek",    LFUN_OGONEK},
-	{ static_cast<tex_accent>(0), "", "", "", static_cast<kb_action>(0)}};
-        
+	{TEX_HUNGUML,    "\\H", /*" OUou",*/                 "hugarian_umlaut",    LFUN_HUNG_UMLAUT},
+	{TEX_UMLAUT,     "\\\"", /*" AEIOUaeiouy",*/          "umlaut",    LFUN_UMLAUT},
+	{TEX_DOT,        "\\.",  /*" ZzICGicgEe",*/           "dot",    LFUN_DOT},
+	{TEX_OGONEK,     "\\k",  /*" AaEe",*/                 "ogonek",    LFUN_OGONEK},
+	{ static_cast<tex_accent>(0), "", /*"",*/ "", static_cast<kb_action>(0)}};
+
 
 tex_accent_struct get_accent(kb_action action)
 {
@@ -81,12 +80,13 @@ tex_accent_struct get_accent(kb_action action)
 			return lyx_accent_table[i];
 		++i;
 	}
-	struct tex_accent_struct temp = { static_cast<tex_accent>(0), 0, 0,
+	struct tex_accent_struct temp = { static_cast<tex_accent>(0), 0,
 					  0, static_cast<kb_action>(0)};
 	return temp;
 }
 
-string DoAccent(string const & s, tex_accent accent)
+
+string const DoAccent(string const & s, tex_accent accent)
 {
 	string res;
 	
@@ -100,7 +100,8 @@ string DoAccent(string const & s, tex_accent accent)
 	return res;
 }
 
-string DoAccent(char c, tex_accent accent)
+
+string const DoAccent(char c, tex_accent accent)
 {
 	return DoAccent(tostr(c), accent);
 }