Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/gcalctool/gcalctool/Makefile.am,v
retrieving revision 1.27
diff -u -r1.27 Makefile.am
--- Makefile.am	12 Sep 2005 16:08:55 -0000	1.27
+++ Makefile.am	19 Dec 2005 15:35:44 -0000
@@ -39,9 +39,7 @@
 	ce_parser.tab.h \
 	lr_parser.c \
 	lr_parser.h \
-	lr_parser.tab.h \
-	syntax_translation.h \
-	syntax_translation.c
+	lr_parser.tab.h
 
 gcalctool_LDADD = \
 	$(PACKAGE_LIBS) \
Index: ce_parser.c
===================================================================
RCS file: /cvs/gnome/gcalctool/gcalctool/ce_parser.c,v
retrieving revision 1.5
diff -u -r1.5 ce_parser.c
--- ce_parser.c	7 Feb 2005 16:38:58 -0000	1.5
+++ ce_parser.c	19 Dec 2005 15:35:44 -0000
@@ -42,7 +42,6 @@
     if (strlen(expression)) {
         parser_state.i = 0;
         parser_state.buff = gc_strdup(expression);
-        translate_tokens(&parser_state.buff);
         ret = ceparse();
         free(parser_state.buff);
     }
Index: ce_tokeniser.l
===================================================================
RCS file: /cvs/gnome/gcalctool/gcalctool/ce_tokeniser.l,v
retrieving revision 1.14
diff -u -r1.14 ce_tokeniser.l
--- ce_tokeniser.l	13 Oct 2005 20:46:17 -0000	1.14
+++ ce_tokeniser.l	19 Dec 2005 15:35:44 -0000
@@ -44,50 +44,50 @@
 
 %%
 
-"abs" {return tABS;}
-"acosh" {return tACOSH;}
-"acos" {return tACOS;}
-"and" {return tAND;}
+"Abs" {return tABS;}
+"Acosh" {return tACOSH;}
+"Acos" {return tACOS;}
+"And" {return tAND;}
 "Ans" {return tANS;}
-"asinh" {return tASINH;}
-"asin" {return tASIN;}
-"atanh" {return tATANH;}
-"atan" {return tATAN;}
-"cbrt" {return tCBRT;}
-"chs" {return tCHS;}
-"clr" {return tCLR;}
-"cosh" {return tCOSH;}
-"cos" {return tCOS;}
-"ctrm" {return tCTRM;}
-"ddb" {return tDDB;}
-"eng" {return tEXP;}
-"frac" {return tFRAC;}
-"fv" {return tFV;}
-"int" {return tINT;}
-"ln" {return tLN;}
-"log" {return tLOG10;}
-"mod" {return tMOD;}
-"not" {return tNOT;}
-"or" {return tOR;}
-"pi" {return tPI;}
-"pmt" {return tPMT;}
-"pv" {return tPV;}
-"rand" {return tRAND;}
-"rate" {return tRATE;}
-"rcl" {return tRCL;}
-"sinh" {return tSINH;}
-"sin" {return tSIN;}
-"sln" {return tSLN;}
-"sqrt" {return tSQRT;}
-"sto" {return tSTO;}
-"syd" {return tSYD;}
-"tanh" {return tTANH;}
-"tan" {return tTAN;}
-"term" {return tTERM;}
+"Asinh" {return tASINH;}
+"Asin" {return tASIN;}
+"Atanh" {return tATANH;}
+"Atan" {return tATAN;}
+"Cbrt" {return tCBRT;}
+"Chs" {return tCHS;}
+"Clr" {return tCLR;}
+"Cosh" {return tCOSH;}
+"Cos" {return tCOS;}
+"Ctrm" {return tCTRM;}
+"Ddb" {return tDDB;}
+"Eng" {return tEXP;}
+"Frac" {return tFRAC;}
+"Fv" {return tFV;}
+"Int" {return tINT;}
+"Ln" {return tLN;}
+"Log" {return tLOG10;}
+"Mod" {return tMOD;}
+"Not" {return tNOT;}
+"Or" {return tOR;}
+"Pi" {return tPI;}
+"Pmt" {return tPMT;}
+"Pv" {return tPV;}
+"Rand" {return tRAND;}
+"Rate" {return tRATE;}
+"Rcl" {return tRCL;}
+"Sinh" {return tSINH;}
+"Sin" {return tSIN;}
+"Sln" {return tSLN;}
+"Sqrt" {return tSQRT;}
+"Sto" {return tSTO;}
+"Syd" {return tSYD;}
+"Tanh" {return tTANH;}
+"Tan" {return tTAN;}
+"Term" {return tTERM;}
 "u16" {return tU16;}
 "u32" {return tU32;}
-"xnor" {return tXNOR;}
-"xor" {return tXOR;}
+"Xnor" {return tXNOR;}
+"Xor" {return tXOR;}
 
 "R"{DIGIT}+ {
 celval.integer = atoi(yytext+1);  
Index: lr_parser.c
===================================================================
RCS file: /cvs/gnome/gcalctool/gcalctool/lr_parser.c,v
retrieving revision 1.5
diff -u -r1.5 lr_parser.c
--- lr_parser.c	7 Feb 2005 16:38:58 -0000	1.5
+++ lr_parser.c	19 Dec 2005 15:35:44 -0000
@@ -42,7 +42,6 @@
     if (strlen(expression)) {
         parser_state.i = 0;
         parser_state.buff = gc_strdup(expression);
-        translate_tokens(&parser_state.buff);
         ret = lrparse();
         free(parser_state.buff);
     }
Index: lr_tokeniser.l
===================================================================
RCS file: /cvs/gnome/gcalctool/gcalctool/lr_tokeniser.l,v
retrieving revision 1.6
diff -u -r1.6 lr_tokeniser.l
--- lr_tokeniser.l	7 Feb 2005 16:38:58 -0000	1.6
+++ lr_tokeniser.l	19 Dec 2005 15:35:44 -0000
@@ -44,48 +44,48 @@
 
 %%
 
-"abs" {return tABS;}
-"acosh" {return tACOSH;}
-"acos" {return tACOS;}
-"and" {return tAND;}
-"asinh" {return tASINH;}
-"asin" {return tASIN;}
-"atanh" {return tATANH;}
-"atan" {return tATAN;}
-"cbrt" {return tCBRT;}
-"chs" {return tCHS;}
-"cosh" {return tCOSH;}
-"cos" {return tCOS;}
-"ddb" {return tDDB;}
-"exp" {return tEXP;}
-"frac" {return tFRAC;}
-"fv" {return tFV;}
-"int" {return tINT;}
-"ln" {return tLN;}
-"log" {return tLOG10;}
-"not" {return tNOT;}
-"or" {return tOR;}
-"pi" {return tPI;}
-"pmt" {return tPMT;}
-"pv" {return tPV;}
-"rand" {return tRAND;}
-"rate" {return tRATE;}
-"sinh" {return tSINH;}
-"sin" {return tSIN;}
-"sln" {return tSLN;}
-"sqrt" {return tSQRT;}
-"syd" {return tSYD;}
-"tanh" {return tTANH;}
-"tan" {return tTAN;}
-"term" {return tTERM;}
+"Abs" {return tABS;}
+"Acosh" {return tACOSH;}
+"Acos" {return tACOS;}
+"And" {return tAND;}
+"Asinh" {return tASINH;}
+"Asin" {return tASIN;}
+"Atanh" {return tATANH;}
+"Atan" {return tATAN;}
+"Cbrt" {return tCBRT;}
+"Chs" {return tCHS;}
+"Cosh" {return tCOSH;}
+"Cos" {return tCOS;}
+"Ddb" {return tDDB;}
+"Exp" {return tEXP;}
+"Frac" {return tFRAC;}
+"Fv" {return tFV;}
+"Int" {return tINT;}
+"Ln" {return tLN;}
+"Log" {return tLOG10;}
+"Not" {return tNOT;}
+"Or" {return tOR;}
+"Pi" {return tPI;}
+"Pmt" {return tPMT;}
+"Pv" {return tPV;}
+"Rand" {return tRAND;}
+"Rate" {return tRATE;}
+"Sinh" {return tSINH;}
+"Sin" {return tSIN;}
+"Sln" {return tSLN;}
+"Sqrt" {return tSQRT;}
+"Syd" {return tSYD;}
+"Tanh" {return tTANH;}
+"Tan" {return tTAN;}
+"Term" {return tTERM;}
 "u16" {return tU16;}
 "u32" {return tU32;}
-"xnor" {return tXNOR;}
-"xor" {return tXOR;}
+"Xnor" {return tXNOR;}
+"Xor" {return tXOR;}
 
-"rcl" {return tRCL;}
-"sto" {return tSTO;}
-"clr" {return tCLR;}
+"Rcl" {return tRCL;}
+"Sto" {return tSTO;}
+"Clr" {return tCLR;}
 
 {DIGIT}+ {
   if (strlen(yytext) > 40) parser_state.error = EINVAL;
