- document: collect's argument must be expanded.

[ginac.git] / ginac / constant.cpp

diff --git a/ginac/constant.cpp b/ginac/constant.cpp
index 5aad78d096ee0e86e11e56778f8c5dc67ed3bd78..e86a2964164256382b9380754669124f65315b1c 100644 (file)
--- a/ginac/constant.cpp
+++ b/ginac/constant.cpp
@@ -26,6 +26,7 @@
 #include "constant.h"
 #include "numeric.h"
 #include "ex.h"
+#include "print.h"
 #include "archive.h"
 #include "debugmsg.h"
 #include "utils.h"
@@ -40,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);
 }
@@ -52,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)
@@ -73,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);
 }
 
@@ -126,32 +136,18 @@ void constant::archive(archive_node &n) const
 
 // public
 
-void constant::print(std::ostream & os, unsigned upper_precedence) const
-{
-       debugmsg("constant print",LOGLEVEL_PRINT);
-       os << name;
-}
-
-void constant::printraw(std::ostream & os) const
+void constant::print(const print_context & c, unsigned level) const
 {
-       debugmsg("constant printraw",LOGLEVEL_PRINT);
-       os << class_name() << "(" << name << ")";
-}
+       debugmsg("constant print", LOGLEVEL_PRINT);
 
-void constant::printtree(std::ostream & os, unsigned indent) const
-{
-       debugmsg("constant printtree",LOGLEVEL_PRINT);
-       os << std::string(indent,' ') << name
-          << ", type=" << class_name()
-          << ", hash=" << hashvalue
-          << " (0x" << std::hex << hashvalue << std::dec << ")"
-          << ", flags=" << flags << std::endl;
-}
-
-void constant::printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence) const
-{
-       debugmsg("constant print csrc",LOGLEVEL_PRINT);
-       os << name;
+       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 if (is_of_type(c, print_latex))
+               c.s << TeX_name;
+       else
+               c.s << name;
 }
 
 int constant::degree(const ex & s) const
@@ -243,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