X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex-accent.C;h=81abac3f94a4865997941cd939bd2b59fda70f2e;hb=a69e7a45780e94f4330a91facfe35126c678e34e;hp=24da40e6a397a263a33ed82c77d8dd59da84a555;hpb=27de1486ca34aaad446adb798d71a77d6f6304da;p=lyx.git

diff --git a/src/tex-accent.C b/src/tex-accent.C
index 24da40e6a3..81abac3f94 100644
--- a/src/tex-accent.C
+++ b/src/tex-accent.C
@@ -1,9 +1,24 @@
+/* This file is part of
+ * ====================================================== 
+ * 
+ *           LyX, The Document Processor
+ *        
+ *           Copyright 1995 Matthias Ettrich
+ *           Copyright 1995-2000 The LyX Team.
+ *
+ * ====================================================== */
+
 #include <config.h>
 
-#include <stdlib.h>
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
+#include <cstdlib>
 #include "tex-accent.h"
 #include "commandtags.h"
 #include "LString.h"
+#include "support/lstrings.h"
 
 /* the names used by TeX and XWindows for deadkeys/accents are not the same
    so here follows a table to clearify the differences. Please correct this
@@ -36,9 +51,9 @@
 // I am not sure how some of the XWindows names coresponds to the TeX ones.
 
 //static
-tex_accent_struct lyx_accent_table[18] ={
-	{ (tex_accent)0, "", "", "",(kb_action)0},
-	{TEX_ACUTE,      "\\'",  " AEIOUYaeiouySZszRLCNrlcn","acute",   LFUN_ACUTE},
+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},
@@ -50,43 +65,43 @@ tex_accent_struct lyx_accent_table[18] ={
 	{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_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},
-	{ (tex_accent)0, "", "", "",(kb_action)0}};
+	{ static_cast<tex_accent>(0), "", "", "", static_cast<kb_action>(0)}};
         
 
 tex_accent_struct get_accent(kb_action action)
 {
-	int i=0;
-	while (i<=TEX_MAX_ACCENT){
+	int i = 0;
+	while (i <= TEX_MAX_ACCENT){
 		if (lyx_accent_table[i].action == action)
 			return lyx_accent_table[i];
-		i++;
+		++i;
 	}
-	struct tex_accent_struct temp = { (tex_accent)0, NULL, NULL,
-					  NULL,(kb_action)0};
+	struct tex_accent_struct temp = { static_cast<tex_accent>(0), 0, 0,
+					  0, static_cast<kb_action>(0)};
 	return temp;
 }
 
-LString DoAccent(const LString& s,tex_accent accent)
+string DoAccent(string const & s, tex_accent accent)
 {
-	LString res;
+	string res;
 	
-	res+=lyx_accent_table[accent].cmd;
-	res+='{';
-	if (s=="i" || s=="j") {
-		res+='\\';
+	res += lyx_accent_table[accent].cmd;
+	res += '{';
+	if (s == "i" || s == "j") {
+		res += '\\';
 	}
-	res+=s;
-	res+='}';
+	res += s;
+	res += '}';
 	return res;
 }
 
-LString DoAccent(char c,tex_accent accent)
+string DoAccent(char c, tex_accent accent)
 {
-	return DoAccent(LString(c),accent);
+	return DoAccent(tostr(c), accent);
 }