X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fconstant.cpp;h=e86a2964164256382b9380754669124f65315b1c;hp=7afc35beb749b404a6b078ceb2051cccf0ce836b;hb=1067e394af3446a2fc9be1eee3a54fe422247907;hpb=06eb6b761f4b9d9eed4decd8ed50d94b40b94a0e

diff --git a/ginac/constant.cpp b/ginac/constant.cpp
index 7afc35be..e86a2964 100644
--- a/ginac/constant.cpp
+++ b/ginac/constant.cpp
@@ -41,7 +41,7 @@ GINAC_IMPLEMENT_REGISTERED_CLASS(constant, basic)
 
 // public
 
-constant::constant() : basic(TINFO_constant), name(""), ef(0), number(0), serial(next_serial++)
+constant::constant() : basic(TINFO_constant), ef(0), number(0), serial(next_serial++)
 {
 	debugmsg("constant default ctor",LOGLEVEL_CONSTRUCT);
 }
@@ -53,6 +53,7 @@ void constant::copy(const constant & other)
 {
 	inherited::copy(other);
 	name = other.name;
+	TeX_name = other.TeX_name;
 	serial = other.serial;
 	ef = other.ef;
 	if (other.number != 0)
@@ -74,17 +75,25 @@ void constant::destroy(bool call_parent)
 
 // public
 
-constant::constant(const std::string & initname, evalffunctype efun)
+constant::constant(const std::string & initname, evalffunctype efun, const std::string & texname)
   : basic(TINFO_constant), name(initname), ef(efun), number(0), serial(next_serial++)
 {
 	debugmsg("constant ctor from string, function",LOGLEVEL_CONSTRUCT);
+	if (texname.empty())
+		TeX_name = "\\mbox{" + name + "}";
+	else
+		TeX_name = texname;
 	setflag(status_flags::evaluated);
 }
 
-constant::constant(const std::string & initname, const numeric & initnumber)
+constant::constant(const std::string & initname, const numeric & initnumber, const std::string & texname)
   : basic(TINFO_constant), name(initname), ef(0), number(new numeric(initnumber)), serial(next_serial++)
 {
 	debugmsg("constant ctor from string, numeric",LOGLEVEL_CONSTRUCT);
+	if (texname.empty())
+		TeX_name = "\\mbox{" + name + "}";
+	else
+		TeX_name = texname;
 	setflag(status_flags::evaluated);
 }
 
@@ -132,12 +141,12 @@ void constant::print(const print_context & c, unsigned level) const
 	debugmsg("constant print", LOGLEVEL_PRINT);
 
 	if (is_of_type(c, print_tree)) {
-
 		c.s << std::string(level, ' ') << name << " (" << class_name() << ")"
 		    << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
 		    << std::endl;
-
-	} else
+	} else if (is_of_type(c, print_latex))
+		c.s << TeX_name;
+	else
 		c.s << name;
 }
 
@@ -230,13 +239,13 @@ unsigned constant::next_serial = 0;
 //////////
 
 /**  Pi. (3.14159...)  Diverts straight into CLN for evalf(). */
-const constant Pi("Pi", PiEvalf);
+const constant Pi("Pi", PiEvalf, "\\pi");
 
 /** Euler's constant. (0.57721...)  Sometimes called Euler-Mascheroni constant.
  *  Diverts straight into CLN for evalf(). */
-const constant Euler("Euler", EulerEvalf);
+const constant Euler("Euler", EulerEvalf, "\\gamma_E");
 
 /** Catalan's constant. (0.91597...)  Diverts straight into CLN for evalf(). */
-const constant Catalan("Catalan", CatalanEvalf);
+const constant Catalan("Catalan", CatalanEvalf, "G");
 
 } // namespace GiNaC