X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fsymbol.cpp;h=f5fd4a090b0df1f1ab66440b730d31b520104ada;hp=4328d19bfd59634b34e079c805dff796c2e4ab02;hb=f30eb24864efd57bd7271cfccd8e526321682266;hpb=094911eb78cacb6f2877a70c9ac74766df58ccea

diff --git a/ginac/symbol.cpp b/ginac/symbol.cpp
index 4328d19b..f5fd4a09 100644
--- a/ginac/symbol.cpp
+++ b/ginac/symbol.cpp
@@ -25,8 +25,10 @@
 
 #include "symbol.h"
 #include "lst.h"
+#include "print.h"
 #include "archive.h"
 #include "debugmsg.h"
+#include "tostring.h"
 #include "utils.h"
 
 namespace GiNaC {
@@ -40,7 +42,7 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_NO_CTORS(symbol, basic)
 symbol::symbol() : inherited(TINFO_symbol), serial(next_serial++)
 {
 	debugmsg("symbol default ctor", LOGLEVEL_CONSTRUCT);
-	name = autoname_prefix()+ToString(serial);
+	name = TeX_name = autoname_prefix()+ToString(serial);
 	asexinfop = new assigned_ex_info;
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
@@ -50,6 +52,7 @@ void symbol::copy(const symbol & other)
 {
 	inherited::copy(other);
 	name = other.name;
+	TeX_name = other.TeX_name;
 	serial = other.serial;
 	asexinfop = other.asexinfop;
 	++asexinfop->refcount;
@@ -79,6 +82,17 @@ symbol::symbol(const std::string & initname) : inherited(TINFO_symbol)
 {
 	debugmsg("symbol ctor from string", LOGLEVEL_CONSTRUCT);
 	name = initname;
+	TeX_name = default_TeX_name();
+	serial = next_serial++;
+	asexinfop = new assigned_ex_info;
+	setflag(status_flags::evaluated | status_flags::expanded);
+}
+
+symbol::symbol(const std::string & initname, const std::string & texname) : inherited(TINFO_symbol)
+{
+	debugmsg("symbol ctor from string", LOGLEVEL_CONSTRUCT);
+	name = initname;
+	TeX_name = texname;
 	serial = next_serial++;
 	asexinfop = new assigned_ex_info;
 	setflag(status_flags::evaluated | status_flags::expanded);
@@ -95,6 +109,8 @@ symbol::symbol(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst
 	serial = next_serial++;
 	if (!(n.find_string("name", name)))
 		name = autoname_prefix() + ToString(serial);
+	if (!(n.find_string("TeXname", TeX_name)))
+		TeX_name = default_TeX_name();
 	asexinfop = new assigned_ex_info;
 	setflag(status_flags::evaluated);
 }
@@ -106,7 +122,7 @@ ex symbol::unarchive(const archive_node &n, const lst &sym_lst)
 	
 	// If symbol is in sym_lst, return the existing symbol
 	for (unsigned i=0; i<sym_lst.nops(); i++) {
-		if (is_ex_of_type(sym_lst.op(i), symbol) && (ex_to_symbol(sym_lst.op(i)).name == ex_to_symbol(s).name))
+		if (is_ex_of_type(sym_lst.op(i), symbol) && (ex_to<symbol>(sym_lst.op(i)).name == ex_to<symbol>(s).name))
 			return sym_lst.op(i);
 	}
 	return s;
@@ -117,10 +133,12 @@ void symbol::archive(archive_node &n) const
 {
 	inherited::archive(n);
 	n.add_string("name", name);
+	if (TeX_name != default_TeX_name())
+		n.add_string("TeX_name", TeX_name);
 }
 
 //////////
-// functions overriding virtual functions from bases classes
+// functions overriding virtual functions from base classes
 //////////
 
 // public
@@ -131,33 +149,21 @@ basic *symbol::duplicate() const
 	return new symbol(*this);
 }
 
-void symbol::print(std::ostream & os, unsigned upper_precedence) const
+void symbol::print(const print_context & c, unsigned level) const
 {
-	debugmsg("symbol print",LOGLEVEL_PRINT);
-	os << name;
-}
+	debugmsg("symbol print", LOGLEVEL_PRINT);
 
-void symbol::printraw(std::ostream & os) const
-{
-	debugmsg("symbol printraw",LOGLEVEL_PRINT);
-	os << class_name() << "(" << "name=" << name << ",serial=" << serial
-	   << ",hash=" << hashvalue << ",flags=" << flags << ")";
-}
+	if (is_of_type(c, print_tree)) {
 
-void symbol::printtree(std::ostream & os, unsigned indent) const
-{
-	debugmsg("symbol printtree",LOGLEVEL_PRINT);
-	os << std::string(indent,' ') << name << " (symbol): "
-	   << "serial=" << serial
-	   << ", hash=" << hashvalue
-	   << " (0x" << std::hex << hashvalue << std::dec << ")"
-	   << ", flags=" << flags << std::endl;
-}
+		c.s << std::string(level, ' ') << name << " (" << class_name() << ")"
+		    << ", serial=" << serial
+		    << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
+		    << std::endl;
 
-void symbol::printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence) const
-{
-	debugmsg("symbol print csrc", LOGLEVEL_PRINT);
-	os << name;
+	} else if (is_of_type(c, print_latex))
+		c.s << TeX_name;
+	else
+		c.s << name;
 }
 
 bool symbol::info(unsigned inf) const
@@ -174,32 +180,19 @@ bool symbol::info(unsigned inf) const
 		return inherited::info(inf);
 }
 
-ex symbol::expand(unsigned options) const
+int symbol::degree(const ex & s) const
 {
-	return this->hold();
+	return is_equal(*s.bp) ? 1 : 0;
 }
 
-bool symbol::has(const ex & other) const
+int symbol::ldegree(const ex & s) const
 {
-	if (this->is_equal(*other.bp))
-		return true;
-	else
-		return false;
+	return is_equal(*s.bp) ? 1 : 0;
 }
 
-int symbol::degree(const symbol & s) const
+ex symbol::coeff(const ex & s, int n) const
 {
-	return compare_same_type(s)==0 ? 1 : 0;
-}
-
-int symbol::ldegree(const symbol & s) const
-{
-	return compare_same_type(s)==0 ? 1 : 0;
-}
-
-ex symbol::coeff(const symbol & s, int n) const
-{
-	if (compare_same_type(s)==0)
+	if (is_equal(*s.bp))
 		return n==1 ? _ex1() : _ex0();
 	else
 		return n==0 ? *this : _ex0();
@@ -221,19 +214,6 @@ ex symbol::eval(int level) const
 	}
 }
 
-ex symbol::subs(const lst & ls, const lst & lr) const
-{
-	GINAC_ASSERT(ls.nops()==lr.nops());
-
-	for (unsigned i=0; i<ls.nops(); i++) {
-		if (is_ex_exactly_of_type(ls.op(i),symbol)) {
-			if (compare_same_type(ex_to_symbol(ls.op(i)))==0)
-				return lr.op(i);
-		}
-	}
-	return *this;
-}
-
 // protected
 
 /** Implementation of ex::diff() for single differentiation of a symbol.
@@ -263,16 +243,6 @@ bool symbol::is_equal_same_type(const basic & other) const
 	return serial==o->serial;
 }
 
-unsigned symbol::return_type(void) const
-{
-	return return_types::commutative;
-}
-   
-unsigned symbol::return_type_tinfo(void) const
-{
-	return tinfo_key;
-}
-
 unsigned symbol::calchash(void) const
 {
 	// this is where the schoolbook method
@@ -321,6 +291,28 @@ std::string & symbol::autoname_prefix(void)
 	return *s;
 }
 
+/** Return default TeX name for symbol. This recognizes some greek letters. */
+std::string symbol::default_TeX_name(void) const
+{
+	if (name=="alpha"        || name=="beta"         || name=="gamma"
+	 || name=="delta"        || name=="epsilon"      || name=="varepsilon"
+	 || name=="zeta"         || name=="eta"          || name=="theta"
+	 || name=="vartheta"     || name=="iota"         || name=="kappa"
+	 || name=="lambda"       || name=="mu"           || name=="nu"
+	 || name=="xi"           || name=="omicron"      || name=="pi"
+	 || name=="varpi"        || name=="rho"          || name=="varrho"
+	 || name=="sigma"        || name=="varsigma"     || name=="tau"
+	 || name=="upsilon"      || name=="phi"          || name=="varphi"
+	 || name=="chi"          || name=="psi"          || name=="omega"
+	 || name=="Gamma"        || name=="Delta"        || name=="Theta"
+	 || name=="Lambda"       || name=="Xi"           || name=="Pi"
+	 || name=="Sigma"        || name=="Upsilon"      || name=="Phi"
+	 || name=="Psi"          || name=="Omega")
+		return "\\" + name;
+	else
+		return name;
+}
+
 //////////
 // static member variables
 //////////