X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fconstant.cpp;h=54664266be5de2acfaad3a330e825462882a4934;hp=10972b076a82d69c1b58824b88a681ed24f9f818;hb=866b3eb23253a272788d8791b1ed023e63674d50;hpb=d327f3f00c66a79d42855939866047b3e8caa630 diff --git a/ginac/constant.cpp b/ginac/constant.cpp index 10972b07..54664266 100644 --- a/ginac/constant.cpp +++ b/ginac/constant.cpp @@ -3,7 +3,7 @@ * Implementation of GiNaC's constant types and some special constants. */ /* - * GiNaC Copyright (C) 1999-2008 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2010 Johannes Gutenberg University Mainz, Germany * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,10 +20,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include - #include "constant.h" #include "numeric.h" #include "ex.h" @@ -31,6 +27,10 @@ #include "utils.h" #include "inifcns.h" +#include +#include +#include + namespace GiNaC { GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(constant, basic, @@ -60,7 +60,7 @@ constant::constant(const std::string & initname, evalffunctype efun, const std:: : name(initname), ef(efun), serial(next_serial++), domain(dm) { if (texname.empty()) - TeX_name = "\\mbox{" + name + "}"; + TeX_name = "\\mathrm{" + name + "}"; else TeX_name = texname; setflag(status_flags::evaluated | status_flags::expanded); @@ -70,7 +70,7 @@ constant::constant(const std::string & initname, const numeric & initnumber, con : name(initname), ef(0), number(initnumber), serial(next_serial++), domain(dm) { if (texname.empty()) - TeX_name = "\\mbox{" + name + "}"; + TeX_name = "\\mathrm{" + name + "}"; else TeX_name = texname; setflag(status_flags::evaluated | status_flags::expanded); @@ -131,7 +131,7 @@ void constant::do_print_latex(const print_latex & c, unsigned level) const void constant::do_print_python_repr(const print_python_repr & c, unsigned level) const { c.s << class_name() << "('" << name << "'"; - if (TeX_name != "\\mbox{" + name + "}") + if (TeX_name != "\\mathrm{" + name + "}") c.s << ",TeX_name='" << TeX_name << "'"; c.s << ')'; }