- symbols can have a LaTeX name, e.g. symbol s("s", "\\sigma");

[ginac.git] / ginac / symbol.cpp

diff --git a/ginac/symbol.cpp b/ginac/symbol.cpp
index 169ee631bc5ef0361f855ef3e7267a764e58c345..29d46bbf73a1f14d243c8d0342524100df9aa7a4 100644 (file)
--- a/ginac/symbol.cpp
+++ b/ginac/symbol.cpp
@@ -25,7 +25,7 @@
 
 #include "symbol.h"
 #include "lst.h"
-#include "idx.h"
+#include "print.h"
 #include "archive.h"
 #include "debugmsg.h"
 #include "utils.h"
@@ -41,7 +41,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);
 }
@@ -51,6 +51,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;
@@ -80,6 +81,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);
@@ -96,6 +108,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);
 }
@@ -118,6 +132,8 @@ 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);
 }
 
 //////////
@@ -132,33 +148,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 << "symbol(" << "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
@@ -188,19 +192,19 @@ bool symbol::has(const ex & other) const
                return false;
 }
 
-int symbol::degree(const symbol & s) const
+int symbol::degree(const ex & s) const
 {
-       return compare_same_type(s)==0 ? 1 : 0;
+       return is_equal(*s.bp) ? 1 : 0;
 }
 
-int symbol::ldegree(const symbol & s) const
+int symbol::ldegree(const ex & s) const
 {
-       return compare_same_type(s)==0 ? 1 : 0;
+       return is_equal(*s.bp) ? 1 : 0;
 }
 
-ex symbol::coeff(const symbol & s, int n) const
+ex symbol::coeff(const ex & 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();
@@ -222,24 +226,6 @@ ex symbol::eval(int level) const
        }
 }
 
-ex symbol::subs(const lst & ls, const lst & lr) const
-{
-       GINAC_ASSERT(ls.nops()==lr.nops());
-#ifdef DO_GINAC_ASSERT
-       for (unsigned i=0; i<ls.nops(); i++)
-               GINAC_ASSERT(is_ex_exactly_of_type(ls.op(i),symbol)||
-                            is_ex_of_type(ls.op(i),idx));
-#endif // def DO_GINAC_ASSERT
-
-       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.
@@ -327,6 +313,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=="varphix"
+        || 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
 //////////