From 71e1de972fd7f37d560427bffbb0f36215788d31 Mon Sep 17 00:00:00 2001
From: Richard Kreckel <kreckel@ginac.de>
Date: Sun, 4 Oct 2009 22:30:45 +0200
Subject: [PATCH] Output LaTeX-symbols using \mathrm, instead of \mbox.

Using \mathrm improves printing in complex formulae.
One reason is that it scales in fractions. [by Vladimir Kisil]
---
 ginac/constant.cpp         | 6 +++---
 ginac/inifcns.cpp          | 4 ++--
 ginac/inifcns_gamma.cpp    | 2 +-
 ginac/inifcns_nstdsums.cpp | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ginac/constant.cpp b/ginac/constant.cpp
index c7ef59d5..00f0163d 100644
--- a/ginac/constant.cpp
+++ b/ginac/constant.cpp
@@ -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 << ')';
 }
diff --git a/ginac/inifcns.cpp b/ginac/inifcns.cpp
index 0abe001b..20ea659f 100644
--- a/ginac/inifcns.cpp
+++ b/ginac/inifcns.cpp
@@ -647,7 +647,7 @@ REGISTER_FUNCTION(Li2, eval_func(Li2_eval).
                        evalf_func(Li2_evalf).
                        derivative_func(Li2_deriv).
                        series_func(Li2_series).
-                       latex_name("\\mbox{Li}_2"));
+                       latex_name("\\mathrm{Li}_2"));
 
 //////////
 // trilogarithm
@@ -661,7 +661,7 @@ static ex Li3_eval(const ex & x)
 }
 
 REGISTER_FUNCTION(Li3, eval_func(Li3_eval).
-                       latex_name("\\mbox{Li}_3"));
+                       latex_name("\\mathrm{Li}_3"));
 
 //////////
 // Derivatives of Riemann's Zeta-function  zetaderiv(0,x)==zeta(x)
diff --git a/ginac/inifcns_gamma.cpp b/ginac/inifcns_gamma.cpp
index 7d15231b..e1e67eea 100644
--- a/ginac/inifcns_gamma.cpp
+++ b/ginac/inifcns_gamma.cpp
@@ -328,7 +328,7 @@ REGISTER_FUNCTION(beta, eval_func(beta_eval).
                         evalf_func(beta_evalf).
                         derivative_func(beta_deriv).
                         series_func(beta_series).
-                        latex_name("\\mbox{B}").
+                        latex_name("\\mathrm{B}").
 						set_symmetry(sy_symm(0, 1)));
 
 
diff --git a/ginac/inifcns_nstdsums.cpp b/ginac/inifcns_nstdsums.cpp
index 11a91dd1..3284ff69 100644
--- a/ginac/inifcns_nstdsums.cpp
+++ b/ginac/inifcns_nstdsums.cpp
@@ -1686,7 +1686,7 @@ static void Li_print_latex(const ex& m_, const ex& x_, const print_context& c)
 	} else {
 		x = lst(x_);
 	}
-	c.s << "\\mbox{Li}_{";
+	c.s << "\\mathrm{Li}_{";
 	lst::const_iterator itm = m.begin();
 	(*itm).print(c);
 	itm++;
@@ -2202,7 +2202,7 @@ static ex S_deriv(const ex& n, const ex& p, const ex& x, unsigned deriv_param)
 
 static void S_print_latex(const ex& n, const ex& p, const ex& x, const print_context& c)
 {
-	c.s << "\\mbox{S}_{";
+	c.s << "\\mathrm{S}_{";
 	n.print(c);
 	c.s << ",";
 	p.print(c);
@@ -3408,7 +3408,7 @@ static void H_print_latex(const ex& m_, const ex& x, const print_context& c)
 	} else {
 		m = lst(m_);
 	}
-	c.s << "\\mbox{H}_{";
+	c.s << "\\mathrm{H}_{";
 	lst::const_iterator itm = m.begin();
 	(*itm).print(c);
 	itm++;
-- 
2.44.0